# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1179962270 0
# Node ID cb5bd3c045a9684c8e62d244a5215b0a6cb6a789
# Parent  6ec8bae7d98aadeb7a9dcf363d235d073e009d92# Parent  d04b1617da3daec016b7c349088a64c70a7562c0
merge of '10181aa0574db4bb368e5eb9c7eb9440c61d930a'
     and '12efd7c55efaf31eca5fecc6ccdeeb12ee4b7d95'

diff -r 6ec8bae7d98a -r cb5bd3c045a9 AUTHORS
--- a/AUTHORS	Wed May 23 23:13:11 2007 +0000
+++ b/AUTHORS	Wed May 23 23:17:50 2007 +0000
@@ -3,8 +3,7 @@
 
 For a complete list of all contributors, see the COPYRIGHT file.
 
-We've got an IRC room now too, #pidgin on irc.freenode.net
-(#pidgin-win32 for Windows users). Come check us out.
+We've got an IRC room now too, #pidgin on irc.freenode.net. Come check us out.
 
 Current Developers:
 ------------------
diff -r 6ec8bae7d98a -r cb5bd3c045a9 COPYRIGHT
--- a/COPYRIGHT	Wed May 23 23:13:11 2007 +0000
+++ b/COPYRIGHT	Wed May 23 23:17:50 2007 +0000
@@ -87,6 +87,7 @@
 Palmer Cox
 Jeramey Crawford
 Michael Culbertson
+Steven Danna
 Martijn Dekker
 Vinicius Depizzol
 Philip Derrin
@@ -172,6 +173,7 @@
 Thomas Huriaux
 Instant Messaging Freedom, Inc.
 Vitaliy Ischenko
+Intel Corporation
 Scott Jackson
 Hans Petter Jansson
 Henry Jen
@@ -303,6 +305,7 @@
 David Schmitt
 Mark Schneider
 Evan Schoenberg
+Gabriel Schulhof
 Federico Schwindt
 Torrey Searle
 Peter Seebach
@@ -355,11 +358,13 @@
 Junichi Uekawa
 István Váradi
 Martijn van Beers
+Arjan van de Ven
 Philip Van Hoof
 Kristof Vansant
 James Vega
 David Vermeille
 Sid Vicious
+Jorge Villaseñor (Masca)
 Bjoern Voigt
 Wan Hing Wah
 Philip Walford
diff -r 6ec8bae7d98a -r cb5bd3c045a9 ChangeLog
--- a/ChangeLog	Wed May 23 23:13:11 2007 +0000
+++ b/ChangeLog	Wed May 23 23:17:50 2007 +0000
@@ -25,10 +25,32 @@
 	  unencrypted channel
 	* Fix XMPP SASL authentication error when using Cyrus and a connect server
 	* Fix changing tab locations to update properly
+<<<<<<< variant A
 	* ALSA added as a possible sound method
 	* Added Google Talk to the accounts dropdown
 	* Google Talk accounts will not import buddies from your Gmail addres
 	  book
+>>>>>>> variant B
+	* Turning off "Show formatting on incoming messages" now ignores
+	  formatting in <span> tags too
+	* File transfer progress for transfers on MSN is now correctly displayed
+	* You can set/change alias of buddies/chats by double-clicking on the
+	  conversation tabs (Ma Xuan)
+	* Fix IRC connection bug with dircproxy (xjoe)
+	* Ctrl+[shift]+tab focuses the next most active tab (William Thompson)
+	* Fix Open Hotmail Inbox for MSN to work more reliably
+	* Add a Google Talk item to the protocol list, to help users who think
+	  we don't support Google Talk.  The item acts just like "XMPP".
+	* Remember if the X server supports XScreenSaver, to avoid waking it
+	  every 5 seconds.  (Arjan van de Ven with Intel Corporation)
+	* Change our idle checking to poll only as necessary and raise the
+	  unidle timeout from 5 seconds to 60 when using XScreenSaver.  This
+	  and the XScreenSaver change will reduce Pidgin's effect on power
+	  consumption when running with NO_HZ.  (Arjan van de Ven with Intel
+	  Corporation)
+	* Conversation -> Save As will now use aliases.
+####### Ancestor
+======= end
 
 	Finch:
 	* Userlist in chat windows, which can be turned on or off using
@@ -37,6 +59,11 @@
 	* Improved tab completion support
 	* Ctrl+c prompts with a dialog before exiting
 	* Filter string in the debug window
+	* Notify when you leave a chat
+	* Work around an ncurses bug which appears when half of a multi-cell
+	  character is covered by an upper-level window
+	* New plugins are shown in bold text in the plugin dialog
+	* Nicer HTML screendumps
 
 version 2.0.0 (5/3/2007):
 	* The project has new names - libpurple for the core, Pidgin for the
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/finch.c
--- a/finch/finch.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/finch.c	Wed May 23 23:17:50 2007 +0000
@@ -214,11 +214,6 @@
 		{0, 0, 0, 0}
 	};
 
-#ifdef PURPLE_FATAL_ASSERTS
-	/* Make g_return_... functions fatal. */
-	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
-#endif
-
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/gntaccount.c
--- a/finch/gntaccount.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/gntaccount.c	Wed May 23 23:17:50 2007 +0000
@@ -930,11 +930,15 @@
 
 static PurpleAccountUiOps ui_ops =
 {
-	.notify_added = notify_added,
-	.status_changed = NULL,
-	.request_add  = request_add,
-	.request_authorize = finch_request_authorize,
-	.close_account_request = finch_request_close
+	notify_added,
+	NULL,
+	request_add,
+	finch_request_authorize,
+	finch_request_close,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleAccountUiOps *finch_accounts_get_ui_ops()
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/gntblist.c
--- a/finch/gntblist.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/gntblist.c	Wed May 23 23:17:50 2007 +0000
@@ -113,6 +113,7 @@
 static void update_node_display(PurpleBlistNode *buddy, FinchBlist *ggblist);
 static void update_buddy_display(PurpleBuddy *buddy, FinchBlist *ggblist);
 static void account_signed_on_cb(PurpleConnection *pc, gpointer null);
+static void finch_request_add_buddy(PurpleAccount *account, const char *username, const char *grp, const char *alias);
 
 /* Sort functions */
 static int blist_node_compare_position(PurpleBlistNode *n1, PurpleBlistNode *n2);
@@ -285,6 +286,7 @@
 
 	if (error)
 	{
+		finch_request_add_buddy(account, username, group, alias);
 		purple_notify_error(NULL, _("Error"), _("Error adding buddy"), error);
 		return;
 	}
@@ -447,9 +449,13 @@
 	node_remove,
 	NULL,
 	NULL,
-	.request_add_buddy = finch_request_add_buddy,
-	.request_add_chat = finch_request_add_chat,
-	.request_add_group = finch_request_add_group
+	finch_request_add_buddy,
+	finch_request_add_chat,
+	finch_request_add_group,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static gpointer
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/gntconn.c
--- a/finch/gntconn.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/gntconn.c	Wed May 23 23:17:50 2007 +0000
@@ -56,11 +56,17 @@
 
 static PurpleConnectionUiOps ops = 
 {
-	.connect_progress = NULL,
-	.connected = NULL,
-	.disconnected = NULL,
-	.notice = NULL,
-	.report_disconnect = finch_connection_report_disconnect
+	NULL, /* connect_progress */
+	NULL, /* connected */
+	NULL, /* disconnected */
+	NULL, /* notice */
+	finch_connection_report_disconnect,
+	NULL, /* network_connected */
+	NULL, /* network_disconnected */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleConnectionUiOps *finch_connections_get_ui_ops()
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/gntconv.c
--- a/finch/gntconv.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/gntconv.c	Wed May 23 23:17:50 2007 +0000
@@ -493,7 +493,8 @@
 		FinchConvChat *fc = ggc->u.chat = g_new0(FinchConvChat, 1);
 		hbox = gnt_hbox_new(FALSE);
 		gnt_box_set_pad(GNT_BOX(hbox), 0);
-		tree = fc->userlist = gnt_tree_new();
+		tree = fc->userlist = gnt_tree_new_with_columns(2);
+		gnt_tree_set_col_width(GNT_TREE(tree), 0, 1);   /* The flag column */
 		gnt_tree_set_compare_func(GNT_TREE(tree), (GCompareFunc)g_utf8_collate);
 		gnt_tree_set_hash_fns(GNT_TREE(tree), g_str_hash, g_str_equal, g_free);
 		GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
@@ -675,6 +676,20 @@
 	finch_write_common(conv, name, message, flags, mtime);
 }
 
+static const char *
+chat_flag_text(PurpleConvChatBuddyFlags flags)
+{
+	if (flags & PURPLE_CBFLAGS_FOUNDER)
+		return "~";
+	if (flags & PURPLE_CBFLAGS_OP)
+		return "@";
+	if (flags & PURPLE_CBFLAGS_HALFOP)
+		return "%";
+	if (flags & PURPLE_CBFLAGS_VOICE)
+		return "+";
+	return " ";
+}
+
 static void
 finch_chat_add_users(PurpleConversation *conv, GList *users, gboolean new_arrivals)
 {
@@ -709,7 +724,7 @@
 		gnt_entry_add_suggest(entry, cbuddy->name);
 		gnt_entry_add_suggest(entry, cbuddy->alias);
 		gnt_tree_add_row_after(tree, g_strdup(cbuddy->name),
-				gnt_tree_create_row(tree, cbuddy->alias), NULL, NULL);
+				gnt_tree_create_row(tree, chat_flag_text(cbuddy->flags), cbuddy->alias), NULL, NULL);
 	}
 }
 
@@ -720,16 +735,19 @@
 	FinchConv *ggc = conv->ui_data;
 	GntEntry *entry = GNT_ENTRY(ggc->entry);
 	GntTree *tree = GNT_TREE(ggc->u.chat->userlist);
+	PurpleConvChatBuddy *cb = purple_conv_chat_cb_find(PURPLE_CONV_CHAT(conv), new_n);
+
 	gnt_entry_remove_suggest(entry, old);
+	gnt_tree_remove(tree, (gpointer)old);
+
 	gnt_entry_add_suggest(entry, new_n);
 	gnt_entry_add_suggest(entry, new_a);
-	gnt_tree_remove(tree, (gpointer)old);
 	gnt_tree_add_row_after(tree, g_strdup(new_n),
-			gnt_tree_create_row(tree, new_a), NULL, NULL);
+			gnt_tree_create_row(tree, chat_flag_text(cb->flags), new_a), NULL, NULL);
 }
 
 static void
-finch_chat_remove_user(PurpleConversation *conv, GList *list)
+finch_chat_remove_users(PurpleConversation *conv, GList *list)
 {
 	/* Remove the name from string completion */
 	FinchConv *ggc = conv->ui_data;
@@ -744,24 +762,32 @@
 static void
 finch_chat_update_user(PurpleConversation *conv, const char *user)
 {
+	PurpleConvChatBuddy *cb = purple_conv_chat_cb_find(PURPLE_CONV_CHAT(conv), user);
+	FinchConv *ggc = conv->ui_data;
+	gnt_tree_change_text(GNT_TREE(ggc->u.chat->userlist), (gpointer)user, 0, chat_flag_text(cb->flags));
 }
 
 static PurpleConversationUiOps conv_ui_ops = 
 {
-	.create_conversation = finch_create_conversation,
-	.destroy_conversation = finch_destroy_conversation,
-	.write_chat = finch_write_chat,
-	.write_im = finch_write_im,
-	.write_conv = finch_write_conv,
-	.chat_add_users = finch_chat_add_users,
-	.chat_rename_user = finch_chat_rename_user,
-	.chat_remove_users = finch_chat_remove_user,
-	.chat_update_user = finch_chat_update_user,
-	.present = NULL,
-	.has_focus = NULL,
-	.custom_smiley_add = NULL,
-	.custom_smiley_write = NULL,
-	.custom_smiley_close = NULL
+	finch_create_conversation,
+	finch_destroy_conversation,
+	finch_write_chat,
+	finch_write_im,
+	finch_write_conv,
+	finch_chat_add_users,
+	finch_chat_rename_user,
+	finch_chat_remove_users,
+	finch_chat_update_user,
+	NULL, /* present */
+	NULL, /* has_focus */
+	NULL, /* custom_smiley_add */
+	NULL, /* custom_smiley_write */
+	NULL, /* custom_smiley_close */
+	NULL, /* send_confirm */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleConversationUiOps *finch_conv_get_ui_ops()
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/gntnotify.c
--- a/finch/gntnotify.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/gntnotify.c	Wed May 23 23:17:50 2007 +0000
@@ -405,17 +405,21 @@
 
 static PurpleNotifyUiOps ops = 
 {
-	.notify_message = finch_notify_message,
-	.close_notify = finch_close_notify,       /* The rest of the notify-uiops return a GntWidget.
-                                              These widgets should be destroyed from here. */
-	.notify_formatted = finch_notify_formatted,
-	.notify_email = finch_notify_email,
-	.notify_emails = finch_notify_emails,
-	.notify_userinfo = finch_notify_userinfo,
+	finch_notify_message,
+	finch_notify_email,
+	finch_notify_emails,
+	finch_notify_formatted,
+	finch_notify_searchresults,
+	finch_notify_sr_new_rows,
+	finch_notify_userinfo,
+	NULL,                     /* notify_uri is of low-priority to me. --sadrul */
+	finch_close_notify,       /* The rest of the notify-uiops return a GntWidget.
+                                     These widgets should be destroyed from here. */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 
-	.notify_searchresults = finch_notify_searchresults,
-	.notify_searchresults_new_rows = finch_notify_sr_new_rows,
-	.notify_uri = NULL                     /* This is of low-priority to me */
 };
 
 PurpleNotifyUiOps *finch_notify_get_ui_ops()
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/gntplugin.c
--- a/finch/gntplugin.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/gntplugin.c	Wed May 23 23:17:50 2007 +0000
@@ -67,11 +67,10 @@
 static void
 plugin_toggled_cb(GntWidget *tree, PurplePlugin *plugin, gpointer null)
 {
-	/* TODO: Mark these strings for translation after the freeze */
 	if (gnt_tree_get_choice(GNT_TREE(tree), plugin))
 	{
 		if (!purple_plugin_load(plugin)) {
-			purple_notify_error(NULL, "ERROR", "loading plugin failed", NULL);
+			purple_notify_error(NULL, _("ERROR"), _("loading plugin failed"), NULL);
 			gnt_tree_set_choice(GNT_TREE(tree), plugin, FALSE);
 		}
 	}
@@ -80,7 +79,7 @@
 		GntWidget *win;
 
 		if (!purple_plugin_unload(plugin)) {
-			purple_notify_error(NULL, "ERROR", "unloading plugin failed", NULL);
+			purple_notify_error(NULL, _("ERROR"), _("unloading plugin failed"), NULL);
 			gnt_tree_set_choice(GNT_TREE(tree), plugin, TRUE);
 		}
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/gntprefs.c
--- a/finch/gntprefs.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/gntprefs.c	Wed May 23 23:17:50 2007 +0000
@@ -76,7 +76,7 @@
 get_idle_options()
 {
 	GList *list = NULL;
-	list = g_list_append(list, "Based on keyboard use"); /* XXX: string freeze */
+	list = g_list_append(list, (char *)_("Based on keyboard use"));
 	list = g_list_append(list, "system");
 	list = g_list_append(list, (char*)_("From last sent message"));
 	list = g_list_append(list, "purple");
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/gntrequest.c
--- a/finch/gntrequest.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/gntrequest.c	Wed May 23 23:17:50 2007 +0000
@@ -612,13 +612,17 @@
 
 static PurpleRequestUiOps uiops =
 {
-	.request_input = finch_request_input,
-	.close_request = finch_close_request,
-	.request_choice = finch_request_choice,
-	.request_action = finch_request_action,
-	.request_fields = finch_request_fields,
-	.request_file = finch_request_file,
-	.request_folder = NULL                        /* No plans for this */
+	finch_request_input,
+	finch_request_choice,
+	finch_request_action,
+	finch_request_fields,
+	finch_request_file,
+	finch_close_request,
+	NULL,                       /* No plans for request_folder */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleRequestUiOps *finch_request_get_ui_ops()
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am	Wed May 23 23:13:11 2007 +0000
+++ b/finch/libgnt/Makefile.am	Wed May 23 23:17:50 2007 +0000
@@ -66,10 +66,10 @@
 
 gntmarshal.c: $(srcdir)/genmarshal gntmarshal.h
 	echo "#include \"gntmarshal.h\"" > $@
-	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --body >> $@
+	glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
 
 gntmarshal.h: $(srcdir)/genmarshal
-	cat $(srcdir)/genmarshal | glib-genmarshal --prefix=gnt_closure_marshal --header > $@
+	glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
 
 libgnt_laincludedir=$(includedir)/gnt
 libgnt_lainclude_HEADERS = \
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/libgnt/gntmain.c
--- a/finch/libgnt/gntmain.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/libgnt/gntmain.c	Wed May 23 23:17:50 2007 +0000
@@ -144,8 +144,8 @@
 		event = GNT_MOUSE_UP;
 	} else
 		return FALSE;
-	
-	if (gnt_wm_process_click(wm, event, x, y, widget))
+
+	if (widget && gnt_wm_process_click(wm, event, x, y, widget))
 		return TRUE;
 	
 	if (event == GNT_LEFT_MOUSE_DOWN && widget && widget != wm->_list.window &&
@@ -177,7 +177,8 @@
 		offset = 0;
 	}
 
-	gnt_widget_clicked(widget, event, x, y);
+	if (widget)
+		gnt_widget_clicked(widget, event, x, y);
 	return TRUE;
 }
 
@@ -348,6 +349,10 @@
 	gnt_wm_raise_window(wm, win);
 }
 
+#ifdef SIGWINCH
+static void (*org_winch_handler)(int);
+#endif
+
 static void
 sighandler(int sig)
 {
@@ -357,6 +362,7 @@
 		werase(stdscr);
 		wrefresh(stdscr);
 		g_idle_add(refresh_screen, NULL);
+		org_winch_handler(sig);
 		signal(SIGWINCH, sighandler);
 		break;
 #endif
@@ -434,7 +440,7 @@
 	wrefresh(stdscr);
 
 #ifdef SIGWINCH
-	signal(SIGWINCH, sighandler);
+	org_winch_handler = signal(SIGWINCH, sighandler);
 #endif
 	signal(SIGCHLD, sighandler);
 	signal(SIGINT, sighandler);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/libgnt/gntwm.c
--- a/finch/libgnt/gntwm.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/libgnt/gntwm.c	Wed May 23 23:17:50 2007 +0000
@@ -48,6 +48,10 @@
 static void update_window_in_list(GntWM *wm, GntWidget *wid);
 static void shift_window(GntWM *wm, GntWidget *widget, int dir);
 
+#ifndef NO_WIDECHAR
+static int widestringwidth(wchar_t *wide);
+#endif
+
 static gboolean write_already(gpointer data);
 static int write_timeout;
 static time_t last_active_time;
@@ -136,6 +140,65 @@
 	copywin(src, dst, node->scroll, 0, 0, 0, getmaxy(dst) - 1, getmaxx(dst) - 1, 0);
 }
 
+/**
+ * The following is a workaround for a bug in most versions of ncursesw.
+ * Read about it in: http://article.gmane.org/gmane.comp.lib.ncurses.bugs/2751
+ * 
+ * In short, if a panel hides one cell of a multi-cell character, then the rest
+ * of the characters in that line get screwed. The workaround here is to erase
+ * any such character preemptively.
+ *
+ * Caveat: If a wide character is erased, and the panel above it is moved enough
+ * to expose the entire character, it is not always redrawn.
+ */
+static void
+work_around_for_ncurses_bug()
+{
+#ifndef NO_WIDECHAR
+	PANEL *panel = NULL;
+	while ((panel = panel_below(panel)) != NULL) {
+		int sx, ex, sy, ey, w, y;
+		cchar_t ch;
+		PANEL *below = panel;
+
+		sx = panel->win->_begx;
+		ex = panel->win->_maxx + sx;
+		sy = panel->win->_begy;
+		ey = panel->win->_maxy + sy;
+
+		while ((below = panel_below(below)) != NULL) {
+			if (sy > below->win->_begy + below->win->_maxy ||
+					ey < below->win->_begy)
+				continue;
+			if (sx > below->win->_begx + below->win->_maxx ||
+					ex < below->win->_begx)
+				continue;
+			for (y = MAX(sy, below->win->_begy); y <= MIN(ey, below->win->_begy + below->win->_maxy); y++) {
+				if (mvwin_wch(below->win, y - below->win->_begy, sx - 1 - below->win->_begx, &ch) != OK)
+					goto right;
+				w = widestringwidth(ch.chars);
+				if (w > 1 && (ch.attr & 1)) {
+					ch.chars[0] = ' ';
+					ch.attr &= ~ A_CHARTEXT;
+					mvwadd_wch(below->win, y - below->win->_begy, sx - 1 - below->win->_begx, &ch);
+					touchline(below->win, y - below->win->_begy, 1);
+				}
+right:
+				if (mvwin_wch(below->win, y - below->win->_begy, ex + 1 - below->win->_begx, &ch) != OK)
+					continue;
+				w = widestringwidth(ch.chars);
+				if (w > 1 && !(ch.attr & 1)) {
+					ch.chars[0] = ' ';
+					ch.attr &= ~ A_CHARTEXT;
+					mvwadd_wch(below->win, y - below->win->_begy, ex + 1 - below->win->_begx, &ch);
+					touchline(below->win, y - below->win->_begy, 1);
+				}
+			}
+		}
+	}
+#endif
+}
+
 static gboolean
 update_screen(GntWM *wm)
 {
@@ -148,6 +211,7 @@
 			top = top->submenu;
 		}
 	}
+	work_around_for_ncurses_bug();
 	update_panels();
 	doupdate();
 	return TRUE;
@@ -564,14 +628,40 @@
 	int x, y;
 	chtype old = 0, now = 0;
 	FILE *file = fopen("dump.html", "w");
+	struct {
+		char ascii;
+		char *unicode;
+	} unis[] = {
+		{'q', "&#x2500;"},
+		{'t', "&#x251c;"},
+		{'u', "&#x2524;"},
+		{'x', "&#x2502;"},
+		{'-', "&#x2191;"},
+		{'.', "&#x2193;"},
+		{'l', "&#x250c;"},
+		{'k', "&#x2510;"},
+		{'m', "&#x2514;"},
+		{'j', "&#x2518;"},
+		{'a', "&#x2592;"},
+		{'\0', NULL}
+	};
 
+	fprintf(file, "<head>\n  <meta http-equiv='Content-Type' content='text/html; charset=utf-8' />\n</head>\n<body>\n");
 	fprintf(file, "<pre>");
 	for (y = 0; y < getmaxy(stdscr); y++) {
 		for (x = 0; x < getmaxx(stdscr); x++) {
-			char ch;
+			char ch[2] = {0, 0}, *print;
+#ifdef NO_WIDECHAR
 			now = mvwinch(curscr, y, x);
-			ch = now & A_CHARTEXT;
-			now ^= ch;
+			ch[0] = now & A_CHARTEXT;
+			now ^= ch[0];
+#else
+			cchar_t wch;
+			char unicode[12];
+			mvwin_wch(curscr, y, x, &wch);
+			now = wch.attr;
+			ch[0] = (char)(wch.chars[0] & 0xff);
+#endif
 
 #define CHECK(attr, start, end) \
 			do \
@@ -607,7 +697,11 @@
 				if (bgp == -1)
 					bgp = COLOR_WHITE;
 				if (now & A_REVERSE)
-					fgp ^= bgp ^= fgp ^= bgp;  /* *wink* */
+				{
+					short tmp = fgp;
+					fgp = bgp;
+					bgp = tmp;
+				}
 				ret = color_content(fgp, &r, &g, &b);
 				fg.r = r; fg.b = b; fg.g = g;
 				ret = color_content(bgp, &r, &g, &b);
@@ -624,48 +718,39 @@
 				fprintf(file, "<span style=\"background:#%02x%02x%02x;color:#%02x%02x%02x\">",
 						bg.r, bg.g, bg.b, fg.r, fg.g, fg.b);
 			}
+			print = ch;
+#ifndef NO_WIDECHAR
+			if (wch.chars[0] > 255) {
+				snprintf(unicode, sizeof(unicode), "&#x%x;", wch.chars[0]);
+				print = unicode;
+			}
+#endif
 			if (now & A_ALTCHARSET)
 			{
-				switch (ch)
-				{
-					case 'q':
-						ch = '-'; break;
-					case 't':
-					case 'u':
-					case 'x':
-						ch = '|'; break;
-					case 'v':
-					case 'w':
-					case 'l':
-					case 'm':
-					case 'k':
-					case 'j':
-					case 'n':
-						ch = '+'; break;
-					case '-':
-						ch = '^'; break;
-					case '.':
-						ch = 'v'; break;
-					case 'a':
-						ch = '#'; break;
-					default:
-						ch = ' '; break;
+				int u;
+				for (u = 0; unis[u].ascii; u++) {
+					if (ch[0] == unis[u].ascii) {
+						print = unis[u].unicode;
+						break;
+					}
 				}
+				if (!unis[u].ascii)
+					print = " ";
 			}
-			if (ch == '&')
+			if (ch[0] == '&')
 				fprintf(file, "&amp;");
-			else if (ch == '<')
+			else if (ch[0] == '<')
 				fprintf(file, "&lt;");
-			else if (ch == '>')
+			else if (ch[0] == '>')
 				fprintf(file, "&gt;");
 			else
-				fprintf(file, "%c", ch);
+				fprintf(file, "%s", print);
 			old = now;
 		}
 		fprintf(file, "</span>\n");
 		old = 0;
 	}
-	fprintf(file, "</pre>");
+	fprintf(file, "</pre>\n</body>");
 	fclose(file);
 	return TRUE;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 finch/plugins/gntgf.c
--- a/finch/plugins/gntgf.c	Wed May 23 23:13:11 2007 +0000
+++ b/finch/plugins/gntgf.c	Wed May 23 23:17:50 2007 +0000
@@ -56,7 +56,8 @@
 #include <gntlabel.h>
 #include <gnttree.h>
 
-#include <gntplugin.h>
+#include "gntplugin.h"
+#include "gntconv.h"
 
 typedef struct
 {
@@ -154,7 +155,7 @@
 #endif
 
 static void
-notify(const char *fmt, ...)
+notify(PurpleConversation *conv, const char *fmt, ...)
 {
 	GntWidget *window;
 	GntToast *toast;
@@ -164,6 +165,13 @@
 
 	if (purple_prefs_get_bool(PREFS_BEEP))
 		beep();
+
+	if (conv != NULL) {
+		FinchConv *fc = conv->ui_data;
+		if (gnt_widget_has_focus(fc->window))
+			return;
+	}
+
 #ifdef HAVE_X11
 	if (purple_prefs_get_bool(PREFS_URGENT))
 		urgent();
@@ -220,14 +228,14 @@
 buddy_signed_on(PurpleBuddy *buddy, gpointer null)
 {
 	if (purple_prefs_get_bool(PREFS_EVENT_SIGNONF))
-		notify(_("%s just signed on"), purple_buddy_get_alias(buddy));
+		notify(NULL, _("%s just signed on"), purple_buddy_get_alias(buddy));
 }
 
 static void
 buddy_signed_off(PurpleBuddy *buddy, gpointer null)
 {
 	if (purple_prefs_get_bool(PREFS_EVENT_SIGNONF))
-		notify(_("%s just signed off"), purple_buddy_get_alias(buddy));
+		notify(NULL, _("%s just signed off"), purple_buddy_get_alias(buddy));
 }
 
 static void
@@ -235,7 +243,7 @@
 		PurpleConversation *conv, PurpleMessageFlags flags, gpointer null)
 {
 	if (purple_prefs_get_bool(PREFS_EVENT_IM_MSG))
-		notify(_("%s sent you a message"), sender);
+		notify(conv, _("%s sent you a message"), sender);
 }
 
 static void
@@ -254,9 +262,9 @@
 
 	if (purple_prefs_get_bool(PREFS_EVENT_CHAT_NICK) &&
 			(purple_utf8_has_word(msg, nick)))
-		notify(_("%s said your nick in %s"), sender, purple_conversation_get_name(conv));
+		notify(conv, _("%s said your nick in %s"), sender, purple_conversation_get_name(conv));
 	else if (purple_prefs_get_bool(PREFS_EVENT_CHAT_MSG))
-		notify(_("%s sent a message in %s"), sender, purple_conversation_get_name(conv));
+		notify(conv, _("%s sent a message in %s"), sender, purple_conversation_get_name(conv));
 }
 
 static gboolean
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/Makefile.am
--- a/libpurple/Makefile.am	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/Makefile.am	Wed May 23 23:17:50 2007 +0000
@@ -151,7 +151,7 @@
 dbus_headers  = dbus-bindings.h dbus-purple.h dbus-server.h dbus-useful.h dbus-define-api.h
 
 dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \
-                connection.h conversation.h core.h log.h prefs.h roomlist.h \
+                connection.h conversation.h core.h log.h notify.h prefs.h roomlist.h \
                 savedstatuses.h status.h server.h util.h xmlnode.h
 
 purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders))
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/account.c
--- a/libpurple/account.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/account.c	Wed May 23 23:17:50 2007 +0000
@@ -548,9 +548,9 @@
 	data = xmlnode_get_attrib(node, "active");
 	if (data == NULL)
 		return;
-	if (strcasecmp(data, "true") == 0)
+	if (g_ascii_strcasecmp(data, "true") == 0)
 		active = TRUE;
-	else if (strcasecmp(data, "false") == 0)
+	else if (g_ascii_strcasecmp(data, "false") == 0)
 		active = FALSE;
 	else
 		return;
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/cipher.c
--- a/libpurple/cipher.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/cipher.c	Wed May 23 23:17:50 2007 +0000
@@ -2000,8 +2000,8 @@
 	/* Check for a supported algorithm. */
 	g_return_val_if_fail(algorithm == NULL ||
 						 *algorithm == '\0' ||
-						 strcasecmp(algorithm, "MD5") ||
-						 strcasecmp(algorithm, "MD5-sess"), NULL);
+						 g_ascii_strcasecmp(algorithm, "MD5") ||
+						 g_ascii_strcasecmp(algorithm, "MD5-sess"), NULL);
 
 	cipher = purple_ciphers_find_cipher("md5");
 	g_return_val_if_fail(cipher != NULL, NULL);
@@ -2014,7 +2014,7 @@
 	purple_cipher_context_append(context, (guchar *)":", 1);
 	purple_cipher_context_append(context, (guchar *)password, strlen(password));
 
-	if (algorithm != NULL && !strcasecmp(algorithm, "MD5-sess"))
+	if (algorithm != NULL && !g_ascii_strcasecmp(algorithm, "MD5-sess"))
 	{
 		guchar digest[16];
 
@@ -2065,14 +2065,14 @@
 	/* Check for a supported algorithm. */
 	g_return_val_if_fail(algorithm == NULL ||
 						 *algorithm == '\0' ||
-						 strcasecmp(algorithm, "MD5") ||
-						 strcasecmp(algorithm, "MD5-sess"), NULL);
+						 g_ascii_strcasecmp(algorithm, "MD5") ||
+						 g_ascii_strcasecmp(algorithm, "MD5-sess"), NULL);
 
 	/* Check for a supported "quality of protection". */
 	g_return_val_if_fail(qop == NULL ||
 						 *qop == '\0' ||
-						 strcasecmp(qop, "auth") ||
-						 strcasecmp(qop, "auth-int"), NULL);
+						 g_ascii_strcasecmp(qop, "auth") ||
+						 g_ascii_strcasecmp(qop, "auth-int"), NULL);
 
 	cipher = purple_ciphers_find_cipher("md5");
 	g_return_val_if_fail(cipher != NULL, NULL);
@@ -2083,7 +2083,7 @@
 	purple_cipher_context_append(context, (guchar *)":", 1);
 	purple_cipher_context_append(context, (guchar *)digest_uri, strlen(digest_uri));
 
-	if (qop != NULL && !strcasecmp(qop, "auth-int"))
+	if (qop != NULL && !g_ascii_strcasecmp(qop, "auth-int"))
 	{
 		PurpleCipherContext *context2;
 		gchar entity_hash[33];
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/conversation.c
--- a/libpurple/conversation.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/conversation.c	Wed May 23 23:17:50 2007 +0000
@@ -970,20 +970,20 @@
 	{
 		im->typing_state = state;
 
-		if (state == PURPLE_TYPING)
-		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typing", im->conv->account, im->conv->name);
-		}
-		else if (state == PURPLE_TYPED)
+		switch (state)
 		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typed", im->conv->account, im->conv->name);
-		}
-		else if (state == PURPLE_NOT_TYPING)
-		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typing-stopped", im->conv->account, im->conv->name);
+			case PURPLE_TYPING:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typing", im->conv->account, im->conv->name);
+				break;
+			case PURPLE_TYPED:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typed", im->conv->account, im->conv->name);
+				break;
+			case PURPLE_NOT_TYPING:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typing-stopped", im->conv->account, im->conv->name);
+				break;
 		}
 	}
 }
@@ -1497,7 +1497,7 @@
 	} else if (a->buddy != b->buddy) {
 		ret = a->buddy ? -1 : 1;
 	} else {
-		ret = strcasecmp(user1, user2);
+		ret = purple_utf8_strcasecmp(user1, user2);
 	}
 
 	return ret;
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/dbus-analyze-functions.py
--- a/libpurple/dbus-analyze-functions.py	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/dbus-analyze-functions.py	Wed May 23 23:17:50 2007 +0000
@@ -96,7 +96,7 @@
 
         if len(type) == 1:
             # simple types (int, gboolean, etc.) and enums
-            if (type[0] in simpletypes) or (type[0].startswith("Purple")):
+            if (type[0] in simpletypes) or ((type[0].startswith("Purple") and not type[0].endswith("Callback"))):
                 return self.inputsimple(type, name)
 
         # pointers ... 
@@ -118,7 +118,6 @@
             # unknown pointers are always replaced with NULL
             else:
                 return self.inputpointer(type, name)
-                return
 
         raise myexception
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/example/nullclient.c
--- a/libpurple/example/nullclient.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/example/nullclient.c	Wed May 23 23:17:50 2007 +0000
@@ -137,7 +137,25 @@
 
 static PurpleConversationUiOps null_conv_uiops = 
 {
-	.write_conv = null_write_conv
+	NULL,                      /* create_conversation  */
+	NULL,                      /* destroy_conversation */
+	NULL,                      /* write_chat           */
+	NULL,                      /* write_im             */
+	null_write_conv,           /* write_conv           */
+	NULL,                      /* chat_add_users       */
+	NULL,                      /* chat_rename_user     */
+	NULL,                      /* chat_remove_users    */
+	NULL,                      /* chat_update_user     */
+	NULL,                      /* present              */
+	NULL,                      /* has_focus            */
+	NULL,                      /* custom_smiley_add    */
+	NULL,                      /* custom_smiley_write  */
+	NULL,                      /* custom_smiley_close  */
+	NULL,                      /* send_confirm         */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/ft.c
--- a/libpurple/ft.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/ft.c	Wed May 23 23:17:50 2007 +0000
@@ -891,7 +891,7 @@
 		r = purple_xfer_read(xfer, &buffer);
 		if (r > 0) {
 			fwrite(buffer, 1, r, xfer->dest_fp);
-		} else if(r <= 0) {
+		} else if(r < 0) {
 			purple_xfer_cancel_remote(xfer);
 			return;
 		}
@@ -972,7 +972,8 @@
 
 	fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
 
-	xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
+	if (xfer->fd)
+		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
 
 	xfer->start_time = time(NULL);
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/idle.c
--- a/libpurple/idle.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/idle.c	Wed May 23 23:17:50 2007 +0000
@@ -31,7 +31,6 @@
 #include "signals.h"
 
 #define IDLEMARK 600 /* 10 minutes! */
-#define IDLE_CHECK_INTERVAL 5 /* 5 seconds */
 
 typedef enum
 {
@@ -92,6 +91,9 @@
 	purple_presence_set_idle(presence, FALSE, 0);
 }
 
+
+static int no_away = 0;
+static gint time_until_next_idle_event;
 /*
  * This function should be called when you think your idle state
  * may have changed.  Maybe you're over the 10-minute mark and
@@ -110,14 +112,17 @@
  * 2. Set or unset your auto-away message.
  * 3. Report your current idle time to the IM server.
  */
-static gint
-check_idleness()
+
+static void
+check_idleness(void)
 {
 	time_t time_idle;
 	gboolean auto_away;
 	const gchar *idle_reporting;
 	gboolean report_idle;
 	GList *l;
+	gint away_seconds = 0;
+	gint idle_recheck_interval;
 
 	purple_signal_emit(purple_blist_get_handle(), "update-idle");
 
@@ -128,11 +133,13 @@
 	{
 		/* Use system idle time (mouse or keyboard movement, etc.) */
 		time_idle = idle_ui_ops->get_time_idle();
+		idle_recheck_interval = 60;
 	}
 	else if (!strcmp(idle_reporting, "purple"))
 	{
 		/* Use 'Purple idle' */
 		time_idle = time(NULL) - last_active_time;
+		idle_recheck_interval = 0;
 	}
 	else
 	{
@@ -146,21 +153,54 @@
 
 	/* If we're not reporting idle, we can still do auto-away.
 	 * First try "system" and if that isn't possible, use "purple" */
-	if (!report_idle && auto_away) {
-		if ((idle_ui_ops != NULL) && (idle_ui_ops->get_time_idle != NULL))
-			time_idle = idle_ui_ops->get_time_idle();
+	if (!report_idle)
+	{
+		if (auto_away)
+		{
+			if ((idle_ui_ops != NULL) && (idle_ui_ops->get_time_idle != NULL))
+			{
+				time_idle = idle_ui_ops->get_time_idle();
+				idle_recheck_interval = 60;
+			}
+			else
+			{
+				time_idle = time(NULL) - last_active_time;
+				idle_recheck_interval = 0;
+			}
+		}
 		else
-			time_idle = time(NULL) - last_active_time;
+		{
+			if (!no_away)
+			{
+				purple_savedstatus_set_idleaway(FALSE);
+				no_away = 1;
+			}
+			time_until_next_idle_event = 0;
+			return;
+		}
 	}
 
-	if (auto_away &&
-		(time_idle > (60 * purple_prefs_get_int("/purple/away/mins_before_away"))))
+	time_until_next_idle_event = IDLEMARK - time_idle;
+	if (time_until_next_idle_event < 0)
+	{
+		/* If we're already idle, check again as appropriate. */
+		time_until_next_idle_event = idle_recheck_interval;
+	}
+
+	if (auto_away || !no_away)
+		away_seconds = 60 * purple_prefs_get_int("/purple/away/mins_before_away");
+
+	if (auto_away && time_idle > away_seconds)
 	{
 		purple_savedstatus_set_idleaway(TRUE);
+		no_away = 0;
 	}
-	else if (time_idle < 60 * purple_prefs_get_int("/purple/away/mins_before_away"))
+	else if (!no_away && time_idle < away_seconds)
 	{
+		no_away = 1;
 		purple_savedstatus_set_idleaway(FALSE);
+		if (time_until_next_idle_event == 0 || (away_seconds - time_idle) < time_until_next_idle_event)
+			time_until_next_idle_event = away_seconds - time_idle;
 	}
 
 	/* Idle reporting stuff */
@@ -177,8 +217,21 @@
 		while (idled_accts != NULL)
 			set_account_unidle(idled_accts->data);
 	}
+}
 
-	return TRUE;
+
+/*
+ * Check idle and set the timer to fire at the next idle-worth event 
+ */
+static gint
+check_idleness_timer()
+{
+	check_idleness();
+	if (time_until_next_idle_event == 0)
+		idle_timer = 0;
+	else
+		idle_timer = purple_timeout_add(1000 * (time_until_next_idle_event + 1), check_idleness_timer, NULL);
+	return FALSE;
 }
 
 static void
@@ -205,10 +258,26 @@
 	set_account_unidle(account);
 }
 
+static void
+idle_reporting_cb(const char *name, PurplePrefType type, gconstpointer val, gpointer data)
+{
+	if (idle_timer)
+		purple_timeout_remove(idle_timer);
+	idle_timer = 0;
+	check_idleness_timer();
+}
+
 void
 purple_idle_touch()
 {
 	time(&last_active_time);
+	if (!no_away)
+	{
+		if (idle_timer)
+			purple_timeout_remove(idle_timer);
+		idle_timer = 0;
+		check_idleness_timer();
+	}
 }
 
 void
@@ -241,7 +310,7 @@
 purple_idle_init()
 {
 	/* Add the timer to check if we're idle */
-	idle_timer = purple_timeout_add(IDLE_CHECK_INTERVAL * 1000, check_idleness, NULL);
+	idle_timer = purple_timeout_add(1000 * (IDLEMARK + 1), check_idleness_timer, NULL);
 
 	purple_signal_connect(purple_conversations_get_handle(), "sent-im-msg",
 						purple_idle_get_handle(),
@@ -253,6 +322,9 @@
 						purple_idle_get_handle(),
 						PURPLE_CALLBACK(signing_off_cb), NULL);
 
+	purple_prefs_connect_callback(purple_idle_get_handle(), "/purple/away/idle_reporting",
+	                              idle_reporting_cb, NULL);
+
 	purple_idle_touch();
 }
 
@@ -260,6 +332,7 @@
 purple_idle_uninit()
 {
 	purple_signals_disconnect_by_handle(purple_idle_get_handle());
+	purple_prefs_disconnect_by_handle(purple_idle_get_handle());
 
 	/* Remove the idle timer */
 	if (idle_timer > 0)
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/notify.c
--- a/libpurple/notify.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/notify.c	Wed May 23 23:17:50 2007 +0000
@@ -22,6 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "internal.h"
+#include "dbus-maybe.h"
 #include "notify.h"
 
 static PurpleNotifyUiOps *notify_ui_ops = NULL;
@@ -481,6 +483,7 @@
 	PurpleNotifyUserInfoEntry *user_info_entry;
 	
 	user_info_entry = g_new0(PurpleNotifyUserInfoEntry, 1);
+	PURPLE_DBUS_REGISTER_POINTER(user_info_entry, PurpleNotifyUserInfoEntry);
 	user_info_entry->label = g_strdup(label);
 	user_info_entry->value = g_strdup(value);
 	user_info_entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_PAIR;
@@ -495,6 +498,7 @@
 	
 	g_free(user_info_entry->label);
 	g_free(user_info_entry->value);	
+	PURPLE_DBUS_UNREGISTER_POINTER(user_info_entry);
 	g_free(user_info_entry);
 }
 
@@ -504,6 +508,7 @@
 	PurpleNotifyUserInfo *user_info;
 	
 	user_info = g_new0(PurpleNotifyUserInfo, 1);
+	PURPLE_DBUS_REGISTER_POINTER(user_info, PurpleNotifyUserInfo);
 	user_info->user_info_entries = NULL;
 	
 	return user_info;
@@ -521,6 +526,7 @@
 	}
 	
 	g_list_free(user_info->user_info_entries);
+	PURPLE_DBUS_UNREGISTER_POINTER(user_info);
 	g_free(user_info);
 }
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/plugins/joinpart.c
--- a/libpurple/plugins/joinpart.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/plugins/joinpart.c	Wed May 23 23:17:50 2007 +0000
@@ -156,7 +156,7 @@
 static gboolean check_expire_time(struct joinpart_key *key,
                                   time_t *last_said, time_t *limit)
 {
-	purple_debug_info("joinpart", "Removing key for %s/%s\n", key->conv->name, key->user);
+	purple_debug_info("joinpart", "Removing key for %s\n", key->user);
 	return (*last_said < *limit);
 }
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/plugins/perl/Makefile.am
--- a/libpurple/plugins/perl/Makefile.am	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Wed May 23 23:17:50 2007 +0000
@@ -78,7 +78,8 @@
 #	common/fallback/const-xs.inc
 
 perl_scripts = \
-	scripts/function_list.pl
+	scripts/function_list.pl \
+	scripts/signals-test.pl
 
 EXTRA_DIST = \
 	Makefile.mingw \
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/plugins/perl/common/SavedStatuses.xs
--- a/libpurple/plugins/perl/common/SavedStatuses.xs	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/plugins/perl/common/SavedStatuses.xs	Wed May 23 23:17:50 2007 +0000
@@ -1,41 +1,129 @@
 #include "module.h"
 
+/* I can't get this to work, both with and without the const on the return
+ * type I get errors from gcc. One way about ignoring types in a cast, and the
+ * other about assigning to read-only variables.
+const Purple::StatusType
+purple_savedstatus_substatus_get_type(substatus)
+	const Purple::SavedStatus::Sub substatus
+*/
+
 MODULE = Purple::SavedStatus  PACKAGE = Purple::SavedStatus  PREFIX = purple_savedstatus_
 PROTOTYPES: ENABLE
 
-gboolean
-purple_savedstatus_delete(title)
-	const char *title
-
-Purple::SavedStatus
-purple_savedstatus_find(title)
-	const char *title
-
-const char *
-purple_savedstatus_get_message(saved_status)
-	Purple::SavedStatus saved_status
-
-const char *
-purple_savedstatus_get_title(saved_status)
-	Purple::SavedStatus saved_status
-
-Purple::StatusPrimitive
-purple_savedstatus_get_type(saved_status)
-	Purple::SavedStatus saved_status
-
 Purple::SavedStatus
 purple_savedstatus_new(title, type)
 	const char *title
 	Purple::StatusPrimitive type
 
 void
+purple_savedstatus_set_title(status, title)
+	Purple::SavedStatus status
+	const char *title
+
+void
+purple_savedstatus_set_type(status, type)
+	Purple::SavedStatus status
+	Purple::StatusPrimitive type
+
+void
 purple_savedstatus_set_message(status, message)
 	Purple::SavedStatus status
 	const char *message
 
+void
+purple_savedstatus_set_substatus(status, account, type, message)
+	Purple::SavedStatus status
+	Purple::Account account
+	Purple::StatusType type
+	const char *message
+
+void
+purple_savedstatus_unset_substatus(status, account)
+	Purple::SavedStatus status
+	Purple::Account account
+
+gboolean
+purple_savedstatus_delete(title)
+	const char *title
+
 Purple::SavedStatus
 purple_savedstatus_get_current()
 
+Purple::SavedStatus
+purple_savedstatus_get_default()
+
+Purple::SavedStatus
+purple_savedstatus_get_idleaway()
+
+gboolean
+purple_savedstatus_is_idleaway()
+
+void
+purple_savedstatus_set_idleaway(idleaway)
+	gboolean idleaway
+
+Purple::SavedStatus
+purple_savedstatus_get_startup()
+
+Purple::SavedStatus
+purple_savedstatus_find(title)
+	const char *title
+
+Purple::SavedStatus
+purple_savedstatus_find_by_creation_time(creation_time)
+	time_t creation_time
+
+Purple::SavedStatus
+purple_savedstatus_find_transient_by_type_and_message(type, message)
+	Purple::StatusPrimitive type
+	const char *message
+
+gboolean
+purple_savedstatus_is_transient(saved_status)
+	const Purple::SavedStatus saved_status
+
+const char *
+purple_savedstatus_get_title(saved_status)
+	const Purple::SavedStatus saved_status
+
+Purple::StatusPrimitive
+purple_savedstatus_get_type(saved_status)
+	const Purple::SavedStatus saved_status
+
+const char *
+purple_savedstatus_get_message(saved_status)
+	const Purple::SavedStatus saved_status
+
+time_t
+purple_savedstatus_get_creation_time(saved_status)
+	const Purple::SavedStatus saved_status
+
+gboolean
+purple_savedstatus_has_substatuses(saved_status)
+	const Purple::SavedStatus saved_status
+
+Purple::SavedStatus::Sub
+purple_savedstatus_get_substatus(saved_status, account)
+	Purple::SavedStatus saved_status
+	Purple::Account account
+
+void
+purple_savedstatus_activate(saved_status)
+	Purple::SavedStatus saved_status
+
+void
+purple_savedstatus_activate_for_account(saved_status, account)
+	const Purple::SavedStatus saved_status
+	Purple::Account account
+
+MODULE = Purple::SavedStatus::Sub  PACKAGE = Purple::SavedStatus::Sub  PREFIX = purple_savedstatus_substatus_
+PROTOTYPES: ENABLE
+
+const char *
+purple_savedstatus_substatus_get_message(substatus)
+	const Purple::SavedStatus::Sub substatus
+
 MODULE = Purple::SavedStatus  PACKAGE = Purple::SavedStatuses  PREFIX = purple_savedstatuses_
 PROTOTYPES: ENABLE
 
@@ -48,6 +136,16 @@
 		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus")));
 	}
 
+void
+purple_savedstatuses_get_popular(how_many)
+	unsigned int how_many
+PREINIT:
+	const GList *l;
+PPCODE:
+	for (l = purple_savedstatuses_get_popular(how_many); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::SavedStatus")));
+	}
+
 Purple::Handle
 purple_savedstatuses_get_handle()
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/plugins/perl/common/module.h
--- a/libpurple/plugins/perl/common/module.h	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/plugins/perl/common/module.h	Wed May 23 23:17:50 2007 +0000
@@ -236,7 +236,7 @@
 
 /* savedstatuses.h */
 typedef PurpleSavedStatus *		Purple__SavedStatus;
-typedef PurpleSavedStatusSub *		Purple__SavedStatusSub;
+typedef PurpleSavedStatusSub *		Purple__SavedStatus__Sub;
 
 /* sound.h */
 typedef PurpleSoundEventID		Purple__SoundEventID;
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/plugins/perl/common/typemap
--- a/libpurple/plugins/perl/common/typemap	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/plugins/perl/common/typemap	Wed May 23 23:17:50 2007 +0000
@@ -137,7 +137,9 @@
 Purple::RoomlistRoomType			T_IV
 
 Purple::SavedStatus			T_PurpleObj
-Purple::SavedStatusSub			T_PurpleObj
+const Purple::SavedStatus			T_PurpleObj
+Purple::SavedStatus::Sub			T_PurpleObj
+const Purple::SavedStatus::Sub			T_PurpleObj
 Purple::SoundEventID			T_IV
 Purple::Sound::UiOps			T_PurpleObj
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/plugins/perl/perl-common.c
--- a/libpurple/plugins/perl/perl-common.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/plugins/perl/perl-common.c	Wed May 23 23:17:50 2007 +0000
@@ -80,7 +80,7 @@
 	stash = gv_stashpv(stash_name, 1);
 
 	hv = newHV();
-	hv_store(hv, "_purple", 5, create_sv_ptr(object), 0);
+	hv_store(hv, "_purple", 7, create_sv_ptr(object), 0);
 
 	return sv_bless(newRV_noinc((SV *)hv), stash);
 }
@@ -94,7 +94,7 @@
 	hv = hvref(o);
 
 	if (hv != NULL) {
-		sv = hv_fetch(hv, "_purple", 5, 0);
+		sv = hv_fetch(hv, "_purple", 7, 0);
 
 		if (sv != NULL)
 			return TRUE;
@@ -118,7 +118,7 @@
 	if (hv == NULL)
 		return NULL;
 
-	sv = hv_fetch(hv, "_purple", 5, 0);
+	sv = hv_fetch(hv, "_purple", 7, 0);
 
 	if (sv == NULL)
 		croak("variable is damaged");
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/plugins/perl/scripts/signals-test.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/plugins/perl/scripts/signals-test.pl	Wed May 23 23:17:50 2007 +0000
@@ -0,0 +1,80 @@
+$MODULE_NAME = "Signals Test Script in Perl";
+
+use Purple;
+
+%PLUGIN_INFO = (
+	perl_api_version => 2,
+	name => "Perl: $MODULE_NAME",
+	version => "0.1",
+	summary => "Signals Test plugin for the Perl interpreter.",
+	description => "Demonstrate the user of purple signals from " .
+		       "a perl plugin.",
+	author => "Sadrul Habib Chowdhury <sadrul\@pidgin.im>",
+	url => "http://developer.pidgin.im/wiki/sadrul/",
+
+	load => "plugin_load",
+	unload => "plugin_unload"
+);
+
+# Accounts
+sub account_connecting_cb
+{
+	my $account = shift;
+	Purple::Debug::misc("signals test in perl", "account-connecting (" . $account->get_username() . ")\n");
+}
+
+# Buddylist
+sub buddy_signed_on
+{
+	my $buddy = shift;
+	Purple::Debug::misc("signals test in perl", "buddy-signed-on (" . $buddy->get_name() . ")\n");
+}
+
+# Connections
+sub signed_on
+{
+	my $conn = shift;
+	Purple::Debug::misc("signals test in perl", "signed-on (" . $conn->get_account()->get_username() . ")\n");
+}
+
+# Conversations
+sub conv_received_msg
+{
+	my ($account, $sender, $message, $conv, $flags, $data) = @_;
+	Purple::Debug::misc("signals test in perl", "$data (" . $account->get_username() . ", $sender, $message, $flags)\n");
+}
+
+sub plugin_load
+{
+	my $plugin = shift;
+
+	# Hook to the signals
+
+	# Accounts
+	$act_handle = Purple::Accounts::get_handle();
+	Purple::Signal::connect($act_handle, "account-connecting", $plugin,
+					\&account_connecting_cb, 0);
+
+	# Buddy List
+	$blist = Purple::BuddyList::get_handle();
+	Purple::Signal::connect($blist, "buddy-signed-on", $plugin,
+					\&buddy_signed_on, 0);
+
+	# Connections
+	$conn = Purple::Connections::get_handle();
+	Purple::Signal::connect($conn, "signed-on", $plugin,
+					\&signed_on, 0);
+
+	# Conversations
+	$conv = Purple::Conversations::get_handle();
+	Purple::Signal::connect($conv, "received-im-msg", $plugin,
+					\&conv_received_msg, "received im message");
+	Purple::Signal::connect($conv, "received-chat-msg", $plugin,
+					\&conv_received_msg, "received chat message");
+}
+
+sub plugin_unload
+{
+	# Nothing to do here for this plugin.
+}
+
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Wed May 23 23:17:50 2007 +0000
@@ -242,7 +242,7 @@
 	if (cbba->bj->account == gb->account)
 	{
 		bb = gb->proto_data;
-		if ((bb != NULL) && (g_strcasecmp(bb->ip, cbba->address) == 0))
+		if ((bb != NULL) && (g_ascii_strcasecmp(bb->ip, cbba->address) == 0))
 			*(cbba->gb) = gb;
 	}
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/irc/msgs.c	Wed May 23 23:17:50 2007 +0000
@@ -35,6 +35,7 @@
 static char *irc_mask_userhost(const char *mask);
 static void irc_chat_remove_buddy(PurpleConversation *convo, char *data[2]);
 static void irc_buddy_status(char *name, struct irc_buddy *ib, struct irc_conn *irc);
+static void irc_connected(struct irc_conn *irc, const char *nick);
 
 static void irc_msg_handle_privmsg(struct irc_conn *irc, const char *name,
                                    const char *from, const char *to,
@@ -70,6 +71,52 @@
 	g_free(message);
 }
 
+static void irc_connected(struct irc_conn *irc, const char *nick)
+{
+	PurpleConnection *gc;
+	PurpleStatus *status;
+	PurpleBlistNode *gnode, *cnode, *bnode;
+
+	if ((gc = purple_account_get_connection(irc->account)) == NULL
+	    || PURPLE_CONNECTION_IS_CONNECTED(gc))
+		return;
+
+	purple_connection_set_display_name(gc, nick);
+	purple_connection_set_state(gc, PURPLE_CONNECTED);
+
+	/* If we're away then set our away message */
+	status = purple_account_get_active_status(irc->account);
+	if (!purple_status_get_type(status) != PURPLE_STATUS_AVAILABLE) {
+		PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
+		prpl_info->set_status(irc->account, status);
+	}
+
+	/* this used to be in the core, but it's not now */
+	for (gnode = purple_get_blist()->root; gnode; gnode = gnode->next) {
+		if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
+			continue;
+		for(cnode = gnode->child; cnode; cnode = cnode->next) {
+			if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
+				continue;
+			for(bnode = cnode->child; bnode; bnode = bnode->next) {
+				PurpleBuddy *b;
+				if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
+					continue;
+				b = (PurpleBuddy *)bnode;
+				if(b->account == gc->account) {
+					struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
+					ib->name = g_strdup(b->name);
+					g_hash_table_insert(irc->buddies, ib->name, ib);
+				}
+			}
+		}
+	}
+
+	irc_blist_timeout(irc);
+	if (!irc->timer)
+		irc->timer = purple_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
+}
+
 void irc_msg_default(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	purple_debug(PURPLE_DEBUG_INFO, "irc", "Unrecognized message: %s\n", args[0]);
@@ -95,56 +142,16 @@
 
 void irc_msg_luser(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
-	PurpleConnection *gc;
-	PurpleStatus *status;
-	PurpleBlistNode *gnode, *cnode, *bnode;
-
-	if (!args || !args[0] || !args[1])
-		return;
-
-	gc = purple_account_get_connection(irc->account);
-	if (!gc)
+	if (!args || !args[0])
 		return;
 
 	if (!strcmp(name, "251")) {
-		/* 251 is required, so we pluck our nick from here */
-		purple_connection_set_display_name(gc, args[0]);
+		/* 251 is required, so we pluck our nick from here and
+		 * finalize connection */
+		irc_connected(irc, args[0]);
 		/* Some IRC servers seem to not send a 255 numeric, so
 		 * I guess we can't require it; 251 will do. */
 	/* } else if (!strcmp(name, "255")) { */
-		purple_connection_set_state(gc, PURPLE_CONNECTED);
-
-		/* If we're away then set our away message */
-		status = purple_account_get_active_status(irc->account);
-		if (!purple_status_get_type(status) != PURPLE_STATUS_AVAILABLE) {
-			PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
-			prpl_info->set_status(irc->account, status);
-		}
-
-		/* this used to be in the core, but it's not now */
-		for (gnode = purple_get_blist()->root; gnode; gnode = gnode->next) {
-			if(!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-				continue;
-			for(cnode = gnode->child; cnode; cnode = cnode->next) {
-				if(!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-					continue;
-				for(bnode = cnode->child; bnode; bnode = bnode->next) {
-					PurpleBuddy *b;
-					if(!PURPLE_BLIST_NODE_IS_BUDDY(bnode))
-						continue;
-					b = (PurpleBuddy *)bnode;
-					if(b->account == gc->account) {
-						struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
-						ib->name = g_strdup(b->name);
-						g_hash_table_insert(irc->buddies, ib->name, ib);
-					}
-				}
-			}
-		}
-
-		irc_blist_timeout(irc);
-		if (!irc->timer)
-			irc->timer = purple_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
 	}
 }
 
@@ -523,6 +530,9 @@
 {
 	char *escaped;
 
+	if (!args || !args[0])
+		return;
+
 	if (!irc->motd)
 		irc->motd = g_string_new("");
 
@@ -532,7 +542,9 @@
 		irc->motd = g_string_new("");
 		return;
 	} else if (!strcmp(name, "376")) {
-		/* We no longer have to do anything for ENDMOTD */
+		/* dircproxy 1.0.5 does not send 251 on reconnection, so
+		 * finalize the connection here if it is not already done. */
+		irc_connected(irc, args[0]);
 		return;
 	}
 
@@ -541,6 +553,9 @@
 		return;
 	}
 
+	if (!args[1])
+		return;
+
 	escaped = g_markup_escape_text(args[1], -1);
 	g_string_append_printf(irc->motd, "%s<br>", escaped);
 	g_free(escaped);
@@ -1074,11 +1089,21 @@
 void irc_msg_regonly(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	PurpleConnection *gc = purple_account_get_connection(irc->account);
+	PurpleConversation *convo;
 	char *msg;
 
 	if (!args || !args[1] || !args[2] || !gc)
 		return;
 
+	convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, args[1], irc->account);
+	if (convo) {
+		/* This is a channel we're already in; for some reason,
+		 * freenode feels the need to notify us that in some
+		 * hypothetical other situation this might not have
+		 * succeeded.  Suppress that. */
+		return;
+	}
+
 	msg = g_strdup_printf(_("Cannot join %s: Registration is required."), args[1]);
 	purple_notify_error(gc, _("Cannot join channel"), msg, args[2]);
 	g_free(msg);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/irc/parse.c
--- a/libpurple/protocols/irc/parse.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/irc/parse.c	Wed May 23 23:17:50 2007 +0000
@@ -227,7 +227,7 @@
 	enclist = purple_account_get_string(irc->account, "encoding", IRC_DEFAULT_CHARSET);
 	encodings = g_strsplit(enclist, ",", 2);
 
-	if (encodings[0] == NULL || !strcasecmp("UTF-8", encodings[0])) {
+	if (encodings[0] == NULL || !g_ascii_strcasecmp("UTF-8", encodings[0])) {
 		g_strfreev(encodings);
 		return g_strdup(string);
 	}
@@ -264,7 +264,7 @@
 		while (*charset == ' ')
 			charset++;
 
-		if (!strcasecmp("UTF-8", charset)) {
+		if (!g_ascii_strcasecmp("UTF-8", charset)) {
 			if (g_utf8_validate(string, -1, NULL))
 				utf8 = g_strdup(string);
 		} else {
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/jabber/auth.c	Wed May 23 23:17:50 2007 +0000
@@ -612,28 +612,62 @@
 	jabber_iq_send(iq);
 }
 
+/* Parts of this algorithm are inspired by stuff in libgsasl */
 static GHashTable* parse_challenge(const char *challenge)
 {
+	const char *token_start, *val_start, *val_end, *cur;
 	GHashTable *ret = g_hash_table_new_full(g_str_hash, g_str_equal,
 			g_free, g_free);
-	char **pairs;
-	int i;
 
-	pairs = g_strsplit(challenge, ",", -1);
+	cur = challenge;
+	while(*cur != '\0') {
+		/* Find the end of the token */
+		gboolean in_quotes = FALSE;
+		char *name, *value = NULL;
+		token_start = cur;
+		while(*cur != '\0' && (in_quotes || (!in_quotes && *cur != ','))) {
+			if (*cur == '"')
+				in_quotes = !in_quotes;
+			cur++;
+		}
+
+		/* Find start of value.  */
+		val_start = strchr(token_start, '=');
+		if (val_start == NULL || val_start > cur)
+			val_start = cur;
+
+		if (token_start != val_start) {
+			name = g_strndup(token_start, val_start - token_start);
 
-	for(i=0; pairs[i]; i++) {
-		char **keyval = g_strsplit(pairs[i], "=", 2);
-		if(keyval[0] && keyval[1]) {
-			if(keyval[1][0] == '"' && keyval[1][strlen(keyval[1])-1] == '"')
-				g_hash_table_replace(ret, g_strdup(keyval[0]), g_strndup(keyval[1]+1, strlen(keyval[1])-2));
-			else
-				g_hash_table_replace(ret, g_strdup(keyval[0]), g_strdup(keyval[1]));
+			if (val_start != cur) {
+				val_start++;
+				while (val_start != cur && (*val_start == ' ' || *val_start == '\t'
+						|| *val_start == '\r' || *val_start == '\n'
+						|| *val_start == '"'))
+					val_start++;
+
+				val_end = cur;
+				while (val_end != val_start && (*val_end == ' ' || *val_end == ',' || *val_end == '\t'
+						|| *val_end == '\r' || *val_start == '\n'
+						|| *val_end == '"'))
+					val_end--;
+
+				if (val_start != val_end)
+					value = g_strndup(val_start, val_end - val_start + 1);
+			}
+
+			g_hash_table_replace(ret, name, value);
 		}
-		g_strfreev(keyval);
+
+		/* Find the start of the next token, if there is one */
+		if (*cur != '\0') {
+			cur++;
+			while (*cur == ' ' || *cur == ',' || *cur == '\t'
+					|| *cur == '\r' || *cur == '\n')
+				cur++;
+		}
 	}
 
-	g_strfreev(pairs);
-
 	return ret;
 }
 
@@ -738,14 +772,14 @@
 		} else {
 			/* assemble a response, and send it */
 			/* see RFC 2831 */
-			GString *response = g_string_new("");
-			char *a2;
-			char *auth_resp;
-			char *buf;
-			char *cnonce;
 			char *realm;
 			char *nonce;
 
+			/* Make sure the auth string contains everything that should be there.
+			   This isn't everything in RFC2831, but it is what we need. */
+
+			nonce = g_hash_table_lookup(parts, "nonce");
+
 			/* we're actually supposed to prompt the user for a realm if
 			 * the server doesn't send one, but that really complicates things,
 			 * so i'm not gonna worry about it until is poses a problem to
@@ -754,48 +788,55 @@
 			if(!realm)
 				realm = js->user->domain;
 
-			cnonce = g_strdup_printf("%x%u%x", g_random_int(), (int)time(NULL),
-					g_random_int());
-			nonce = g_hash_table_lookup(parts, "nonce");
-
+			if (nonce == NULL || realm == NULL)
+				purple_connection_error(js->gc, _("Invalid challenge from server"));
+			else {
+				GString *response = g_string_new("");
+				char *a2;
+				char *auth_resp;
+				char *buf;
+				char *cnonce;
 
-			a2 = g_strdup_printf("AUTHENTICATE:xmpp/%s", realm);
-			auth_resp = generate_response_value(js->user,
-					purple_connection_get_password(js->gc), nonce, cnonce, a2, realm);
-			g_free(a2);
+				cnonce = g_strdup_printf("%x%u%x", g_random_int(), (int)time(NULL),
+						g_random_int());
 
-			a2 = g_strdup_printf(":xmpp/%s", realm);
-			js->expected_rspauth = generate_response_value(js->user,
-					purple_connection_get_password(js->gc), nonce, cnonce, a2, realm);
-			g_free(a2);
+				a2 = g_strdup_printf("AUTHENTICATE:xmpp/%s", realm);
+				auth_resp = generate_response_value(js->user,
+						purple_connection_get_password(js->gc), nonce, cnonce, a2, realm);
+				g_free(a2);
 
+				a2 = g_strdup_printf(":xmpp/%s", realm);
+				js->expected_rspauth = generate_response_value(js->user,
+						purple_connection_get_password(js->gc), nonce, cnonce, a2, realm);
+				g_free(a2);
 
-			g_string_append_printf(response, "username=\"%s\"", js->user->node);
-			g_string_append_printf(response, ",realm=\"%s\"", realm);
-			g_string_append_printf(response, ",nonce=\"%s\"", nonce);
-			g_string_append_printf(response, ",cnonce=\"%s\"", cnonce);
-			g_string_append_printf(response, ",nc=00000001");
-			g_string_append_printf(response, ",qop=auth");
-			g_string_append_printf(response, ",digest-uri=\"xmpp/%s\"", realm);
-			g_string_append_printf(response, ",response=%s", auth_resp);
-			g_string_append_printf(response, ",charset=utf-8");
+				g_string_append_printf(response, "username=\"%s\"", js->user->node);
+				g_string_append_printf(response, ",realm=\"%s\"", realm);
+				g_string_append_printf(response, ",nonce=\"%s\"", nonce);
+				g_string_append_printf(response, ",cnonce=\"%s\"", cnonce);
+				g_string_append_printf(response, ",nc=00000001");
+				g_string_append_printf(response, ",qop=auth");
+				g_string_append_printf(response, ",digest-uri=\"xmpp/%s\"", realm);
+				g_string_append_printf(response, ",response=%s", auth_resp);
+				g_string_append_printf(response, ",charset=utf-8");
 
-			g_free(auth_resp);
-			g_free(cnonce);
+				g_free(auth_resp);
+				g_free(cnonce);
 
-			enc_out = purple_base64_encode((guchar *)response->str, response->len);
+				enc_out = purple_base64_encode((guchar *)response->str, response->len);
 
-			purple_debug(PURPLE_DEBUG_MISC, "jabber", "decoded response (%d): %s\n", response->len, response->str);
+				purple_debug(PURPLE_DEBUG_MISC, "jabber", "decoded response (%d): %s\n", response->len, response->str);
 
-			buf = g_strdup_printf("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>%s</response>", enc_out);
+				buf = g_strdup_printf("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>%s</response>", enc_out);
 
-			jabber_send_raw(js, buf, -1);
+				jabber_send_raw(js, buf, -1);
 
-			g_free(buf);
+				g_free(buf);
 
-			g_free(enc_out);
+				g_free(enc_out);
 
-			g_string_free(response, TRUE);
+				g_string_free(response, TRUE);
+			}
 		}
 
 		g_free(enc_in);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Wed May 23 23:17:50 2007 +0000
@@ -73,6 +73,15 @@
 
 } MsnGetInfoStepTwoData;
 
+typedef struct
+{
+	PurpleConnection *gc;
+	const char *who;
+	char *msg;
+	PurpleMessageFlags flags;
+	time_t when;
+} MsnIMData;
+
 static const char *
 msn_normalize(const PurpleAccount *account, const char *str)
 {
@@ -409,33 +418,7 @@
 static void
 t_msn_xfer_init(PurpleXfer *xfer)
 {
-	MsnSlpLink *slplink;
-	const char *filename;
-	FILE *fp;
-
-	filename = purple_xfer_get_local_filename(xfer);
-
-	slplink = xfer->data;
-
-	if ((fp = g_fopen(filename, "rb")) == NULL)
-	{
-		PurpleAccount *account;
-		const char *who;
-		char *msg;
-
-		account = slplink->session->account;
-		who = slplink->remote_user;
-
-		msg = g_strdup_printf(_("Error reading %s: \n%s.\n"),
-							  filename, strerror(errno));
-		purple_xfer_error(purple_xfer_get_type(xfer), account, xfer->who, msg);
-		purple_xfer_cancel_local(xfer);
-		g_free(msg);
-
-		return;
-	}
-	fclose(fp);
-
+	MsnSlpLink *slplink = xfer->data;
 	msn_slplink_request_ft(slplink, xfer);
 }
 
@@ -636,7 +619,8 @@
 	account = purple_connection_get_account(gc);
 	user = msn_normalize(account, purple_account_get_username(account));
 
-	if (strstr(user, "@hotmail.com") != NULL)
+	if ((strstr(user, "@hotmail.") != NULL) ||
+		(strstr(user, "@msn.com") != NULL))
 	{
 		m = g_list_append(m, NULL);
 		act = purple_plugin_action_new(_("Open Hotmail Inbox"),
@@ -753,6 +737,16 @@
 	gc->proto_data = NULL;
 }
 
+static gboolean
+msn_send_me_im(gpointer data)
+{
+	MsnIMData *imdata = data;
+	serv_got_im(imdata->gc, imdata->who, imdata->msg, imdata->flags, imdata->when);
+	g_free(imdata->msg);
+	g_free(imdata);
+	return FALSE;
+}
+
 static int
 msn_send_im(PurpleConnection *gc, const char *who, const char *message,
 			PurpleMessageFlags flags)
@@ -805,6 +799,7 @@
 	{
 		char *body_str, *body_enc, *pre, *post;
 		const char *format;
+		MsnIMData *imdata = g_new0(MsnIMData, 1);
 		/*
 		 * In MSN, you can't send messages to yourself, so
 		 * we'll fake like we received it ;)
@@ -822,8 +817,12 @@
 		g_free(post);
 
 		serv_got_typing_stopped(gc, who);
-		serv_got_im(gc, who, body_str, flags, time(NULL));
-		g_free(body_str);
+		imdata->gc = gc;
+		imdata->who = who;
+		imdata->msg = body_str;
+		imdata->flags = flags;
+		imdata->when = time(NULL);
+		g_idle_add(msn_send_me_im, imdata);
 	}
 
 	msn_message_destroy(msg);
@@ -1298,7 +1297,12 @@
 
 	conv = swboard->conv;
 
-	msn_switchboard_release(swboard, MSN_SB_FLAG_IM);
+	/* If we release the switchboard here, it may still have messages
+	   pending ACK which would result in incorrect unsent message errors.
+	   Just let it timeout... This is *so* going to screw with people who
+	   use dumb clients that report "User has closed the conversation window" */
+	/* msn_switchboard_release(swboard, MSN_SB_FLAG_IM); */
+	swboard->conv = NULL;
 
 	/* If other switchboards managed to associate themselves with this
 	 * conv, make sure they know it's gone! */
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Wed May 23 23:17:50 2007 +0000
@@ -589,6 +589,23 @@
 }
 
 static void
+qng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	static int count = 0;
+	MsnSession *session = cmdproc->session;
+
+	if (session->passport_info.file == NULL)
+		return;
+
+	if (count++ < 26)
+		return;
+
+	count = 0;
+	msn_cmdproc_send(cmdproc, "URL", "%s", "INBOX");
+}
+
+
+static void
 fln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSlpLink *slplink;
@@ -982,7 +999,8 @@
 	}
 	else
 	{
-		fputs("<html>\n"
+		fputs("<!-- saved from url=(0013)about:internet -->\n"
+			  "<html>\n"
 			  "<head>\n"
 			  "<noscript>\n"
 			  "<meta http-equiv=\"Refresh\" content=\"0; "
@@ -1404,7 +1422,7 @@
 	msn_table_add_cmd(cbs_table, NULL, "ADD", add_cmd);
 
 	msn_table_add_cmd(cbs_table, NULL, "QRY", NULL);
-	msn_table_add_cmd(cbs_table, NULL, "QNG", NULL);
+	msn_table_add_cmd(cbs_table, NULL, "QNG", qng_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "FLN", fln_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "NLN", nln_cmd);
 	msn_table_add_cmd(cbs_table, NULL, "ILN", iln_cmd);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/msn/session.c
--- a/libpurple/protocols/msn/session.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Wed May 23 23:17:50 2007 +0000
@@ -404,4 +404,9 @@
 
 	/* Sync users */
 	msn_session_sync_users(session);
+	/* It seems that some accounts that haven't accessed hotmail for a while
+	 * and @msn.com accounts don't automatically get the initial email
+	 * notification so we always request it on login
+	 */
+	msn_cmdproc_send(session->notification->cmdproc, "URL", "%s", "INBOX");
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/msn/slp.c
--- a/libpurple/protocols/msn/slp.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/msn/slp.c	Wed May 23 23:17:50 2007 +0000
@@ -158,7 +158,9 @@
 msn_xfer_completed_cb(MsnSlpCall *slpcall, const guchar *body,
 					  gsize size)
 {
-	purple_xfer_set_completed(slpcall->xfer, TRUE);
+	PurpleXfer *xfer = slpcall->xfer;
+	purple_xfer_set_completed(xfer, TRUE);
+	purple_xfer_end(xfer);
 }
 
 /**************************************************************************
@@ -361,6 +363,8 @@
 			purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel);
 
 			slpcall->xfer = xfer;
+			purple_xfer_ref(slpcall->xfer);
+
 			xfer->data = slpcall;
 
 			purple_xfer_request(xfer);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/msn/slpcall.c
--- a/libpurple/protocols/msn/slpcall.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Wed May 23 23:17:50 2007 +0000
@@ -120,6 +120,9 @@
 	if (slpcall->end_cb != NULL)
 		slpcall->end_cb(slpcall, session);
 
+	if (slpcall->xfer != NULL)
+		purple_xfer_unref(slpcall->xfer);
+
 	g_free(slpcall);
 }
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/msn/slplink.c	Wed May 23 23:17:50 2007 +0000
@@ -482,6 +482,8 @@
 {
 	MsnSlpCall *slpcall;
 	MsnSlpMessage *slpmsg;
+	struct stat st;
+	PurpleXfer *xfer;
 
 	slpcall = slpsession->slpcall;
 	slpmsg = msn_slpmsg_new(slpcall->slplink);
@@ -491,7 +493,12 @@
 #ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP FILE";
 #endif
-	msn_slpmsg_open_file(slpmsg, purple_xfer_get_local_filename(slpcall->xfer));
+	xfer = (PurpleXfer *)slpcall->xfer;
+	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	slpmsg->fp = xfer->dest_fp;
+	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
+		slpmsg->size = st.st_size;
+	xfer->dest_fp = NULL; /* Disable double fclose() */
 
 	msn_slplink_send_slpmsg(slpcall->slplink, slpmsg);
 }
@@ -551,9 +558,10 @@
 
 					if (xfer != NULL)
 					{
-						slpmsg->fp =
-							g_fopen(purple_xfer_get_local_filename(slpmsg->slpcall->xfer),
-								  "wb");
+						purple_xfer_start(slpmsg->slpcall->xfer,
+							0, NULL, 0);
+						slpmsg->fp = ((PurpleXfer *)slpmsg->slpcall->xfer)->dest_fp;
+						xfer->dest_fp = NULL; /* Disable double fclose() */
 					}
 				}
 			}
@@ -755,6 +763,7 @@
 	slpcall->progress_cb = msn_xfer_progress_cb;
 	slpcall->cb = msn_xfer_completed_cb;
 	slpcall->xfer = xfer;
+	purple_xfer_ref(slpcall->xfer);
 
 	slpcall->pending = TRUE;
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/novell/nmuser.c
--- a/libpurple/protocols/novell/nmuser.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/novell/nmuser.c	Wed May 23 23:17:50 2007 +0000
@@ -944,7 +944,7 @@
 	}
 
 	/* Remove item from the cached list */
-	if ((node = g_slist_find_custom(*list_ptr, dn, (GCompareFunc)nm_utf8_strcasecmp))) {
+	if ((node = g_slist_find_custom(*list_ptr, dn, (GCompareFunc)purple_utf8_strcasecmp))) {
 		*list_ptr = g_slist_remove_link(*list_ptr, node);
 		g_slist_free_1(node);
 	}
@@ -1223,13 +1223,13 @@
 	locate = nm_locate_field(NM_A_LOCKED_ATTR_LIST, user->fields);
 	if (locate && locate->ptr_value) {
 		if (locate->type == NMFIELD_TYPE_UTF8 &&
-			(nm_utf8_strcasecmp(locate->ptr_value, NM_A_BLOCKING) == 0)) {
+			(purple_utf8_strcasecmp(locate->ptr_value, NM_A_BLOCKING) == 0)) {
 			user->privacy_locked = TRUE;
 		} else if (locate->type == NMFIELD_TYPE_MV ||
 				   locate->type == NMFIELD_TYPE_ARRAY) {
 			NMField *tmp = (NMField *)locate->ptr_value;
 			while (tmp && tmp->tag) {
-				if (nm_utf8_strcasecmp(tmp->ptr_value, NM_A_BLOCKING) == 0) {
+				if (purple_utf8_strcasecmp(tmp->ptr_value, NM_A_BLOCKING) == 0) {
 					user->privacy_locked = TRUE;
 					break;
 				}
@@ -1800,25 +1800,11 @@
  * Some utility functions...haven't figured out where
  * they belong yet.
  */
-gint
-nm_utf8_strcasecmp(gconstpointer str1, gconstpointer str2)
-{
-	gint rv;
-	char *str1_down = g_utf8_strdown(str1, -1);
-	char *str2_down = g_utf8_strdown(str2, -1);
-
-	rv = g_utf8_collate(str1_down, str2_down);
-
-	g_free(str1_down);
-	g_free(str2_down);
-
-	return rv;
-}
 
 gboolean
 nm_utf8_str_equal(gconstpointer str1, gconstpointer str2)
 {
-	return (nm_utf8_strcasecmp(str1, str2) == 0);
+	return (purple_utf8_strcasecmp(str1, str2) == 0);
 }
 
 char *
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/novell/nmuser.h
--- a/libpurple/protocols/novell/nmuser.h	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/novell/nmuser.h	Wed May 23 23:17:50 2007 +0000
@@ -646,18 +646,6 @@
  */
 gboolean nm_are_guids_equal(const char *guid1, const char *guid2);
 
-
-/**
- * Case insensitive compare for utf8 strings
- *
- * @param guid1	First string to compare
- * @param guid2 Second string to compare
- *
- * @return 		-1 if str1 < str2, 0 if str1 = str2, 1 if str1 > str2
- *
- */
-gint nm_utf8_strcasecmp(gconstpointer str1, gconstpointer str2);
-
 /**
  * Compare UTF8 strings for equality only (case insensitive)
  *
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/novell/novell.c	Wed May 23 23:17:50 2007 +0000
@@ -734,14 +734,14 @@
 		if (allowed) {
 
 			if (!g_slist_find_custom(gc->account->permit,
-									 display_id, (GCompareFunc)nm_utf8_strcasecmp)) {
+									 display_id, (GCompareFunc)purple_utf8_strcasecmp)) {
 				purple_privacy_permit_add(gc->account, display_id, TRUE);
 			}
 
 		} else {
 
 			if (!g_slist_find_custom(gc->account->permit,
-									 display_id, (GCompareFunc)nm_utf8_strcasecmp)) {
+									 display_id, (GCompareFunc)purple_utf8_strcasecmp)) {
 				purple_privacy_deny_add(gc->account, display_id, TRUE);
 			}
 		}
@@ -782,7 +782,7 @@
 		if (display_id) {
 
 			if (!g_slist_find_custom(gc->account->deny,
-									 display_id, (GCompareFunc)nm_utf8_strcasecmp)) {
+									 display_id, (GCompareFunc)purple_utf8_strcasecmp)) {
 
 				purple_privacy_deny_add(gc->account, display_id, TRUE);
 			}
@@ -834,7 +834,7 @@
 
 			if (!g_slist_find_custom(gc->account->permit,
 									 display_id,
-									 (GCompareFunc)nm_utf8_strcasecmp)) {
+									 (GCompareFunc)purple_utf8_strcasecmp)) {
 
 				purple_privacy_permit_add(gc->account, display_id, TRUE);
 			}
@@ -1412,7 +1412,7 @@
 			name =(char *)node->data;
 
 		if (!g_slist_find_custom(gc->account->permit,
-								 name, (GCompareFunc)nm_utf8_strcasecmp)) {
+								 name, (GCompareFunc)purple_utf8_strcasecmp)) {
 			purple_privacy_permit_add(gc->account, name , TRUE);
 		}
 	}
@@ -1425,7 +1425,7 @@
 			name =(char *)node->data;
 
 		if (!g_slist_find_custom(gc->account->deny,
-								 name, (GCompareFunc)nm_utf8_strcasecmp)) {
+								 name, (GCompareFunc)purple_utf8_strcasecmp)) {
 			purple_privacy_deny_add(gc->account, name, TRUE);
 		}
 	}
@@ -1436,7 +1436,7 @@
 		dn = nm_lookup_dn(user, (char *)node->data);
 		if (dn != NULL &&
 			!g_slist_find_custom(user->allow_list,
-								 dn, (GCompareFunc)nm_utf8_strcasecmp)) {
+								 dn, (GCompareFunc)purple_utf8_strcasecmp)) {
 			rem_list = g_slist_append(rem_list, node->data);
 		}
 	}
@@ -1453,7 +1453,7 @@
 		dn = nm_lookup_dn(user, (char *)node->data);
 		if (dn != NULL &&
 			!g_slist_find_custom(user->deny_list,
-								 dn, (GCompareFunc)nm_utf8_strcasecmp)) {
+								 dn, (GCompareFunc)purple_utf8_strcasecmp)) {
 			rem_list = g_slist_append(rem_list, node->data);
 		}
 	}
@@ -3268,7 +3268,7 @@
 						name = nm_user_record_get_display_id(user_record);
 
 						if (!g_slist_find_custom(gc->account->permit,
-												 name, (GCompareFunc)nm_utf8_strcasecmp)) {
+												 name, (GCompareFunc)purple_utf8_strcasecmp)) {
 							purple_privacy_permit_add(gc->account, name , TRUE);
 						}
 					}
@@ -3282,7 +3282,7 @@
 						name = nm_user_record_get_display_id(user_record);
 
 						if (!g_slist_find_custom(user->allow_list,
-												 dn, (GCompareFunc)nm_utf8_strcasecmp)) {
+												 dn, (GCompareFunc)purple_utf8_strcasecmp)) {
 							rc = nm_send_create_privacy_item(user, dn, TRUE,
 															 _create_privacy_item_deny_resp_cb,
 															 g_strdup(dn));
@@ -3310,7 +3310,7 @@
 						name = nm_user_record_get_display_id(user_record);
 
 						if (!g_slist_find_custom(gc->account->deny,
-												 name, (GCompareFunc)nm_utf8_strcasecmp)) {
+												 name, (GCompareFunc)purple_utf8_strcasecmp)) {
 							purple_privacy_deny_add(gc->account, name , TRUE);
 						}
 					}
@@ -3325,7 +3325,7 @@
 						name = nm_user_record_get_display_id(user_record);
 
 						if (!g_slist_find_custom(user->deny_list,
-												 dn, (GCompareFunc)nm_utf8_strcasecmp)) {
+												 dn, (GCompareFunc)purple_utf8_strcasecmp)) {
 							rc = nm_send_create_privacy_item(user, dn, FALSE,
 															 _create_privacy_item_deny_resp_cb,
 															 g_strdup(name));
@@ -3358,7 +3358,7 @@
 				contact = nm_folder_get_contact(user->root_folder, i);
 				dn = nm_contact_get_dn(contact);
 				if (dn && !g_slist_find_custom(user->allow_list,
-											   dn, (GCompareFunc)nm_utf8_strcasecmp))
+											   dn, (GCompareFunc)purple_utf8_strcasecmp))
 				{
 					rc = nm_send_create_privacy_item(user, dn, TRUE,
 													 _create_privacy_item_deny_resp_cb,
@@ -3377,7 +3377,7 @@
 					contact = nm_folder_get_contact(folder, j);
 					dn = nm_contact_get_dn(contact);
 					if (dn && !g_slist_find_custom(user->allow_list,
-												   dn, (GCompareFunc)nm_utf8_strcasecmp))
+												   dn, (GCompareFunc)purple_utf8_strcasecmp))
 					{
 						rc = nm_send_create_privacy_item(user, dn, TRUE,
 														 _create_privacy_item_deny_resp_cb,
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/bstream.c
--- a/libpurple/protocols/oscar/bstream.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/bstream.c	Wed May 23 23:17:50 2007 +0000
@@ -172,10 +172,10 @@
 {
 	guint8 *ob;
 
-	ob = malloc(len);
+	ob = g_malloc(len);
 
 	if (byte_stream_getrawbuf(bs, ob, len) < len) {
-		free(ob);
+		g_free(ob);
 		return NULL;
 	}
 
@@ -186,10 +186,10 @@
 {
 	char *ob;
 
-	ob = malloc(len + 1);
+	ob = g_malloc(len + 1);
 
 	if (byte_stream_getrawbuf(bs, (guint8 *)ob, len) < len) {
-		free(ob);
+		g_free(ob);
 		return NULL;
 	}
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_admin.c
--- a/libpurple/protocols/oscar/family_admin.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_admin.c	Wed May 23 23:17:50 2007 +0000
@@ -81,12 +81,12 @@
 
 		switch (type) {
 			case 0x0001: {
-				free(sn);
+				g_free(sn);
 				sn = byte_stream_getstr(bs, length);
 			} break;
 
 			case 0x0004: {
-				free(url);
+				g_free(url);
 				url = byte_stream_getstr(bs, length);
 			} break;
 
@@ -95,7 +95,7 @@
 			} break;
 
 			case 0x0011: {
-				free(email);
+				g_free(email);
 				if (length == 0)
 					email = g_strdup("*suppressed");
 				else
@@ -109,9 +109,9 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		userfunc(od, conn, frame, (snac->subtype == 0x0005) ? 1 : 0, perms, err, url, sn, email);
 
-	free(sn);
-	free(url);
-	free(email);
+	g_free(sn);
+	g_free(url);
+	g_free(email);
 
 	return 1;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_alert.c
--- a/libpurple/protocols/oscar/family_alert.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_alert.c	Wed May 23 23:17:50 2007 +0000
@@ -111,10 +111,10 @@
 	for (new = od->emailinfo; (new && memcmp(cookie16, new->cookie16, 16)); new = new->next);
 	if (new) {
 		/* Free some of the old info, if it exists */
-		free(new->cookie8);
-		free(new->cookie16);
-		free(new->url);
-		free(new->domain);
+		g_free(new->cookie8);
+		g_free(new->cookie16);
+		g_free(new->url);
+		g_free(new->domain);
 	} else {
 		/* We don't already have info, so create a new struct for it */
 		new = g_new0(struct aim_emailinfo, 1);
@@ -154,8 +154,8 @@
 
 	aim_tlvlist_free(&tlvlist);
 
-	free(alertitle);
-	free(alerturl);
+	g_free(alertitle);
+	g_free(alerturl);
 
 	return ret;
 }
@@ -210,11 +210,11 @@
 	{
 		struct aim_emailinfo *tmp = od->emailinfo;
 		od->emailinfo = od->emailinfo->next;
-		free(tmp->cookie16);
-		free(tmp->cookie8);
-		free(tmp->url);
-		free(tmp->domain);
-		free(tmp);
+		g_free(tmp->cookie16);
+		g_free(tmp->cookie8);
+		g_free(tmp->url);
+		g_free(tmp->domain);
+		g_free(tmp);
 	}
 
 	return;
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_auth.c
--- a/libpurple/protocols/oscar/family_auth.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_auth.c	Wed May 23 23:17:50 2007 +0000
@@ -79,7 +79,7 @@
 
 #ifdef USE_OLD_MD5
 static int
-aim_encode_password_md5(const char *password, const char *key, guint8 *digest)
+aim_encode_password_md5(const char *password, size_t password_len, const char *key, guint8 *digest)
 {
 	PurpleCipher *cipher;
 	PurpleCipherContext *context;
@@ -88,7 +88,7 @@
 
 	context = purple_cipher_context_new(cipher, NULL);
 	purple_cipher_context_append(context, (const guchar *)key, strlen(key));
-	purple_cipher_context_append(context, (const guchar *)password, strlen(password));
+	purple_cipher_context_append(context, (const guchar *)password, password_len);
 	purple_cipher_context_append(context, (const guchar *)AIM_MD5_STRING, strlen(AIM_MD5_STRING));
 	purple_cipher_context_digest(context, 16, digest, NULL);
 	purple_cipher_context_destroy(context);
@@ -97,7 +97,7 @@
 }
 #else
 static int
-aim_encode_password_md5(const char *password, const char *key, guint8 *digest)
+aim_encode_password_md5(const char *password, size_t password_len, const char *key, guint8 *digest)
 {
 	PurpleCipher *cipher;
 	PurpleCipherContext *context;
@@ -106,7 +106,7 @@
 	cipher = purple_ciphers_find_cipher("md5");
 
 	context = purple_cipher_context_new(cipher, NULL);
-	purple_cipher_context_append(context, (const guchar *)password, strlen(password));
+	purple_cipher_context_append(context, (const guchar *)password, password_len);
 	purple_cipher_context_digest(context, 16, passdigest, NULL);
 	purple_cipher_context_destroy(context);
 
@@ -134,7 +134,7 @@
 	guint8 *password_encoded;
 
 	passwdlen = strlen(password);
-	password_encoded = (guint8 *)malloc(passwdlen+1);
+	password_encoded = (guint8 *)g_malloc(passwdlen+1);
 	if (passwdlen > MAXICQPASSLEN)
 		passwdlen = MAXICQPASSLEN;
 
@@ -159,7 +159,7 @@
 
 	aim_tlvlist_write(&frame->data, &tl);
 
-	free(password_encoded);
+	g_free(password_encoded);
 	aim_tlvlist_free(&tl);
 
 	flap_connection_send(conn, frame);
@@ -198,12 +198,13 @@
  *
  */
 int
-aim_send_login(OscarData *od, FlapConnection *conn, const char *sn, const char *password, ClientInfo *ci, const char *key)
+aim_send_login(OscarData *od, FlapConnection *conn, const char *sn, const char *password, gboolean truncate_pass, ClientInfo *ci, const char *key)
 {
 	FlapFrame *frame;
 	aim_tlvlist_t *tl = NULL;
 	guint8 digest[16];
 	aim_snacid_t snacid;
+	size_t password_len;
 
 	if (!ci || !sn || !password)
 		return -EINVAL;
@@ -221,18 +222,14 @@
 
 	aim_tlvlist_add_str(&tl, 0x0001, sn);
 
-	/* Truncate ICQ passwords, if necessary */
-	if (isdigit(sn[0]) && (strlen(password) > MAXICQPASSLEN))
-	{
-		char truncated[MAXICQPASSLEN + 1];
-		strncpy(truncated, password, MAXICQPASSLEN);
-		truncated[MAXICQPASSLEN] = 0;
-		aim_encode_password_md5(truncated, key, digest);
-	}
-	else
-	{
-		aim_encode_password_md5(password, key, digest);
-	}
+	/* Truncate ICQ and AOL passwords, if necessary */
+	password_len = strlen(password);
+	if (isdigit(sn[0]) && (password_len > MAXICQPASSLEN))
+		password_len = MAXICQPASSLEN;
+	else if (truncate_pass && password_len > 8)
+		password_len = 8;
+
+	aim_encode_password_md5(password, password_len, key, digest);
 
 	aim_tlvlist_add_raw(&tl, 0x0025, 16, digest);
 
@@ -520,18 +517,29 @@
 	int keylen, ret = 1;
 	aim_rxcallback_t userfunc;
 	char *keystr;
+	aim_tlvlist_t *tlvlist;
+	gboolean truncate_pass;
 
 	keylen = byte_stream_get16(bs);
 	keystr = byte_stream_getstr(bs, keylen);
+	tlvlist = aim_tlvlist_read(bs);
+
+	/*
+	 * If the truncate_pass TLV exists then we should truncate the
+	 * user's password to 8 characters.  This flag is sent when you
+	 * try to log in with an AOL user's screen name.
+	 */
+	truncate_pass = aim_tlv_gettlv(tlvlist, 0x0026, 1) != NULL;
 
 	/* XXX - When GiantGrayPanda signed on AIM I got a thing asking me to register
 	 * for the netscape network.  This SNAC had a type 0x0058 TLV with length 10.
 	 * Data is 0x0007 0004 3e19 ae1e 0006 0004 0000 0005 */
 
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-		ret = userfunc(od, conn, frame, keystr);
+		ret = userfunc(od, conn, frame, keystr, (int)truncate_pass);
 
-	free(keystr);
+	g_free(keystr);
+	aim_tlvlist_free(&tlvlist);
 
 	return ret;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_bart.c
--- a/libpurple/protocols/oscar/family_bart.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_bart.c	Wed May 23 23:17:50 2007 +0000
@@ -151,9 +151,9 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn, iconcsumtype, iconcsum, iconcsumlen, icon, iconlen);
 
-	free(sn);
-	free(iconcsum);
-	free(icon);
+	g_free(sn);
+	g_free(iconcsum);
+	g_free(icon);
 
 	return ret;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_bos.c
--- a/libpurple/protocols/oscar/family_bos.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_bos.c	Wed May 23 23:17:50 2007 +0000
@@ -136,7 +136,7 @@
 	else
 		return -EINVAL;
 
-	localcpy = strdup(denylist);
+	localcpy = g_strdup(denylist);
 
 	listcount = aimutil_itemcnt(localcpy, '&');
 	packlen = aimutil_tokslen(localcpy, 99, '&') + listcount + 9;
@@ -152,9 +152,9 @@
 		byte_stream_put8(&frame->data, strlen(tmpptr));
 		byte_stream_putstr(&frame->data, tmpptr);
 
-		free(tmpptr);
+		g_free(tmpptr);
 	}
-	free(localcpy);
+	g_free(localcpy);
 
 	flap_connection_send(conn, frame);
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_buddy.c
--- a/libpurple/protocols/oscar/family_buddy.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_buddy.c	Wed May 23 23:17:50 2007 +0000
@@ -135,7 +135,7 @@
 	char *localcpy = NULL;
 	char *tmpptr = NULL;
 
-	if (!buddy_list || !(localcpy = strdup(buddy_list)))
+	if (!buddy_list || !(localcpy = g_strdup(buddy_list)))
 		return -EINVAL;
 
 	for (tmpptr = strtok(localcpy, "&"); tmpptr; ) {
@@ -162,7 +162,7 @@
 
 	flap_connection_send(conn, frame);
 
-	free(localcpy);
+	g_free(localcpy);
 
 	return 0;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_chat.c
--- a/libpurple/protocols/oscar/family_chat.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_chat.c	Wed May 23 23:17:50 2007 +0000
@@ -41,8 +41,8 @@
 	struct chatconnpriv *ccp = (struct chatconnpriv *)conn->internal;
 
 	if (ccp)
-		free(ccp->name);
-	free(ccp);
+		g_free(ccp->name);
+	g_free(ccp);
 
 	return;
 }
@@ -100,12 +100,12 @@
 		return -EINVAL;
 
 	if (conn->internal)
-		free(conn->internal);
+		g_free(conn->internal);
 
 	ccp = g_new(struct chatconnpriv, 1);
 
 	ccp->exchange = exchange;
-	ccp->name = strdup(roomname);
+	ccp->name = g_strdup(roomname);
 	ccp->instance = instance;
 
 	conn->internal = (void *)ccp;
@@ -203,7 +203,7 @@
 		ByteStream occbs;
 
 		/* Allocate enough userinfo structs for all occupants */
-		userinfo = calloc(usercount, sizeof(aim_userinfo_t));
+		userinfo = g_new0(aim_userinfo_t, usercount);
 
 		byte_stream_init(&occbs, tlv->value, tlv->length);
 
@@ -301,14 +301,14 @@
 				maxvisiblemsglen);
 	}
 
-	free(roominfo.name);
+	g_free(roominfo.name);
 
 	while (usercount > 0)
 		aim_info_free(&userinfo[--usercount]);
 
-	free(userinfo);
-	free(roomname);
-	free(roomdesc);
+	g_free(userinfo);
+	g_free(roomname);
+	g_free(roomdesc);
 	aim_tlvlist_free(&tlvlist);
 
 	return ret;
@@ -324,7 +324,7 @@
 
 	while (byte_stream_empty(bs)) {
 		curcount++;
-		userinfo = realloc(userinfo, curcount * sizeof(aim_userinfo_t));
+		userinfo = g_realloc(userinfo, curcount * sizeof(aim_userinfo_t));
 		aim_info_extract(od, bs, &userinfo[curcount-1]);
 	}
 
@@ -332,7 +332,7 @@
 		ret = userfunc(od, conn, frame, curcount, userinfo);
 
 	aim_info_free(userinfo);
-	free(userinfo);
+	g_free(userinfo);
 
 	return ret;
 }
@@ -488,8 +488,8 @@
 		cookie[i] = byte_stream_get8(bs);
 
 	if ((ck = aim_uncachecookie(od, cookie, AIM_COOKIETYPE_CHAT))) {
-		free(ck->data);
-		free(ck);
+		g_free(ck->data);
+		g_free(ck);
 	}
 
 	/*
@@ -569,9 +569,9 @@
 		ret = userfunc(od, conn, frame, &userinfo, len, msg, encoding, language);
 
 	aim_info_free(&userinfo);
-	free(msg);
-	free(encoding);
-	free(language);
+	g_free(msg);
+	g_free(encoding);
+	g_free(language);
 	aim_tlvlist_free(&tlvlist);
 
 	return ret;
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_chatnav.c
--- a/libpurple/protocols/oscar/family_chatnav.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_chatnav.c	Wed May 23 23:17:50 2007 +0000
@@ -133,7 +133,7 @@
 
 		curexchange++;
 
-		exchanges = realloc(exchanges, curexchange * sizeof(struct aim_chat_exchangeinfo));
+		exchanges = g_realloc(exchanges, curexchange * sizeof(struct aim_chat_exchangeinfo));
 
 		/* exchange number */
 		exchanges[curexchange-1].number = byte_stream_get16(&tbs);
@@ -300,13 +300,13 @@
 		ret = userfunc(od, conn, frame, snac2->type, maxrooms, curexchange, exchanges);
 
 	for (curexchange--; curexchange >= 0; curexchange--) {
-		free(exchanges[curexchange].name);
-		free(exchanges[curexchange].charset1);
-		free(exchanges[curexchange].lang1);
-		free(exchanges[curexchange].charset2);
-		free(exchanges[curexchange].lang2);
+		g_free(exchanges[curexchange].name);
+		g_free(exchanges[curexchange].charset1);
+		g_free(exchanges[curexchange].lang1);
+		g_free(exchanges[curexchange].charset2);
+		g_free(exchanges[curexchange].lang2);
 	}
-	free(exchanges);
+	g_free(exchanges);
 	aim_tlvlist_free(&tlvlist);
 
 	return ret;
@@ -345,7 +345,7 @@
 	if (detaillevel != 0x02) {
 		purple_debug_misc("oscar", "unknown detaillevel in create room response (0x%02x)\n", detaillevel);
 		aim_tlvlist_free(&tlvlist);
-		free(ck);
+		g_free(ck);
 		return 0;
 	}
 
@@ -378,9 +378,9 @@
 		ret = userfunc(od, conn, frame, snac2->type, fqcn, instance, exchange, flags, createtime, maxmsglen, maxoccupancy, createperms, unknown, name, ck);
 	}
 
-	free(ck);
-	free(name);
-	free(fqcn);
+	g_free(ck);
+	g_free(name);
+	g_free(fqcn);
 	aim_tlvlist_free(&innerlist);
 	aim_tlvlist_free(&tlvlist);
 
@@ -442,8 +442,8 @@
 		purple_debug_misc("oscar", "chatnav_parse_info: unknown request subtype (%04x)\n", snac2->type);
 
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
 	return ret;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_feedbag.c
--- a/libpurple/protocols/oscar/family_feedbag.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_feedbag.c	Wed May 23 23:17:50 2007 +0000
@@ -81,7 +81,7 @@
 	if (newlen > 0) {
 		guint8 *newdata;
 
-		newdata = (guint8 *)malloc((newlen)*sizeof(guint8));
+		newdata = (guint8 *)g_malloc((newlen)*sizeof(guint8));
 		newlen = 0;
 		if (group->gid == 0x0000) {
 			for (cur=list; cur; cur=cur->next)
@@ -94,7 +94,7 @@
 		}
 		aim_tlvlist_replace_raw(&group->data, 0x00c8, newlen, newdata);
 
-		free(newdata);
+		g_free(newdata);
 	}
 }
 
@@ -115,11 +115,11 @@
 	gboolean exists;
 	struct aim_ssi_item *cur, *new;
 
-	new = (struct aim_ssi_item *)malloc(sizeof(struct aim_ssi_item));
+	new = (struct aim_ssi_item *)g_malloc(sizeof(struct aim_ssi_item));
 
 	/* Set the name */
 	if (name) {
-		new->name = (char *)malloc((strlen(name)+1)*sizeof(char));
+		new->name = (char *)g_malloc((strlen(name)+1)*sizeof(char));
 		strcpy(new->name, name);
 	} else
 		new->name = NULL;
@@ -213,9 +213,9 @@
 	}
 
 	/* Free the removed item */
-	free(del->name);
+	g_free(del->name);
 	aim_tlvlist_free(&del->data);
-	free(del);
+	g_free(del);
 
 	return 0;
 }
@@ -510,7 +510,7 @@
 		for (cur1=od->ssi.local; cur1 && (n < 15); cur1=cur1->next) {
 			if (!aim_ssi_itemlist_find(od->ssi.official, cur1->gid, cur1->bid)) {
 				n++;
-				new = (struct aim_ssi_tmp *)malloc(sizeof(struct aim_ssi_tmp));
+				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
 				new->action = SNAC_SUBTYPE_FEEDBAG_ADD;
 				new->ack = 0xffff;
 				new->name = NULL;
@@ -530,7 +530,7 @@
 		for (cur1=od->ssi.official; cur1 && (n < 15); cur1=cur1->next) {
 			if (!aim_ssi_itemlist_find(od->ssi.local, cur1->gid, cur1->bid)) {
 				n++;
-				new = (struct aim_ssi_tmp *)malloc(sizeof(struct aim_ssi_tmp));
+				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
 				new->action = SNAC_SUBTYPE_FEEDBAG_DEL;
 				new->ack = 0xffff;
 				new->name = NULL;
@@ -551,7 +551,7 @@
 			cur2 = aim_ssi_itemlist_find(od->ssi.official, cur1->gid, cur1->bid);
 			if (cur2 && (aim_ssi_itemlist_cmp(cur1, cur2))) {
 				n++;
-				new = (struct aim_ssi_tmp *)malloc(sizeof(struct aim_ssi_tmp));
+				new = (struct aim_ssi_tmp *)g_malloc(sizeof(struct aim_ssi_tmp));
 				new->action = SNAC_SUBTYPE_FEEDBAG_MOD;
 				new->ack = 0xffff;
 				new->name = NULL;
@@ -609,25 +609,25 @@
 	while (cur) {
 		del = cur;
 		cur = cur->next;
-		free(del->name);
+		g_free(del->name);
 		aim_tlvlist_free(&del->data);
-		free(del);
+		g_free(del);
 	}
 
 	cur = od->ssi.local;
 	while (cur) {
 		del = cur;
 		cur = cur->next;
-		free(del->name);
+		g_free(del->name);
 		aim_tlvlist_free(&del->data);
-		free(del);
+		g_free(del);
 	}
 
 	curtmp = od->ssi.pending;
 	while (curtmp) {
 		deltmp = curtmp;
 		curtmp = curtmp->next;
-		free(deltmp);
+		g_free(deltmp);
 	}
 
 	od->ssi.numitems = 0;
@@ -672,7 +672,7 @@
 			char *alias = aim_ssi_getalias(od->ssi.local, NULL, cur->name);
 			aim_ssi_addbuddy(od, cur->name, "orphans", alias, NULL, NULL, 0);
 			aim_ssi_delbuddy(od, cur->name, NULL);
-			free(alias);
+			g_free(alias);
 		}
 		cur = next;
 	}
@@ -929,7 +929,7 @@
 	aim_ssi_delbuddy(od, sn, oldgn);
 	aim_ssi_addbuddy(od, sn, newgn, alias, NULL, NULL, waitingforauth);
 
-	free(alias);
+	g_free(alias);
 
 	return 0;
 }
@@ -1012,8 +1012,8 @@
 	if (!(group = aim_ssi_itemlist_finditem(od->ssi.local, oldgn, NULL, AIM_SSI_TYPE_GROUP)))
 		return -EINVAL;
 
-	free(group->name);
-	group->name = (char *)malloc((strlen(newgn)+1)*sizeof(char));
+	g_free(group->name);
+	group->name = (char *)g_malloc((strlen(newgn)+1)*sizeof(char));
 	strcpy(group->name, newgn);
 
 	/* Sync our local list with the server list */
@@ -1086,12 +1086,12 @@
 	}
 
 	/* Need to add the 0x00d5 TLV to the TLV chain */
-	csumdata = (guint8 *)malloc((iconsumlen+2)*sizeof(guint8));
+	csumdata = (guint8 *)g_malloc((iconsumlen+2)*sizeof(guint8));
 	aimutil_put8(&csumdata[0], 0x00);
 	aimutil_put8(&csumdata[1], iconsumlen);
 	memcpy(&csumdata[2], iconsum, iconsumlen);
 	aim_tlvlist_replace_raw(&tmp->data, 0x00d5, (iconsumlen+2) * sizeof(guint8), csumdata);
-	free(csumdata);
+	g_free(csumdata);
 
 	/* Need to add the 0x0131 TLV to the TLV chain, used to cache the icon */
 	aim_tlvlist_replace_noval(&tmp->data, 0x0131);
@@ -1188,7 +1188,7 @@
 
 	byte_stream_init(&bstream, tlv->value, tlv->length);
 
-	maxitems = (guint16 *)malloc((tlv->length/2)*sizeof(guint16));
+	maxitems = (guint16 *)g_malloc((tlv->length/2)*sizeof(guint16));
 
 	for (i=0; i<(tlv->length/2); i++)
 		maxitems[i] = byte_stream_get16(&bstream);
@@ -1197,7 +1197,7 @@
 		ret = userfunc(od, conn, frame, tlv->length/2, maxitems);
 
 	aim_tlvlist_free(&tlvlist);
-	free(maxitems);
+	g_free(maxitems);
 
 	return ret;
 }
@@ -1283,7 +1283,7 @@
 		type = byte_stream_get16(bs);
 		data = aim_tlvlist_readlen(bs, byte_stream_get16(bs));
 		aim_ssi_itemlist_add(&od->ssi.official, name, gid, bid, type, data);
-		free(name);
+		g_free(name);
 		aim_tlvlist_free(&data);
 	}
 
@@ -1411,7 +1411,7 @@
 		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 			ret = userfunc(od, conn, frame, type, name);
 
-		free(name);
+		g_free(name);
 	}
 
 	return ret;
@@ -1447,9 +1447,9 @@
 		/* Replace the 2 local items with the given one */
 		if ((item = aim_ssi_itemlist_find(od->ssi.local, gid, bid))) {
 			item->type = type;
-			free(item->name);
+			g_free(item->name);
 			if (name) {
-				item->name = (char *)malloc((strlen(name)+1)*sizeof(char));
+				item->name = (char *)g_malloc((strlen(name)+1)*sizeof(char));
 				strcpy(item->name, name);
 			} else
 				item->name = NULL;
@@ -1459,9 +1459,9 @@
 
 		if ((item = aim_ssi_itemlist_find(od->ssi.official, gid, bid))) {
 			item->type = type;
-			free(item->name);
+			g_free(item->name);
 			if (name) {
-				item->name = (char *)malloc((strlen(name)+1)*sizeof(char));
+				item->name = (char *)g_malloc((strlen(name)+1)*sizeof(char));
 				strcpy(item->name, name);
 			} else
 				item->name = NULL;
@@ -1472,7 +1472,7 @@
 		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 			ret = userfunc(od, conn, frame);
 
-		free(name);
+		g_free(name);
 		aim_tlvlist_free(&data);
 	}
 
@@ -1543,7 +1543,7 @@
 				/* Make sure cur->item is still valid memory */
 				if (aim_ssi_itemlist_valid(od->ssi.local, cur->item)) {
 					if (cur->item->name) {
-						cur->name = (char *)malloc((strlen(cur->item->name)+1)*sizeof(char));
+						cur->name = (char *)g_malloc((strlen(cur->item->name)+1)*sizeof(char));
 						strcpy(cur->name, cur->item->name);
 					}
 					aim_ssi_itemlist_del(&od->ssi.local, cur->item);
@@ -1555,9 +1555,9 @@
 				if (aim_ssi_itemlist_valid(od->ssi.local, cur->item)) {
 					struct aim_ssi_item *cur1;
 					if ((cur1 = aim_ssi_itemlist_find(od->ssi.official, cur->item->gid, cur->item->bid))) {
-						free(cur->item->name);
+						g_free(cur->item->name);
 						if (cur1->name) {
-							cur->item->name = (char *)malloc((strlen(cur1->name)+1)*sizeof(char));
+							cur->item->name = (char *)g_malloc((strlen(cur1->name)+1)*sizeof(char));
 							strcpy(cur->item->name, cur1->name);
 						} else
 							cur->item->name = NULL;
@@ -1589,9 +1589,9 @@
 				if (aim_ssi_itemlist_valid(od->ssi.local, cur->item)) {
 					struct aim_ssi_item *cur1;
 					if ((cur1 = aim_ssi_itemlist_find(od->ssi.official, cur->item->gid, cur->item->bid))) {
-						free(cur1->name);
+						g_free(cur1->name);
 						if (cur->item->name) {
-							cur1->name = (char *)malloc((strlen(cur->item->name)+1)*sizeof(char));
+							cur1->name = (char *)g_malloc((strlen(cur->item->name)+1)*sizeof(char));
 							strcpy(cur1->name, cur->item->name);
 						} else
 							cur1->name = NULL;
@@ -1620,8 +1620,8 @@
 	while (cur && (cur->ack != 0xffff)) {
 		del = cur;
 		cur = cur->next;
-		free(del->name);
-		free(del);
+		g_free(del->name);
+		g_free(del);
 	}
 	od->ssi.pending = cur;
 
@@ -1757,8 +1757,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn, msg);
 
-	free(sn);
-	free(msg);
+	g_free(sn);
+	g_free(msg);
 
 	return ret;
 }
@@ -1831,8 +1831,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn, msg);
 
-	free(sn);
-	free(msg);
+	g_free(sn);
+	g_free(msg);
 
 	return ret;
 }
@@ -1918,8 +1918,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn, reply, msg);
 
-	free(sn);
-	free(msg);
+	g_free(sn);
+	g_free(msg);
 
 	return ret;
 }
@@ -1943,7 +1943,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, sn);
 
-	free(sn);
+	g_free(sn);
 
 	return ret;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_icbm.c
--- a/libpurple/protocols/oscar/family_icbm.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_icbm.c	Wed May 23 23:17:50 2007 +0000
@@ -468,16 +468,16 @@
 	aim_putsnac(&frame->data, 0x0004, 0x0006, 0x0000, snacid);
 
 	/* XXX should be uncached by an unwritten 'invite accept' handler */
-	priv = malloc(sizeof(struct aim_invite_priv));
-	priv->sn = strdup(sn);
-	priv->roomname = strdup(roomname);
+	priv = g_malloc(sizeof(struct aim_invite_priv));
+	priv->sn = g_strdup(sn);
+	priv->roomname = g_strdup(roomname);
 	priv->exchange = exchange;
 	priv->instance = instance;
 
 	if ((msgcookie = aim_mkcookie(cookie, AIM_COOKIETYPE_INVITE, priv)))
 		aim_cachecookie(od, msgcookie);
 	else
-		free(priv);
+		g_free(priv);
 
 	/* ICBM Header */
 	aim_im_puticbm(&frame->data, cookie, 0x0002, sn);
@@ -1279,8 +1279,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, channel, sn, msg, icbmflags, flag1, flag2);
 
-	free(sn);
-	free(msg);
+	g_free(sn);
+	g_free(msg);
 	aim_tlvlist_free(&tlvlist);
 
 	return ret;
@@ -1335,7 +1335,7 @@
 {
 	aim_mpmsg_section_t *sec;
 
-	sec = malloc(sizeof(aim_mpmsg_section_t));
+	sec = g_malloc(sizeof(aim_mpmsg_section_t));
 
 	sec->charset = charset;
 	sec->charsubset = charsubset;
@@ -1362,11 +1362,11 @@
 {
 	gchar *dup;
 
-	dup = malloc(datalen);
+	dup = g_malloc(datalen);
 	memcpy(dup, data, datalen);
 
 	if (mpmsg_addsection(od, mpm, charset, charsubset, dup, datalen) == -1) {
-		free(dup);
+		g_free(dup);
 		return -1;
 	}
 
@@ -1378,11 +1378,11 @@
 {
 	gchar *dup;
 
-	if (!(dup = strdup(ascii)))
+	if (!(dup = g_strdup(ascii)))
 		return -1;
 
 	if (mpmsg_addsection(od, mpm, 0x0000, 0x0000, dup, strlen(ascii)) == -1) {
-		free(dup);
+		g_free(dup);
 		return -1;
 	}
 
@@ -1395,7 +1395,7 @@
 	ByteStream bs;
 	int i;
 
-	buf = malloc(unicodelen * 2);
+	buf = g_malloc(unicodelen * 2);
 
 	byte_stream_init(&bs, (guchar *)buf, unicodelen * 2);
 
@@ -1404,7 +1404,7 @@
 		byte_stream_put16(&bs, unicode[i]);
 
 	if (mpmsg_addsection(od, mpm, 0x0002, 0x0000, buf, byte_stream_curpos(&bs)) == -1) {
-		free(buf);
+		g_free(buf);
 		return -1;
 	}
 
@@ -1419,8 +1419,8 @@
 		aim_mpmsg_section_t *tmp;
 
 		tmp = cur->next;
-		free(cur->data);
-		free(cur);
+		g_free(cur->data);
+		g_free(cur);
 		cur = tmp;
 	}
 
@@ -1659,7 +1659,7 @@
 				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->sn);
 				break;
 			}
-			free(args.extdata);
+			g_free(args.extdata);
 			args.extdatalen = length;
 			if (args.extdatalen == 0)
 				args.extdata = NULL;
@@ -1686,8 +1686,8 @@
 		ret = userfunc(od, conn, frame, channel, userinfo, &args);
 
 	aim_mpmsg_free(od, &args.mpmsg);
-	free(args.features);
-	free(args.extdata);
+	g_free(args.features);
+	g_free(args.extdata);
 
 	return ret;
 }
@@ -1733,10 +1733,10 @@
 
 			purple_debug_misc("oscar", "got a buddy list from %s: group %s, buddy %s\n", userinfo->sn, gn, bn);
 
-			free(bn);
+			g_free(bn);
 		}
 
-		free(gn);
+		g_free(gn);
 	}
 
 	return;
@@ -1745,7 +1745,7 @@
 static void
 incomingim_ch2_buddyicon_free(OscarData *od, IcbmArgsCh2 *args)
 {
-	free(args->info.icon.icon);
+	g_free(args->info.icon.icon);
 
 	return;
 }
@@ -1767,7 +1767,7 @@
 incomingim_ch2_chat_free(OscarData *od, IcbmArgsCh2 *args)
 {
 	/* XXX - aim_chat_roominfo_free() */
-	free(args->info.chat.roominfo.name);
+	g_free(args->info.chat.roominfo.name);
 
 	return;
 }
@@ -1786,7 +1786,7 @@
 static void
 incomingim_ch2_icqserverrelay_free(OscarData *od, IcbmArgsCh2 *args)
 {
-	free((char *)args->info.rtfmsg.rtfmsg);
+	g_free((char *)args->info.rtfmsg.rtfmsg);
 }
 
 /*
@@ -1832,7 +1832,7 @@
 static void
 incomingim_ch2_sendfile_free(OscarData *od, IcbmArgsCh2 *args)
 {
-	free(args->info.sendfile.filename);
+	g_free(args->info.sendfile.filename);
 }
 
 /* Someone is sending us a file */
@@ -1918,11 +1918,11 @@
 	{
 		purple_debug_warning("oscar",
 				"Cookies don't match in rendezvous ICBM, bailing out.\n");
-		free(cookie2);
+		g_free(cookie2);
 		return 1;
 	}
 	memcpy(args.cookie, cookie2, 8);
-	free(cookie2);
+	g_free(cookie2);
 
 	/*
 	 * The next 16bytes are a capability block so we can
@@ -2074,9 +2074,9 @@
 	if (args.destructor)
 		((ch2_args_destructor_t)args.destructor)(od, &args);
 
-	free((char *)args.msg);
-	free((char *)args.encoding);
-	free((char *)args.language);
+	g_free((char *)args.msg);
+	g_free((char *)args.encoding);
+	g_free((char *)args.language);
 
 	aim_tlvlist_free(&list2);
 
@@ -2107,7 +2107,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, channel, userinfo, &args);
 
-	free(args.msg);
+	g_free(args.msg);
 
 	return ret;
 }
@@ -2210,7 +2210,7 @@
 	}
 
 	aim_info_free(&userinfo);
-	free(cookie);
+	g_free(cookie);
 
 	return ret;
 }
@@ -2379,7 +2379,7 @@
 				if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 					ret = userfunc(od, conn, frame, channel, sn, reason, state, msg);
 
-				free(msg);
+				g_free(msg);
 			} break;
 
 			default: {
@@ -2389,8 +2389,8 @@
 		} /* end switch */
 	}
 
-	free(cookie);
-	free(sn);
+	g_free(cookie);
+	g_free(sn);
 
 	return ret;
 }
@@ -2418,8 +2418,8 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, ch, sn);
 
-	free(sn);
-	free(cookie);
+	g_free(sn);
+	g_free(cookie);
 
 	return ret;
 }
@@ -2502,7 +2502,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, type1, sn, type2);
 
-	free(sn);
+	g_free(sn);
 
 	return ret;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_icq.c
--- a/libpurple/protocols/oscar/family_icq.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_icq.c	Wed May 23 23:17:50 2007 +0000
@@ -212,7 +212,7 @@
 	flap_connection_send(conn, frame);
 
 	/* Keep track of this request and the ICQ number and request ID */
-	info = (struct aim_icq_info *)calloc(1, sizeof(struct aim_icq_info));
+	info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
 	info->reqid = snacid;
 	info->uin = atoi(uin);
 	info->next = od->icq_info;
@@ -256,7 +256,7 @@
 	flap_connection_send(conn, frame);
 
 	/* Keep track of this request and the ICQ number and request ID */
-	info = (struct aim_icq_info *)calloc(1, sizeof(struct aim_icq_info));
+	info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
 	info->reqid = snacid;
 	info->uin = atoi(uin);
 	info->next = od->icq_info;
@@ -426,7 +426,7 @@
 
 	flap_connection_send(conn, frame);
 
-	free(xml);
+	g_free(xml);
 
 	return 0;
 }
@@ -437,34 +437,34 @@
 
 	if (!info)
 		return;
-	free(info->nick);
-	free(info->first);
-	free(info->last);
-	free(info->email);
-	free(info->homecity);
-	free(info->homestate);
-	free(info->homephone);
-	free(info->homefax);
-	free(info->homeaddr);
-	free(info->mobile);
-	free(info->homezip);
-	free(info->personalwebpage);
+	g_free(info->nick);
+	g_free(info->first);
+	g_free(info->last);
+	g_free(info->email);
+	g_free(info->homecity);
+	g_free(info->homestate);
+	g_free(info->homephone);
+	g_free(info->homefax);
+	g_free(info->homeaddr);
+	g_free(info->mobile);
+	g_free(info->homezip);
+	g_free(info->personalwebpage);
 	if (info->email2)
 		for (i = 0; i < info->numaddresses; i++)
-			free(info->email2[i]);
-	free(info->email2);
-	free(info->workcity);
-	free(info->workstate);
-	free(info->workphone);
-	free(info->workfax);
-	free(info->workaddr);
-	free(info->workzip);
-	free(info->workcompany);
-	free(info->workdivision);
-	free(info->workposition);
-	free(info->workwebpage);
-	free(info->info);
-	free(info);
+			g_free(info->email2[i]);
+	g_free(info->email2);
+	g_free(info->workcity);
+	g_free(info->workstate);
+	g_free(info->workphone);
+	g_free(info->workfax);
+	g_free(info->workaddr);
+	g_free(info->workzip);
+	g_free(info->workcompany);
+	g_free(info->workdivision);
+	g_free(info->workposition);
+	g_free(info->workwebpage);
+	g_free(info->info);
+	g_free(info);
 }
 
 /**
@@ -515,7 +515,7 @@
 		if ((userfunc = aim_callhandler(od, SNAC_FAMILY_ICQ, SNAC_SUBTYPE_ICQ_OFFLINEMSG)))
 			ret = userfunc(od, conn, frame, &msg);
 
-		free(msg.msg);
+		g_free(msg.msg);
 
 	} else if (cmd == 0x0042) {
 		aim_rxcallback_t userfunc;
@@ -534,7 +534,7 @@
 		/* find other data from the same request */
 		for (info = od->icq_info; info && (info->reqid != reqid); info = info->next);
 		if (!info) {
-			info = (struct aim_icq_info *)calloc(1, sizeof(struct aim_icq_info));
+			info = (struct aim_icq_info *)g_new0(struct aim_icq_info, 1);
 			info->reqid = reqid;
 			info->next = od->icq_info;
 			od->icq_info = info;
@@ -603,7 +603,7 @@
 		case 0x00eb: { /* email address(es) */
 			int i;
 			info->numaddresses = byte_stream_getle16(&qbs);
-			info->email2 = (char **)calloc(info->numaddresses, sizeof(char *));
+			info->email2 = (char **)g_new0(char *, info->numaddresses);
 			for (i = 0; i < info->numaddresses; i++) {
 				info->email2[i] = byte_stream_getstr(&qbs, byte_stream_getle16(&qbs));
 				if (i+1 != info->numaddresses)
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_locate.c
--- a/libpurple/protocols/oscar/family_locate.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Wed May 23 23:17:50 2007 +0000
@@ -238,8 +238,8 @@
 	cur = aim_locate_finduserinfo(od, userinfo->sn);
 
 	if (cur == NULL) {
-		cur = (aim_userinfo_t *)calloc(1, sizeof(aim_userinfo_t));
-		cur->sn = strdup(userinfo->sn);
+		cur = (aim_userinfo_t *)g_new0(aim_userinfo_t, 1);
+		cur->sn = g_strdup(userinfo->sn);
 		cur->next = od->locate.userinfo;
 		od->locate.userinfo = cur;
 	}
@@ -261,63 +261,63 @@
 	cur->present |= userinfo->present;
 
 	if (userinfo->iconcsumlen > 0) {
-		free(cur->iconcsum);
-		cur->iconcsum = (guint8 *)malloc(userinfo->iconcsumlen);
+		g_free(cur->iconcsum);
+		cur->iconcsum = (guint8 *)g_malloc(userinfo->iconcsumlen);
 		memcpy(cur->iconcsum, userinfo->iconcsum, userinfo->iconcsumlen);
 		cur->iconcsumlen = userinfo->iconcsumlen;
 	}
 
 	if (userinfo->info != NULL) {
-		free(cur->info);
-		free(cur->info_encoding);
+		g_free(cur->info);
+		g_free(cur->info_encoding);
 		if (userinfo->info_len > 0) {
-			cur->info = (char *)malloc(userinfo->info_len);
+			cur->info = (char *)g_malloc(userinfo->info_len);
 			memcpy(cur->info, userinfo->info, userinfo->info_len);
 		} else
 			cur->info = NULL;
-		cur->info_encoding = strdup(userinfo->info_encoding);
+		cur->info_encoding = g_strdup(userinfo->info_encoding);
 		cur->info_len = userinfo->info_len;
 	}
 
 	if (userinfo->status != NULL) {
-		free(cur->status);
-		free(cur->status_encoding);
+		g_free(cur->status);
+		g_free(cur->status_encoding);
 		if (userinfo->status_len > 0) {
-			cur->status = (char *)malloc(userinfo->status_len);
+			cur->status = (char *)g_malloc(userinfo->status_len);
 			memcpy(cur->status, userinfo->status, userinfo->status_len);
 		} else
 			cur->status = NULL;
 		if (userinfo->status_encoding != NULL)
-			cur->status_encoding = strdup(userinfo->status_encoding);
+			cur->status_encoding = g_strdup(userinfo->status_encoding);
 		else
 			cur->status_encoding = NULL;
 		cur->status_len = userinfo->status_len;
 	}
 
 	if (userinfo->itmsurl != NULL) {
-		free(cur->itmsurl);
-		free(cur->itmsurl_encoding);
+		g_free(cur->itmsurl);
+		g_free(cur->itmsurl_encoding);
 		if (userinfo->itmsurl_len > 0) {
-			cur->itmsurl = (char *)malloc(userinfo->itmsurl_len);
+			cur->itmsurl = (char *)g_malloc(userinfo->itmsurl_len);
 			memcpy(cur->itmsurl, userinfo->itmsurl, userinfo->itmsurl_len);
 		} else
 			cur->itmsurl = NULL;
 		if (userinfo->itmsurl_encoding != NULL)
-			cur->itmsurl_encoding = strdup(userinfo->itmsurl_encoding);
+			cur->itmsurl_encoding = g_strdup(userinfo->itmsurl_encoding);
 		else
 			cur->itmsurl_encoding = NULL;
 		cur->itmsurl_len = userinfo->itmsurl_len;
 	}
 
 	if (userinfo->away != NULL) {
-		free(cur->away);
-		free(cur->away_encoding);
+		g_free(cur->away);
+		g_free(cur->away_encoding);
 		if (userinfo->away_len > 0) {
-			cur->away = (char *)malloc(userinfo->away_len);
+			cur->away = (char *)g_malloc(userinfo->away_len);
 			memcpy(cur->away, userinfo->away, userinfo->away_len);
 		} else
 			cur->away = NULL;
-		cur->away_encoding = strdup(userinfo->away_encoding);
+		cur->away_encoding = g_strdup(userinfo->away_encoding);
 		cur->away_len = userinfo->away_len;
 
 	} else if (!(userinfo->flags & AIM_FLAG_AWAY)) {
@@ -326,11 +326,11 @@
 		 * If the user is not away, clear any cached away message now.
 		 */
 		if (cur->away) {
-			free(cur->away);
+			g_free(cur->away);
 			cur->away = NULL;
 		}
 		if (cur->away_encoding) {
-			free(cur->away_encoding);
+			g_free(cur->away_encoding);
 			cur->away_encoding = NULL;
 		}
 		cur->away_len = 0;
@@ -401,8 +401,8 @@
 		del = od->locate.requested;
 		od->locate.requested = del->next;
 		was_explicit = FALSE;
-		free(del->sn);
-		free(del);
+		g_free(del->sn);
+		g_free(del);
 	}
 
 	cur = od->locate.requested;
@@ -411,8 +411,8 @@
 			del = cur->next;
 			cur->next = del->next;
 			was_explicit = FALSE;
-			free(del->sn);
-			free(del);
+			g_free(del->sn);
+			g_free(del);
 		} else
 			cur = cur->next;
 	}
@@ -447,8 +447,8 @@
 	}
 
 	/* Add a new node to our request queue */
-	cur = (struct userinfo_node *)malloc(sizeof(struct userinfo_node));
-	cur->sn = strdup(sn);
+	cur = (struct userinfo_node *)g_malloc(sizeof(struct userinfo_node));
+	cur->sn = g_strdup(sn);
 	cur->next = od->locate.torequest;
 	od->locate.torequest = cur;
 
@@ -502,7 +502,7 @@
 					cap[10], cap[11], cap[12], cap[13],
 					cap[14], cap[15]);
 
-		free(cap);
+		g_free(cap);
 	}
 
 	return flags;
@@ -531,7 +531,7 @@
 		if (!identified)
 			purple_debug_misc("oscar", "unknown short capability: {%02x%02x}\n", cap[0], cap[1]);
 
-		free(cap);
+		g_free(cap);
 	}
 
 	return flags;
@@ -586,16 +586,16 @@
 void
 aim_info_free(aim_userinfo_t *info)
 {
-	free(info->sn);
-	free(info->iconcsum);
-	free(info->info);
-	free(info->info_encoding);
-	free(info->status);
-	free(info->status_encoding);
-	free(info->itmsurl);
-	free(info->itmsurl_encoding);
-	free(info->away);
-	free(info->away_encoding);
+	g_free(info->sn);
+	g_free(info->iconcsum);
+	g_free(info->info);
+	g_free(info->info_encoding);
+	g_free(info->status);
+	g_free(info->status_encoding);
+	g_free(info->itmsurl);
+	g_free(info->itmsurl_encoding);
+	g_free(info->away);
+	g_free(info->away_encoding);
 }
 
 /*
@@ -829,7 +829,7 @@
 
 					case 0x0001: { /* A buddy icon checksum */
 						if ((length2 > 0) && ((number == 0x00) || (number == 0x01))) {
-							free(outinfo->iconcsum);
+							g_free(outinfo->iconcsum);
 							outinfo->iconcsumtype = number;
 							outinfo->iconcsum = byte_stream_getraw(bs, length2);
 							outinfo->iconcsumlen = length2;
@@ -838,8 +838,8 @@
 					} break;
 
 					case 0x0002: { /* A status/available message */
-						free(outinfo->status);
-						free(outinfo->status_encoding);
+						g_free(outinfo->status);
+						g_free(outinfo->status_encoding);
 						if (length2 >= 4) {
 							outinfo->status_len = byte_stream_get16(bs);
 							outinfo->status = byte_stream_getstr(bs, outinfo->status_len);
@@ -859,8 +859,8 @@
 					} break;
 
 					case 0x0009: { /* An iTunes Music Store link */
-						free(outinfo->itmsurl);
-						free(outinfo->itmsurl_encoding);
+						g_free(outinfo->itmsurl);
+						g_free(outinfo->itmsurl_encoding);
 						if (length2 >= 4) {
 							outinfo->itmsurl_len = byte_stream_get16(bs);
 							outinfo->itmsurl = byte_stream_getstr(bs, outinfo->itmsurl_len);
@@ -1013,8 +1013,8 @@
 			ret = userfunc(od, conn, frame, reason, sn);
 
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
 	return ret;
 }
@@ -1113,11 +1113,11 @@
 	/* Build the packet first to get real length */
 	if (profile) {
 		/* no + 1 here because of %s */
-		encoding = malloc(strlen(defencoding) + strlen(profile_encoding));
+		encoding = g_malloc(strlen(defencoding) + strlen(profile_encoding));
 		snprintf(encoding, strlen(defencoding) + strlen(profile_encoding), defencoding, profile_encoding);
 		aim_tlvlist_add_str(&tl, 0x0001, encoding);
 		aim_tlvlist_add_raw(&tl, 0x0002, profile_len, (const guchar *)profile);
-		free(encoding);
+		g_free(encoding);
 	}
 
 	/*
@@ -1130,11 +1130,11 @@
 	 */
 	if (awaymsg) {
 		if (awaymsg_len) {
-			encoding = malloc(strlen(defencoding) + strlen(awaymsg_encoding));
+			encoding = g_malloc(strlen(defencoding) + strlen(awaymsg_encoding));
 			snprintf(encoding, strlen(defencoding) + strlen(awaymsg_encoding), defencoding, awaymsg_encoding);
 			aim_tlvlist_add_str(&tl, 0x0003, encoding);
 			aim_tlvlist_add_raw(&tl, 0x0004, awaymsg_len, (const guchar *)awaymsg);
-			free(encoding);
+			g_free(encoding);
 		} else
 			aim_tlvlist_add_noval(&tl, 0x0004);
 	}
@@ -1225,14 +1225,14 @@
 	aim_tlv_t *tlv = NULL;
 	int was_explicit;
 
-	userinfo = (aim_userinfo_t *)malloc(sizeof(aim_userinfo_t));
+	userinfo = (aim_userinfo_t *)g_malloc(sizeof(aim_userinfo_t));
 	aim_info_extract(od, bs, userinfo);
 	tlvlist = aim_tlvlist_read(bs);
 
 	/* Profile will be 1 and 2 */
 	userinfo->info_encoding = aim_tlv_getstr(tlvlist, 0x0001, 1);
 	if ((tlv = aim_tlv_gettlv(tlvlist, 0x0002, 1))) {
-		userinfo->info = (char *)malloc(tlv->length);
+		userinfo->info = (char *)g_malloc(tlv->length);
 		memcpy(userinfo->info, tlv->value, tlv->length);
 		userinfo->info_len = tlv->length;
 	}
@@ -1240,7 +1240,7 @@
 	/* Away message will be 3 and 4 */
 	userinfo->away_encoding = aim_tlv_getstr(tlvlist, 0x0003, 1);
 	if ((tlv = aim_tlv_gettlv(tlvlist, 0x0004, 1))) {
-		userinfo->away = (char *)malloc(tlv->length);
+		userinfo->away = (char *)g_malloc(tlv->length);
 		memcpy(userinfo->away, tlv->value, tlv->length);
 		userinfo->away_len = tlv->length;
 	}
@@ -1257,7 +1257,7 @@
 	aim_locate_adduserinfo(od, userinfo);
 	userinfo2 = aim_locate_finduserinfo(od, userinfo->sn);
 	aim_info_free(userinfo);
-	free(userinfo);
+	g_free(userinfo);
 
 	/*
 	 * Remove this screen name from our queue.  If the client requested
@@ -1454,7 +1454,7 @@
 		del = od->locate.userinfo;
 		od->locate.userinfo = od->locate.userinfo->next;
 		aim_info_free(del);
-		free(del);
+		g_free(del);
 	}
 }
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_odir.c
--- a/libpurple/protocols/oscar/family_odir.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_odir.c	Wed May 23 23:17:50 2007 +0000
@@ -190,7 +190,7 @@
 	while (numresults) {
 		struct aim_odir *new;
 		aim_tlvlist_t *tl = aim_tlvlist_readnum(bs, byte_stream_get16(bs));
-		new = (struct aim_odir *)malloc(sizeof(struct aim_odir));
+		new = (struct aim_odir *)g_malloc(sizeof(struct aim_odir));
 		new->first = aim_tlv_getstr(tl, 0x0001, 1);
 		new->last = aim_tlv_getstr(tl, 0x0002, 1);
 		new->middle = aim_tlv_getstr(tl, 0x0003, 1);
@@ -217,21 +217,21 @@
 	while (results) {
 		struct aim_odir *del = results;
 		results = results->next;
-		free(del->first);
-		free(del->last);
-		free(del->middle);
-		free(del->maiden);
-		free(del->email);
-		free(del->country);
-		free(del->state);
-		free(del->city);
-		free(del->sn);
-		free(del->interest);
-		free(del->nick);
-		free(del->zip);
-		free(del->region);
-		free(del->address);
-		free(del);
+		g_free(del->first);
+		g_free(del->last);
+		g_free(del->middle);
+		g_free(del->maiden);
+		g_free(del->email);
+		g_free(del->country);
+		g_free(del->state);
+		g_free(del->city);
+		g_free(del->sn);
+		g_free(del->interest);
+		g_free(del->nick);
+		g_free(del->zip);
+		g_free(del->region);
+		g_free(del->address);
+		g_free(del);
 	}
 
 	return ret;
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_oservice.c
--- a/libpurple/protocols/oscar/family_oservice.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_oservice.c	Wed May 23 23:17:50 2007 +0000
@@ -194,12 +194,12 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, &redir);
 
-	free((void *)redir.ip);
-	free((void *)redir.cookie);
+	g_free((void *)redir.ip);
+	g_free((void *)redir.cookie);
 
 	if (origsnac)
-		free(origsnac->data);
-	free(origsnac);
+		g_free(origsnac->data);
+	g_free(origsnac);
 
 	aim_tlvlist_free(&tlvlist);
 
@@ -588,7 +588,7 @@
 	conn = flap_connection_findbygroup(od, SNAC_FAMILY_BOS);
 	if(!conn)
 		return;
-	
+
 	aim_genericreq_l(od, conn, 0x0001, 0x0011, &idletime);
 }
 
@@ -641,7 +641,7 @@
 		ret = userfunc(od, conn, frame, ip, cktlv ? cktlv->value : NULL);
 
 	aim_tlvlist_free(&tl);
-	free(ip);
+	g_free(ip);
 
 	return ret;
 }
@@ -679,7 +679,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, id, msg);
 
-	free(msg);
+	g_free(msg);
 
 	aim_tlvlist_free(&tlvlist);
 
@@ -769,7 +769,7 @@
 	/* This is frivolous. (Thank you SmarterChild.) */
 	vercount = byte_stream_empty(bs)/4;
 	versions = byte_stream_getraw(bs, byte_stream_empty(bs));
-	free(versions);
+	g_free(versions);
 
 	/*
 	 * Now request rates.
@@ -927,7 +927,7 @@
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, offset, len, modname);
 
-	free(modname);
+	g_free(modname);
 	aim_tlvlist_free(&list);
 
 	return ret;
@@ -1051,13 +1051,13 @@
 			/* not sure what the difference between 1 and 0 is */
 			guint8 *md5 = byte_stream_getraw(bs, length);
 			ret = userfunc(od, conn, frame, type, flags, length, md5);
-			free(md5);
+			g_free(md5);
 			} break;
 		case 0x0002: { /* available message */
 			/* there is a second length that is just for the message */
 			char *msg = byte_stream_getstr(bs, byte_stream_get16(bs));
 			ret = userfunc(od, conn, frame, msg);
-			free(msg);
+			g_free(msg);
 			} break;
 		}
 	}
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_popup.c
--- a/libpurple/protocols/oscar/family_popup.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_popup.c	Wed May 23 23:17:50 2007 +0000
@@ -54,8 +54,8 @@
 		ret = userfunc(od, conn, frame, msg, url, width, height, delay);
 
 	aim_tlvlist_free(&tl);
-	free(msg);
-	free(url);
+	g_free(msg);
+	g_free(url);
 
 	return ret;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/family_userlookup.c
--- a/libpurple/protocols/oscar/family_userlookup.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/family_userlookup.c	Wed May 23 23:17:50 2007 +0000
@@ -49,8 +49,8 @@
 
 	/* XXX freesnac()? */
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
 	return ret;
 }
@@ -107,14 +107,14 @@
 	 */
 	while ((cur = aim_tlv_getstr(tlvlist, 0x0001, j+1)) && j < m)
 	{
-		buf = realloc(buf, (j+1) * (MAXSNLEN+1));
+		buf = g_realloc(buf, (j+1) * (MAXSNLEN+1));
 
 		strncpy(&buf[j * (MAXSNLEN+1)], cur, MAXSNLEN);
-		free(cur);
+		g_free(cur);
 
 		j++;
 	}
-	free(cur);
+	g_free(cur);
 
 	aim_tlvlist_free(&tlvlist);
 
@@ -123,10 +123,10 @@
 
 	/* XXX freesnac()? */
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
-	free(buf);
+	g_free(buf);
 
 	return ret;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/flap_connection.c
--- a/libpurple/protocols/oscar/flap_connection.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/flap_connection.c	Wed May 23 23:17:50 2007 +0000
@@ -723,7 +723,7 @@
 
 	aim_tlvlist_free(&tlvlist);
 
-	free(msg);
+	g_free(msg);
 }
 
 /**
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/misc.c
--- a/libpurple/protocols/oscar/misc.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/misc.c	Wed May 23 23:17:50 2007 +0000
@@ -128,8 +128,8 @@
 		ret = userfunc(od, conn, frame, error, snac2 ? snac2->data : NULL);
 
 	if (snac2)
-		free(snac2->data);
-	free(snac2);
+		g_free(snac2->data);
+	g_free(snac2);
 
 	return ret;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/msgcookie.c
--- a/libpurple/protocols/oscar/msgcookie.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/msgcookie.c	Wed May 23 23:17:50 2007 +0000
@@ -113,7 +113,7 @@
 	if (!c)
 		return NULL;
 
-	cookie = calloc(1, sizeof(IcbmCookie));
+	cookie = g_new0(IcbmCookie, 1);
 
 	cookie->data = data;
 	cookie->type = type;
@@ -172,8 +172,8 @@
 			prev = &cur->next;
 	}
 
-	free(cookie->data);
-	free(cookie);
+	g_free(cookie->data);
+	g_free(cookie);
 
 	return 0;
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/oft.c
--- a/libpurple/protocols/oscar/oft.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/oft.c	Wed May 23 23:17:50 2007 +0000
@@ -568,7 +568,7 @@
 			break;
 	}
 
-	free(frame.name);
+	g_free(frame.name);
 }
 
 /*******************************************************************/
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed May 23 23:17:50 2007 +0000
@@ -304,15 +304,15 @@
 
 	if ((encoding == NULL) || encoding[0] == '\0') {
 		purple_debug_info("oscar", "Empty encoding, assuming UTF-8\n");
-	} else if (!strcasecmp(encoding, "iso-8859-1")) {
+	} else if (!g_ascii_strcasecmp(encoding, "iso-8859-1")) {
 		utf8 = g_convert(text, textlen, "UTF-8", "iso-8859-1", NULL, NULL, NULL);
-	} else if (!strcasecmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1") ||
-	           !strcasecmp(encoding, "us-ascii"))
+	} else if (!g_ascii_strcasecmp(encoding, "ISO-8859-1-Windows-3.1-Latin-1") ||
+	           !g_ascii_strcasecmp(encoding, "us-ascii"))
 	{
 		utf8 = g_convert(text, textlen, "UTF-8", "Windows-1252", NULL, NULL, NULL);
-	} else if (!strcasecmp(encoding, "unicode-2-0")) {
+	} else if (!g_ascii_strcasecmp(encoding, "unicode-2-0")) {
 		utf8 = g_convert(text, textlen, "UTF-8", "UCS-2BE", NULL, NULL, NULL);
-	} else if (strcasecmp(encoding, "utf-8")) {
+	} else if (g_ascii_strcasecmp(encoding, "utf-8")) {
 		purple_debug_warning("oscar", "Unrecognized character encoding \"%s\", "
 						   "attempting to convert to UTF-8 anyway\n", encoding);
 		utf8 = g_convert(text, textlen, "UTF-8", encoding, NULL, NULL, NULL);
@@ -362,7 +362,7 @@
 	if ((charsetstr == NULL) || (*charsetstr == '\0'))
 		return NULL;
 
-	if (strcasecmp("UTF-8", charsetstr)) {
+	if (g_ascii_strcasecmp("UTF-8", charsetstr)) {
 		if (fallback)
 			ret = g_convert_with_fallback(data, datalen, "UTF-8", charsetstr, "?", NULL, NULL, &err);
 		else
@@ -1625,16 +1625,19 @@
 	ClientInfo info = CLIENTINFO_PURPLE;
 	va_list ap;
 	char *key;
+	gboolean truncate_pass;
 
 	gc = od->gc;
 	account = purple_connection_get_account(gc);
 
 	va_start(ap, fr);
 	key = va_arg(ap, char *);
+	truncate_pass = va_arg(ap, int);
 	va_end(ap);
 
 	aim_send_login(od, conn, purple_account_get_username(account),
-				   purple_connection_get_password(gc), &info, key);
+			purple_connection_get_password(gc), truncate_pass,
+			&info, key);
 
 	purple_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS);
 	ck[2] = 0x6c;
@@ -4143,6 +4146,7 @@
 			conn->sn, msg->str, &tmp, &tmplen, &charset, &charsubset);
 	g_string_free(msg, TRUE);
 	msg = g_string_new_len(tmp, tmplen);
+	g_free(tmp);
 
 	/* Append any binary data that we may have */
 	if (oscar_id) {
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Wed May 23 23:17:50 2007 +0000
@@ -274,6 +274,10 @@
 	"us", "en", \
 }
 
+/*
+ * TODO: Use PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION, and
+ *       PURPLE_MICRO_VERSION?  Or did that break things?
+ */
 #define CLIENTINFO_PURPLE { \
 	"Purple/" VERSION, \
 	0x0109, \
@@ -574,7 +578,7 @@
 
 void aim_clientready(OscarData *od, FlapConnection *conn);
 int aim_request_login(OscarData *od, FlapConnection *conn, const char *sn);
-int aim_send_login(OscarData *, FlapConnection *, const char *, const char *, ClientInfo *, const char *key);
+int aim_send_login(OscarData *od, FlapConnection *conn, const char *sn, const char *password, gboolean truncate_pass, ClientInfo *ci, const char *key);
 /* 0x000b */ int aim_auth_securid_send(OscarData *od, const char *securid);
 
 void aim_cleansnacs(OscarData *, int maxage);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/rxhandlers.c
--- a/libpurple/protocols/oscar/rxhandlers.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/rxhandlers.c	Wed May 23 23:17:50 2007 +0000
@@ -55,14 +55,14 @@
 	mod = g_new0(aim_module_t, 1);
 
 	if (modfirst(od, mod) == -1) {
-		free(mod);
+		g_free(mod);
 		return -1;
 	}
 
 	if (aim__findmodule(od, mod->name)) {
 		if (mod->shutdown)
 			mod->shutdown(od, mod);
-		free(mod);
+		g_free(mod);
 		return -1;
 	}
 
@@ -86,7 +86,7 @@
 		if (cur->shutdown)
 			cur->shutdown(od, cur);
 
-		free(cur);
+		g_free(cur);
 
 		cur = tmp;
 	}
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/snac.c
--- a/libpurple/protocols/oscar/snac.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/snac.c	Wed May 23 23:17:50 2007 +0000
@@ -57,7 +57,7 @@
 	snac.flags = flags;
 
 	if (datalen) {
-		if (!(snac.data = malloc(datalen)))
+		if (!(snac.data = g_malloc(datalen)))
 			return 0; /* er... */
 		memcpy(snac.data, data, datalen);
 	} else
@@ -78,7 +78,7 @@
 	if (!newsnac)
 		return 0;
 
-	if (!(snac = malloc(sizeof(aim_snac_t))))
+	if (!(snac = g_malloc(sizeof(aim_snac_t))))
 		return 0;
 	memcpy(snac, newsnac, sizeof(aim_snac_t));
 	snac->issuetime = time(NULL);
@@ -109,7 +109,7 @@
 		if (cur->id == id) {
 			*prev = cur->next;
 			if (cur->flags & AIM_SNACFLAGS_DESTRUCTOR) {
-				free(cur->data);
+				g_free(cur->data);
 				cur->data = NULL;
 			}
 			return cur;
@@ -145,8 +145,8 @@
 
 				*prev = cur->next;
 
-				free(cur->data);
-				free(cur);
+				g_free(cur->data);
+				g_free(cur);
 			} else
 				prev = &cur->next;
 		}
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/tlv.c
--- a/libpurple/protocols/oscar/tlv.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/tlv.c	Wed May 23 23:17:50 2007 +0000
@@ -41,8 +41,8 @@
 	if (!oldtlv || !*oldtlv)
 		return;
 
-	free((*oldtlv)->value);
-	free(*oldtlv);
+	g_free((*oldtlv)->value);
+	g_free(*oldtlv);
 	*oldtlv = NULL;
 
 	return;
@@ -103,7 +103,7 @@
 				cur->tlv->value = byte_stream_getraw(bs, length);
 				if (!cur->tlv->value) {
 					freetlv(&cur->tlv);
-					free(cur);
+					g_free(cur);
 					aim_tlvlist_free(&list);
 					return NULL;
 				}
@@ -159,7 +159,7 @@
 			cur->tlv->value = byte_stream_getraw(bs, length);
 			if (!cur->tlv->value) {
 				freetlv(&cur->tlv);
-				free(cur);
+				g_free(cur);
 				aim_tlvlist_free(&list);
 				return NULL;
 			}
@@ -216,7 +216,7 @@
 			cur->tlv->value = byte_stream_getraw(bs, length);
 			if (!cur->tlv->value) {
 				freetlv(&cur->tlv);
-				free(cur);
+				g_free(cur);
 				aim_tlvlist_free(&list);
 				return NULL;
 			}
@@ -271,8 +271,8 @@
 	aim_tlvlist_write(&bs2, &two);
 
 	if (memcmp(bs1.data, bs2.data, bs1.len)) {
-		free(bs1.data);
-		free(bs2.data);
+		g_free(bs1.data);
+		g_free(bs2.data);
 		return 1;
 	}
 
@@ -304,7 +304,7 @@
 		freetlv(&cur->tlv);
 
 		tmp = cur->next;
-		free(cur);
+		g_free(cur);
 		cur = tmp;
 	}
 
@@ -600,7 +600,7 @@
 	if (cur == NULL)
 		return aim_tlvlist_add_raw(list, type, length, value);
 
-	free(cur->tlv->value);
+	g_free(cur->tlv->value);
 	cur->tlv->length = length;
 	if (cur->tlv->length > 0) {
 		cur->tlv->value = g_memdup(value, length);
@@ -705,9 +705,9 @@
 	}
 
 	/* Free the removed item */
-	free(del->tlv->value);
-	free(del->tlv);
-	free(del);
+	g_free(del->tlv->value);
+	g_free(del->tlv);
+	g_free(del);
 }
 
 /**
@@ -808,7 +808,7 @@
 {
 	char *ret;
 
-	ret = malloc(tlv->length + 1);
+	ret = g_malloc(tlv->length + 1);
 	memcpy(ret, tlv->value, tlv->length);
 	ret[tlv->length] = '\0';
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/oscar/util.c
--- a/libpurple/protocols/oscar/util.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/oscar/util.c	Wed May 23 23:17:50 2007 +0000
@@ -101,14 +101,14 @@
 	next = strchr(last, dl);
 
 	if (curCount < theindex) {
-		toReturn = malloc(sizeof(char));
+		toReturn = g_malloc(sizeof(char));
 		*toReturn = '\0';
 	} else {
 		if (next == NULL) {
-			toReturn = malloc((strlen(last) + 1) * sizeof(char));
+			toReturn = g_malloc((strlen(last) + 1) * sizeof(char));
 			strcpy(toReturn, last);
 		} else {
-			toReturn = malloc((next - last + 1) * sizeof(char));
+			toReturn = g_malloc((next - last + 1) * sizeof(char));
 			memcpy(toReturn, last, (next - last));
 			toReturn[next - last] = '\0';
 		}
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/sametime/sametime.c
--- a/libpurple/protocols/sametime/sametime.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Wed May 23 23:17:50 2007 +0000
@@ -611,9 +611,9 @@
 
 
 static struct mwAwareListHandler mw_aware_list_handler = {
-  .on_aware = mw_aware_list_on_aware,
-  .on_attrib = mw_aware_list_on_attrib,
-  .clear = mw_aware_list_clear,
+  mw_aware_list_on_aware,
+  mw_aware_list_on_attrib,
+  mw_aware_list_clear,
 };
 
 
@@ -1777,14 +1777,14 @@
 
 
 static struct mwSessionHandler mw_session_handler = {
-  .io_write = mw_session_io_write,
-  .io_close = mw_session_io_close,
-  .clear = mw_session_clear,
-  .on_stateChange = mw_session_stateChange,
-  .on_setPrivacyInfo = mw_session_setPrivacyInfo,
-  .on_setUserStatus = mw_session_setUserStatus,
-  .on_admin = mw_session_admin,
-  .on_announce = mw_session_announce,
+  mw_session_io_write,
+  mw_session_io_close,
+  mw_session_clear,
+  mw_session_stateChange,
+  mw_session_setPrivacyInfo,
+  mw_session_setUserStatus,
+  mw_session_admin,
+  mw_session_announce,
 };
 
 
@@ -1803,8 +1803,8 @@
 
 
 static struct mwAwareHandler mw_aware_handler = {
-  .on_attrib = mw_aware_on_attrib,
-  .clear = mw_aware_clear,
+  mw_aware_on_attrib,
+  mw_aware_clear,
 };
 
 
@@ -2042,14 +2042,14 @@
 
 
 static struct mwConferenceHandler mw_conference_handler = {
-  .on_invited = mw_conf_invited,
-  .conf_opened = mw_conf_opened,
-  .conf_closed = mw_conf_closed,
-  .on_peer_joined = mw_conf_peer_joined,
-  .on_peer_parted = mw_conf_peer_parted,
-  .on_text = mw_conf_text,
-  .on_typing = mw_conf_typing,
-  .clear = mw_conf_clear,
+  mw_conf_invited,
+  mw_conf_opened,
+  mw_conf_closed,
+  mw_conf_peer_joined,
+  mw_conf_peer_parted,
+  mw_conf_text,
+  mw_conf_typing,
+  mw_conf_clear,
 };
 
 
@@ -2287,12 +2287,12 @@
 
 
 static struct mwFileTransferHandler mw_ft_handler = {
-  .ft_offered = mw_ft_offered,
-  .ft_opened = mw_ft_opened,
-  .ft_closed = mw_ft_closed,
-  .ft_recv = mw_ft_recv,
-  .ft_ack = mw_ft_ack,
-  .clear = mw_ft_clear,
+  mw_ft_offered,
+  mw_ft_opened,
+  mw_ft_closed,
+  mw_ft_recv,
+  mw_ft_ack,
+  mw_ft_clear,
 };
 
 
@@ -2854,11 +2854,11 @@
 
 
 static struct mwImHandler mw_im_handler = {
-  .conversation_opened = mw_conversation_opened,
-  .conversation_closed = mw_conversation_closed,
-  .conversation_recv = mw_conversation_recv,
-  .place_invite = mw_place_invite,
-  .clear = mw_im_clear,
+  mw_conversation_opened,
+  mw_conversation_closed,
+  mw_conversation_recv,
+  mw_place_invite,
+  mw_im_clear,
 };
 
 
@@ -3052,14 +3052,14 @@
 
 
 static struct mwPlaceHandler mw_place_handler = {
-  .opened = mw_place_opened,
-  .closed = mw_place_closed,
-  .peerJoined = mw_place_peerJoined,
-  .peerParted = mw_place_peerParted,
-  .peerSetAttribute = mw_place_peerSetAttribute,
-  .peerUnsetAttribute = mw_place_peerUnsetAttribute,
-  .message = mw_place_message,
-  .clear = mw_place_clear,
+  mw_place_opened,
+  mw_place_closed,
+  mw_place_peerJoined,
+  mw_place_peerParted,
+  mw_place_peerSetAttribute,
+  mw_place_peerUnsetAttribute,
+  mw_place_message,
+  mw_place_clear,
 };
 
 
@@ -4575,9 +4575,9 @@
   struct mwSession *session;
 
   struct mwPrivacyInfo privacy = {
-    .deny = FALSE,
-    .count = 0,
-    .users = NULL,
+    FALSE, /* deny  */
+    0,     /* count */
+    NULL,  /* users */
   };
 
   g_return_if_fail(gc != NULL);
@@ -5167,7 +5167,13 @@
 
 
 static PurplePluginUiInfo mw_plugin_ui_info = {
-  .get_plugin_pref_frame = mw_plugin_get_plugin_pref_frame,
+  mw_plugin_get_plugin_pref_frame,
+  0,    /* page_num */
+  NULL, /* frame */
+  NULL,
+  NULL,
+  NULL,
+  NULL
 };
 
 
@@ -5648,30 +5654,39 @@
   g_log_remove_handler("meanwhile", log_handler[1]);
 }
 
-
-static PurplePluginInfo mw_plugin_info = {
-  .magic           = PURPLE_PLUGIN_MAGIC,
-  .major_version   = PURPLE_MAJOR_VERSION,
-  .minor_version   = PURPLE_MINOR_VERSION,
-  .type            = PURPLE_PLUGIN_PROTOCOL,
-  .ui_requirement  = NULL,
-  .flags           = 0,
-  .dependencies    = NULL,
-  .priority        = PURPLE_PRIORITY_DEFAULT,
-  .id              = PLUGIN_ID,
-  .name            = PLUGIN_NAME,
-  .version         = VERSION,
-  .summary         = PLUGIN_SUMMARY,
-  .description     = PLUGIN_DESC,
-  .author          = PLUGIN_AUTHOR,
-  .homepage        = PLUGIN_HOMEPAGE,
-  .load            = mw_plugin_load,
-  .unload          = mw_plugin_unload,
-  .destroy         = mw_plugin_destroy,
-  .ui_info         = NULL,
-  .extra_info      = &mw_prpl_info,
-  .prefs_info      = &mw_plugin_ui_info,
-  .actions         = mw_plugin_actions,
+static PurplePluginInfo mw_plugin_info =
+{
+	PURPLE_PLUGIN_MAGIC,
+	PURPLE_MAJOR_VERSION,
+	PURPLE_MINOR_VERSION,
+	PURPLE_PLUGIN_PROTOCOL,                           /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	PURPLE_PRIORITY_DEFAULT,                          /**< priority       */
+
+	PLUGIN_ID,                                        /**< id             */
+	PLUGIN_NAME,                                      /**< name           */
+	VERSION,                                          /**< version        */
+	PLUGIN_SUMMARY,                                   /**< summary        */
+	PLUGIN_DESC,                                      /**<  description    */
+	PLUGIN_AUTHOR,                                    /**< author         */
+	PLUGIN_HOMEPAGE,                                  /**< homepage       */
+
+	mw_plugin_load,                                   /**< load           */
+	mw_plugin_unload,                                 /**< unload         */
+	mw_plugin_destroy,                                /**< destroy        */
+
+	NULL,                                             /**< ui_info        */
+	&mw_prpl_info,                                    /**< extra_info     */
+	&mw_plugin_ui_info,                               /**< prefs_info     */
+	mw_plugin_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/silc/util.c
--- a/libpurple/protocols/silc/util.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/silc/util.c	Wed May 23 23:17:50 2007 +0000
@@ -620,15 +620,15 @@
 	ct = strrchr(filename, '.');
 	if (!ct)
 		return NULL;
-	else if (!strcasecmp(".png", ct))
+	else if (!g_ascii_strcasecmp(".png", ct))
 		return strdup("image/png");
-	else if (!strcasecmp(".jpg", ct))
+	else if (!g_ascii_strcasecmp(".jpg", ct))
 		return strdup("image/jpeg");
-	else if (!strcasecmp(".jpeg", ct))
+	else if (!g_ascii_strcasecmp(".jpeg", ct))
 		return strdup("image/jpeg");
-	else if (!strcasecmp(".gif", ct))
+	else if (!g_ascii_strcasecmp(".gif", ct))
 		return strdup("image/gif");
-	else if (!strcasecmp(".tiff", ct))
+	else if (!g_ascii_strcasecmp(".tiff", ct))
 		return strdup("image/tiff");
 	
 	return NULL;
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/simple/simple.c	Wed May 23 23:17:50 2007 +0000
@@ -277,18 +277,18 @@
 							auth->nonce, noncecount, NULL, auth->digest_session_key);
 		purple_debug(PURPLE_DEBUG_MISC, "simple", "response %s\n", response);
 
-		ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"\r\n", authuser, auth->realm, auth->nonce, target, noncecount, response);
+		ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"", authuser, auth->realm, auth->nonce, target, noncecount, response);
 		g_free(response);
 		return ret;
 	} else if(auth->type == 2) { /* NTLM */
 		if(auth->nc == 3 && auth->nonce) {
 			/* TODO: Don't hardcode "purple" as the hostname */
 			ret = purple_ntlm_gen_type3(authuser, sip->password, "purple", authdomain, (const guint8 *)auth->nonce, &auth->flags);
-			tmp = g_strdup_printf("NTLM qop=\"auth\", opaque=\"%s\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"%s\"\r\n", auth->opaque, auth->realm, auth->target, ret);
+			tmp = g_strdup_printf("NTLM qop=\"auth\", opaque=\"%s\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"%s\"", auth->opaque, auth->realm, auth->target, ret);
 			g_free(ret);
 			return tmp;
 		}
-		tmp = g_strdup_printf("NTLM qop=\"auth\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"\"\r\n", auth->realm, auth->target);
+		tmp = g_strdup_printf("NTLM qop=\"auth\", realm=\"%s\", targetname=\"%s\", gssapi-data=\"\"", auth->realm, auth->target);
 		return tmp;
 	}
 
@@ -298,7 +298,7 @@
 						auth->nonce, noncecount, NULL, auth->digest_session_key);
 	purple_debug(PURPLE_DEBUG_MISC, "simple", "response %s\n", response);
 
-	ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"\r\n", authuser, auth->realm, auth->nonce, target, noncecount, response);
+	ret = g_strdup_printf("Digest username=\"%s\", realm=\"%s\", nonce=\"%s\", uri=\"%s\", nc=\"%s\", response=\"%s\"", authuser, auth->realm, auth->nonce, target, noncecount, response);
 	g_free(response);
 	return ret;
 }
@@ -630,14 +630,12 @@
 	if(addheaders) addh = addheaders;
 	if(sip->registrar.type && !strcmp(method, "REGISTER")) {
 		buf = auth_header(sip, &sip->registrar, method, url);
-		auth = g_strdup_printf("Authorization: %s", buf);
+		auth = g_strdup_printf("Authorization: %s\r\n", buf);
 		g_free(buf);
 		purple_debug(PURPLE_DEBUG_MISC, "simple", "header %s", auth);
-	}
-
-	if(sip->proxy.type && strcmp(method, "REGISTER")) {
+	} else if(sip->proxy.type && strcmp(method, "REGISTER")) {
 		buf = auth_header(sip, &sip->proxy, method, url);
-		auth = g_strdup_printf("Proxy-Authorization: %s", buf);
+		auth = g_strdup_printf("Proxy-Authorization: %s\r\n", buf);
 		g_free(buf);
 		purple_debug(PURPLE_DEBUG_MISC, "simple", "header %s", auth);
 	}
@@ -984,8 +982,8 @@
 		state = xmlnode_get_child(isc, "state");
 
 		if(!state) {
-			purple_debug_info("simple", "process_incoming_message: no state found\n");
-			xmlnode_free(isc);
+				purple_debug_info("simple", "process_incoming_message: no state found\n");
+				xmlnode_free(isc);
 			return;
 		}
 
@@ -1239,9 +1237,9 @@
 			while(tmp && tmp < acceptheader + strlen(acceptheader)) {
 				gchar *tmp2 = strchr(tmp, ',');
 				if(tmp2) *tmp2 = '\0';
-				if(!strcasecmp("application/pidf+xml", tmp))
+				if(!g_ascii_strcasecmp("application/pidf+xml", tmp))
 					foundpidf = TRUE;
-				if(!strcasecmp("application/xpidf+xml", tmp))
+				if(!g_ascii_strcasecmp("application/xpidf+xml", tmp))
 					foundxpidf = TRUE;
 				if(tmp2) {
 					*tmp2 = ',';
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/simple/sipmsg.c
--- a/libpurple/protocols/simple/sipmsg.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/simple/sipmsg.c	Wed May 23 23:17:50 2007 +0000
@@ -180,7 +180,7 @@
 	GSList *tmp = msg->headers;
 	while(tmp) {
 		elem = tmp->data;
-		if(strcasecmp(elem->name, name)==0) {
+		if(g_ascii_strcasecmp(elem->name, name)==0) {
 			msg->headers = g_slist_remove(msg->headers, elem);
 			g_free(elem->name);
 			g_free(elem->value);
@@ -198,7 +198,7 @@
 	tmp = msg->headers;
 	while(tmp) {
 		elem = tmp->data;
-		if(strcasecmp(elem->name, name)==0) {
+		if(g_ascii_strcasecmp(elem->name, name)==0) {
 			return elem->value;
 		}
 		tmp = g_slist_next(tmp);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/protocols/zephyr/zephyr.c
--- a/libpurple/protocols/zephyr/zephyr.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c	Wed May 23 23:17:50 2007 +0000
@@ -990,7 +990,8 @@
 
 	tc = tree_child(ptree,0)->contents;
 
-	if (ptree->num_children > 0  &&	tc && !strcasecmp(tc, key)) {
+	/* g_strcasecmp() is deprecated.  What is the encoding here??? */
+	if (ptree->num_children > 0  &&	tc && !g_strcasecmp(tc, key)) {
 		return ptree;
 	} else {
 		parse_tree *result = &null_parse_tree;
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/proxy.c
--- a/libpurple/proxy.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/proxy.c	Wed May 23 23:17:50 2007 +0000
@@ -217,14 +217,14 @@
 		g_free(path);
 
 		/* See whether to use a proxy. */
-		if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/use_http_proxy", &tmp,
+		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/mode", &tmp,
 					       NULL, NULL, NULL))
 			return purple_global_proxy_get_info();
-		if (!strcmp(tmp, "false\n")) {
+		if (!strcmp(tmp, "none\n")) {
 			info.type = PURPLE_PROXY_NONE;
 			g_free(tmp);
 			return &info;
-		} else if (strcmp(tmp, "true\n")) {
+		} else if (strcmp(tmp, "manual\n")) {
 			g_free(tmp);
 			return purple_global_proxy_get_info();
 		}
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/purple-remote
--- a/libpurple/purple-remote	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/purple-remote	Wed May 23 23:17:50 2007 +0000
@@ -94,6 +94,8 @@
 def execute(uri):
     match = re.match(urlregexp, uri)
     protocol = match.group(2)
+    if protocol == "xmpp"
+        protocol = "jabber"
     if protocol == "aim" or protocol == "icq":
         protocol = "oscar"
     if protocol is not None:
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/server.c
--- a/libpurple/server.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/server.c	Wed May 23 23:17:50 2007 +0000
@@ -576,15 +576,20 @@
 		purple_conv_im_set_typing_state(im, state);
 		purple_conv_im_update_typing(im);
 	} else {
-		if (state == PURPLE_TYPING)
+		switch (state)
 		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typing", gc->account, name);
-		}
-		else
-		{
-			purple_signal_emit(purple_conversations_get_handle(),
-							 "buddy-typed", gc->account, name);
+			case PURPLE_TYPING:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typing", gc->account, name);
+				break;
+			case PURPLE_TYPED:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typed", gc->account, name);
+				break;
+			case PURPLE_NOT_TYPING:
+				purple_signal_emit(purple_conversations_get_handle(),
+								   "buddy-typing-stopped", gc->account, name);
+				break;
 		}
 	}
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 libpurple/util.c
--- a/libpurple/util.c	Wed May 23 23:13:11 2007 +0000
+++ b/libpurple/util.c	Wed May 23 23:17:50 2007 +0000
@@ -1874,6 +1874,11 @@
 			while (1) {
 				if (badchar(*t) || badentity(t)) {
 
+					if ((!g_ascii_strncasecmp(c, "http://", 7) && (t - c == 7)) ||
+						(!g_ascii_strncasecmp(c, "https://", 8) && (t - c == 8))) {
+						break;
+					}
+
 					if (*(t) == ',' && (*(t + 1) != ' ')) {
 						t++;
 						continue;
@@ -1933,6 +1938,12 @@
 			t = c;
 			while (1) {
 				if (badchar(*t) || badentity(t)) {
+
+					if ((!g_ascii_strncasecmp(c, "ftp://", 6) && (t - c == 6)) ||
+						(!g_ascii_strncasecmp(c, "sftp://", 7) && (t - c == 7))) {
+						break;
+					}
+
 					if (*(t - 1) == '.')
 						t--;
 					if ((*(t - 1) == ')' && (inside_paren > 0))) {
@@ -1984,8 +1995,21 @@
 			t = c;
 			while (1) {
 				if (badchar(*t) || badentity(t)) {
+					char *d;
+					if (t - c == 7) {
+						break;
+					}
 					if (*(t - 1) == '.')
 						t--;
+					if ((d = strstr(c + 7, "?")) != NULL && d < t)
+						url_buf = g_strndup(c + 7, d - c - 7);
+					else
+						url_buf = g_strndup(c + 7, t - c - 7);
+					if (!purple_email_is_valid(url_buf)) {
+						g_free(url_buf);
+						break;
+					}
+					g_free(url_buf);
 					url_buf = g_strndup(c, t - c);
 					tmpurlbuf = purple_unescape_html(url_buf);
 					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
@@ -2000,6 +2024,39 @@
 				t++;
 
 			}
+		} else if ((*c=='x') && (!g_ascii_strncasecmp(c, "xmpp:", 5)) &&
+				   (c == text || badchar(c[-1]) || badentity(c-1))) {
+			t = c;
+			while (1) {
+				if (badchar(*t) || badentity(t)) {
+
+					if (t - c == 5) {
+						break;
+					}
+
+					if (*(t) == ',' && (*(t + 1) != ' ')) {
+						t++;
+						continue;
+					}
+
+					if (*(t - 1) == '.')
+						t--;
+					if ((*(t - 1) == ')' && (inside_paren > 0))) {
+						t--;
+					}
+
+					url_buf = g_strndup(c, t - c);
+					tmpurlbuf = purple_unescape_html(url_buf);
+					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
+							tmpurlbuf, url_buf);
+					g_free(url_buf);
+					g_free(tmpurlbuf);
+					c = t;
+					break;
+				}
+				t++;
+
+			}
 		} else if (c != text && (*c == '@')) {
 			int flag;
 			GString *gurl_buf = NULL;
@@ -4158,7 +4215,7 @@
 		gunichar c = g_utf8_get_char(iter);
 		/* If the character is an ASCII character and is alphanumeric,
 		 * or one of the specified values, no need to escape */
-		if (c < 128 && (isalnum(c) || c == '@' || c == '-' ||
+		if (c < 128 && (g_ascii_isalnum(c) || c == '@' || c == '-' ||
 				c == '_' || c == '.' || c == '#')) {
 			buf[j++] = c;
 		} else {
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin.spec.in
--- a/pidgin.spec.in	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin.spec.in	Wed May 23 23:17:50 2007 +0000
@@ -70,6 +70,10 @@
 # For some reason perl isn't always automatically detected as a requirement :(
 Requires: perl
 
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 Obsoletes: gaim
 Provides: gaim
 
@@ -296,7 +300,7 @@
     if [ -f %{_sysconfdir}/gconf/schemas/purple.schemas ]; then
         gconftool-2 --makefile-uninstall-rule \
             %{_sysconfdir}/gconf/schemas/purple.schemas >/dev/null || :
-        killall -HUP gconfd-2 || :
+        killall -HUP gconfd-2 &> /dev/null || :
     fi
 fi
 
@@ -305,7 +309,7 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-install-rule \
         %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
+    killall -HUP gconfd-2 &> /dev/null || :
 fi
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -319,7 +323,7 @@
     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 || :
+    killall -HUP gconfd-2 &> /dev/null || :
 fi
 
 %postun
@@ -443,6 +447,10 @@
 %endif
 
 %changelog
+* Thu May 10 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Add scriptlet Requires for GConf2 to fix schema installation
+- Silence harmless errors when gconfd-2 is not running at install time
+
 * Thu May 3 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Add missing BuildRequires: startup-notification-devel, if you really
   need to build on a distro without it use --without startupnotification
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkblist.c	Wed May 23 23:17:50 2007 +0000
@@ -782,7 +782,8 @@
 	gtk_widget_show_all(data->window);
 }
 
-static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) {
+static void gtk_blist_row_expanded_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data)
+{
 	PurpleBlistNode *node;
 	GValue val;
 
@@ -806,7 +807,8 @@
 	}
 }
 
-static void gtk_blist_row_collapsed_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) {
+static void gtk_blist_row_collapsed_cb(GtkTreeView *tv, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data)
+{
 	PurpleBlistNode *node;
 	GValue val;
 
@@ -817,6 +819,8 @@
 
 	if (PURPLE_BLIST_NODE_IS_GROUP(node)) {
 		char *title;
+		struct _pidgin_blist_node *gtknode;
+		PurpleBlistNode *cnode;
 
 		title = pidgin_get_group_title(node, FALSE);
 
@@ -827,6 +831,17 @@
 		g_free(title);
 
 		purple_blist_node_set_bool(node, "collapsed", TRUE);
+
+		for(cnode = node->child; cnode; cnode = cnode->next) {
+			if (PURPLE_BLIST_NODE_IS_CONTACT(cnode)) {
+				gtknode = cnode->ui_data;
+				if (!gtknode->contact_expanded)
+					continue;
+				gtknode->contact_expanded = FALSE;
+				pidgin_blist_update_contact(NULL, cnode);
+			}
+		}
+
 	} else if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		pidgin_blist_collapse_contact_cb(NULL, node);
 	}
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkconv.c	Wed May 23 23:17:50 2007 +0000
@@ -1012,12 +1012,24 @@
 {
 	PidginWindow *win = data;
 	PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
+	PurpleBuddy *buddy = purple_find_buddy(conv->account, conv->name);
+	const char *name;
 	gchar *buf;
-
-	buf = g_strdup_printf("%s.html", purple_normalize(conv->account, conv->name));
-
+	gchar *c;
+
+	if (buddy != NULL)
+		name = purple_buddy_get_contact_alias(buddy);
+	else
+		name = purple_normalize(conv->account, conv->name);
+
+	buf = g_strdup_printf("%s.html", name);
+	for (c = buf ; *c ; c++)
+	{
+		if (*c == '/' || *c == '\\')
+			*c = ' ';
+	}
 	purple_request_file(PIDGIN_CONVERSATION(conv), _("Save Conversation"),
-					  purple_escape_filename(buf),
+					  buf,
 					  TRUE, G_CALLBACK(savelog_writefile_cb), NULL,
 					  NULL, NULL, conv,
 					  conv);
@@ -1755,7 +1767,8 @@
 static void
 move_to_next_unread_tab(PidginConversation *gtkconv, gboolean forward)
 {
-	PidginConversation *next_gtkconv = NULL;
+	PidginConversation *next_gtkconv = NULL, *most_active = NULL;
+	PidginUnseenState unseen_state = PIDGIN_UNSEEN_NONE;
 	PidginWindow *win;
 	int initial, i, total, diff;
 
@@ -1771,17 +1784,21 @@
 
 	for (i = (initial + diff) % total; i != initial; i = (i + diff) % total) {
 		next_gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, i);
-		if (next_gtkconv->unseen_state > 0)
-			break;
-	}
-
-	if (i == initial) { /* no new messages */
+		if (next_gtkconv->unseen_state > unseen_state) {
+			most_active = next_gtkconv;
+			unseen_state = most_active->unseen_state;
+			if(PIDGIN_UNSEEN_NICK == unseen_state) /* highest possible state */
+				break;
+		}
+	}
+
+	if (most_active == NULL) { /* no new messages */
 		i = (i + diff) % total;
-		next_gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, i);
-	}
-
-	if (next_gtkconv != NULL && next_gtkconv != gtkconv)
-		pidgin_conv_window_switch_gtkconv(win, next_gtkconv);
+		most_active = pidgin_conv_window_get_gtkconv_at_index(win, i);
+	}
+
+	if (most_active != NULL && most_active != gtkconv)
+		pidgin_conv_window_switch_gtkconv(win, most_active);
 }
 
 static gboolean
@@ -3977,6 +3994,12 @@
 	}
 	else if (PURPLE_BLIST_NODE_IS_BUDDY(node))
 		update_chat_alias((PurpleBuddy *)node, conv, gc, prpl_info);
+	else if (PURPLE_BLIST_NODE_IS_CHAT(node) &&
+			purple_conversation_get_account(conv) == ((PurpleChat*)node)->account)
+	{
+		if (old_alias == NULL || g_utf8_collate(old_alias, purple_conversation_get_title(conv)) == 0)
+			pidgin_conv_update_fields(conv, PIDGIN_CONV_SET_TITLE);
+	}
 }
 
 static void
@@ -4128,6 +4151,7 @@
 	GtkTreeViewColumn *col;
 	void *blist_handle = purple_blist_get_handle();
 	GList *focus_chain = NULL;
+	int ul_width;
 
 	gtkchat = gtkconv->u.chat;
 	gc      = purple_conversation_get_gc(conv);
@@ -4228,8 +4252,13 @@
 												   "pixbuf", CHAT_USERS_ICON_COLUMN, NULL);
 	gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
-	gtk_widget_set_size_request(lbox,
-	                            purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/userlist_width"), -1);
+	ul_width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/userlist_width");
+	gtk_widget_set_size_request(lbox, ul_width, -1);
+
+	/* Hack to prevent completely collapsed userlist coming back with a 1 pixel width.
+	 * I would have liked to use the GtkPaned "max-position", but for some reason that didn't work */
+	if (ul_width == 0)
+		gtk_paned_set_position(GTK_PANED(hpaned), 999999);
 
 	g_signal_connect(G_OBJECT(list), "button_press_event",
 					 G_CALLBACK(right_click_chat_cb), gtkconv);
@@ -4585,6 +4614,18 @@
 	}
 }
 
+static gboolean
+ignore_middle_click(GtkWidget *widget, GdkEventButton *e, gpointer null)
+{
+	/* A click on the pane is propagated to the notebook containing the pane.
+	 * So if Stu accidentally aims high and middle clicks on the pane-handle,
+	 * it causes a conversation tab to close. Let's stop that from happening.
+	 */
+	if (e->button == 2 && e->type == GDK_BUTTON_PRESS)
+		return TRUE;
+	return FALSE;
+}
+
 /**************************************************************************
  * Conversation UI operations
  **************************************************************************/
@@ -4658,6 +4699,8 @@
 	                  te, sizeof(te) / sizeof(GtkTargetEntry),
 	                  GDK_ACTION_COPY);
 
+	g_signal_connect(G_OBJECT(pane), "button_press_event",
+	                 G_CALLBACK(ignore_middle_click), NULL);
 	g_signal_connect(G_OBJECT(pane), "drag_data_received",
 	                 G_CALLBACK(conv_dnd_recv), gtkconv);
 	g_signal_connect(G_OBJECT(gtkconv->imhtml), "drag_data_received",
@@ -5551,9 +5594,9 @@
 
 	flags = purple_conv_chat_user_get_flags(chat, user);
 
-	cbuddy = purple_conv_chat_cb_new(user, alias, flags);
-
-	add_chat_buddy_common(conv, cbuddy, NULL);
+	cbuddy = purple_conv_chat_cb_find(chat, user);
+	if (cbuddy)
+		add_chat_buddy_common(conv, cbuddy, NULL);
 	g_free(alias);
 }
 
@@ -7382,8 +7425,7 @@
 		PidginWindow *dest_win;
 		GtkNotebook *dest_notebook;
 		GtkWidget *tab;
-		gint nb_x, nb_y, page_num;
-		gint arrow1_x, arrow1_y, arrow2_x, arrow2_y;
+		gint page_num;
 		gboolean horiz_tabs = FALSE;
 		PidginConversation *gtkconv;
 		gboolean to_right = FALSE;
@@ -7399,52 +7441,35 @@
 
 		dest_notebook = GTK_NOTEBOOK(dest_win->notebook);
 
-		gdk_window_get_origin(GTK_WIDGET(dest_notebook)->window, &nb_x, &nb_y);
-
-		arrow1_x = arrow2_x = nb_x;
-		arrow1_y = arrow2_y = nb_y;
-
 		page_num = pidgin_conv_get_tab_at_xy(dest_win,
 		                                      e->x_root, e->y_root, &to_right);
 		to_right = to_right && (win != dest_win);
 
 		if (gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_TOP ||
-		    gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_BOTTOM) {
-
-			    horiz_tabs = TRUE;
-		    }
+				gtk_notebook_get_tab_pos(dest_notebook) == GTK_POS_BOTTOM) {
+			horiz_tabs = TRUE;
+		}
 
 		gtkconv = pidgin_conv_window_get_gtkconv_at_index(dest_win, page_num);
 		tab = gtkconv->tabby;
 
 		if (horiz_tabs) {
-			arrow1_x = arrow2_x = nb_x + tab->allocation.x;
-
 			if (((gpointer)win == (gpointer)dest_win && win->drag_tab < page_num) || to_right) {
-				arrow1_x += tab->allocation.width;
-				arrow2_x += tab->allocation.width;
+				dnd_hints_show_relative(HINT_ARROW_DOWN, tab, HINT_POSITION_RIGHT, HINT_POSITION_TOP);
+				dnd_hints_show_relative(HINT_ARROW_UP, tab, HINT_POSITION_RIGHT, HINT_POSITION_BOTTOM);
+			} else {
+				dnd_hints_show_relative(HINT_ARROW_DOWN, tab, HINT_POSITION_LEFT, HINT_POSITION_TOP);
+				dnd_hints_show_relative(HINT_ARROW_UP, tab, HINT_POSITION_LEFT, HINT_POSITION_BOTTOM);
 			}
-
-			arrow1_y = nb_y + tab->allocation.y;
-			arrow2_y = nb_y + tab->allocation.y + tab->allocation.height;
 		} else {
-			arrow1_x = nb_x + tab->allocation.x;
-			arrow2_x = nb_x + tab->allocation.x + tab->allocation.width;
-			arrow1_y = arrow2_y = nb_y + tab->allocation.y;
-
 			if (((gpointer)win == (gpointer)dest_win && win->drag_tab < page_num) || to_right) {
-				arrow1_y += tab->allocation.height;
-				arrow2_y += tab->allocation.height;
+				dnd_hints_show_relative(HINT_ARROW_RIGHT, tab, HINT_POSITION_LEFT, HINT_POSITION_BOTTOM);
+				dnd_hints_show_relative(HINT_ARROW_LEFT, tab, HINT_POSITION_RIGHT, HINT_POSITION_BOTTOM);
+			} else {
+				dnd_hints_show_relative(HINT_ARROW_RIGHT, tab, HINT_POSITION_LEFT, HINT_POSITION_TOP);
+				dnd_hints_show_relative(HINT_ARROW_LEFT, tab, HINT_POSITION_RIGHT, HINT_POSITION_TOP);
 			}
 		}
-
-		if (horiz_tabs) {
-			dnd_hints_show(HINT_ARROW_DOWN, arrow1_x, arrow1_y);
-			dnd_hints_show(HINT_ARROW_UP,   arrow2_x, arrow2_y);
-		} else {
-			dnd_hints_show(HINT_ARROW_RIGHT, arrow1_x, arrow1_y);
-			dnd_hints_show(HINT_ARROW_LEFT,  arrow2_x, arrow2_y);
-		}
 	}
 
 	return TRUE;
@@ -7809,6 +7834,105 @@
 }
 
 static void
+remove_edit_entry(PidginConversation *gtkconv, GtkWidget *entry)
+{
+	g_signal_handlers_disconnect_matched(G_OBJECT(entry), G_SIGNAL_MATCH_DATA,
+				0, 0, NULL, NULL, gtkconv);
+	gtk_widget_show(gtkconv->tab_label);
+	gtk_widget_grab_focus(gtkconv->entry);
+	gtk_widget_destroy(entry);
+}
+
+static gboolean
+alias_focus_cb(GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
+{
+	remove_edit_entry(user_data, widget);
+	return FALSE;
+}
+
+static gboolean
+alias_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+{
+	if (event->keyval == GDK_Escape) {
+		remove_edit_entry(user_data, widget);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static void
+alias_cb(GtkEntry *entry, gpointer user_data)
+{
+	PidginConversation *gtkconv;
+	PurpleConversation *conv;
+	PurpleAccount *account;
+	const char *name;
+
+	gtkconv = (PidginConversation *)user_data;
+	if (gtkconv == NULL) {
+		return;
+	}
+	conv    = gtkconv->active_conv;
+	account = purple_conversation_get_account(conv);
+	name    = purple_conversation_get_name(conv);
+
+	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
+		PurpleBuddy *buddy;
+		buddy = purple_find_buddy(account, name);
+		if (buddy != NULL) {
+			purple_blist_alias_buddy(buddy,
+                                                 gtk_entry_get_text(entry));
+		}
+		serv_alias_buddy(buddy);
+	} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {	        
+		PurpleChat *chat;
+
+		chat = purple_blist_find_chat(account, name);
+		if (chat != NULL) {
+			purple_blist_alias_chat(chat,
+			                        gtk_entry_get_text(entry));
+		}
+	}
+	remove_edit_entry(user_data, GTK_WIDGET(entry));
+}
+
+static gboolean
+alias_double_click_cb(GtkNotebook *notebook, GdkEventButton *event, PidginConversation *gtkconv)
+{
+	GtkWidget *entry = NULL;
+
+	if (event->button != 1 || event->type != GDK_2BUTTON_PRESS) {
+		return FALSE;
+	}
+
+	if (!GTK_WIDGET_VISIBLE(gtkconv->tab_label)) {
+		/* There's already an entry for alias. Let's not create another one. */
+		return FALSE;
+	}
+
+	/* alias label */
+	entry = gtk_entry_new();
+	gtk_entry_set_has_frame(GTK_ENTRY(entry), FALSE);
+	gtk_entry_set_width_chars(GTK_ENTRY(entry), 10);
+	gtk_entry_set_alignment(GTK_ENTRY(entry), 0.5);
+
+	gtk_box_pack_start(GTK_BOX(gtkconv->tabby), entry, TRUE, TRUE, 0);
+	/* after the tab label */
+	gtk_box_reorder_child(GTK_BOX(gtkconv->tabby), entry, 2);
+
+	g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(alias_cb), gtkconv);
+	g_signal_connect(G_OBJECT(entry), "focus-out-event", G_CALLBACK(alias_focus_cb), gtkconv);
+	g_signal_connect(G_OBJECT(entry), "key-press-event", G_CALLBACK(alias_key_press_cb), gtkconv);
+	gtk_entry_set_text(GTK_ENTRY(entry),
+			gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)));
+	gtk_widget_show(entry);
+	gtk_widget_hide(gtkconv->tab_label);
+	gtk_widget_grab_focus(entry);
+
+	return FALSE;
+}
+
+static void
 switch_conv_cb(GtkNotebook *notebook, GtkWidget *page, gint page_num,
                gpointer user_data)
 {
@@ -8151,7 +8275,7 @@
 {
 	gboolean tabs_side = FALSE;
 	gint angle = 0;
-	GtkWidget *first, *third;
+	GtkWidget *first, *third, *ebox;
 
 	if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT ||
 	    purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT)
@@ -8196,6 +8320,12 @@
 		third = gtkconv->close;
 	}
 
+	ebox = gtk_event_box_new();
+	gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
+	gtk_container_add(GTK_CONTAINER(ebox), gtkconv->tabby);
+	g_signal_connect(G_OBJECT(ebox), "button-press-event",
+					G_CALLBACK(alias_double_click_cb), gtkconv);
+
 	if (gtkconv->tab_label->parent == NULL) {
 		/* Pack if it's a new widget */
 		gtk_box_pack_start(GTK_BOX(gtkconv->tabby), first,              FALSE, FALSE, 0);
@@ -8203,7 +8333,7 @@
 		gtk_box_pack_start(GTK_BOX(gtkconv->tabby), third,              FALSE, FALSE, 0);
 
 		/* Add this pane to the conversation's notebook. */
-		gtk_notebook_append_page(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, gtkconv->tabby);
+		gtk_notebook_append_page(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, ebox);
 	} else {
 		/* reparent old widgets on preference changes */
 		gtk_widget_reparent(first,              gtkconv->tabby);
@@ -8214,7 +8344,7 @@
 		gtk_box_set_child_packing(GTK_BOX(gtkconv->tabby), third,              FALSE, FALSE, 0, GTK_PACK_START);
 
 		/* Reset the tabs label to the new version */
-		gtk_notebook_set_tab_label(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, gtkconv->tabby);
+		gtk_notebook_set_tab_label(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, ebox);
 	}
 
 	gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, !tabs_side && !angle, TRUE, GTK_PACK_START);
@@ -8225,6 +8355,7 @@
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs"))
 		gtk_widget_show(gtkconv->close);
 	gtk_widget_show(gtkconv->tabby);
+	gtk_widget_show(ebox);
 }
 
 void
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkdebug.c
--- a/pidgin/gtkdebug.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkdebug.c	Wed May 23 23:17:50 2007 +0000
@@ -77,6 +77,7 @@
 };
 
 static DebugWindow *debug_win = NULL;
+static guint debug_enabled_timer = 0;
 
 #ifdef HAVE_REGEX_H
 static void regex_filter_all(DebugWindow *win);
@@ -864,14 +865,24 @@
 	return win;
 }
 
+static gboolean
+debug_enabled_timeout_cb(gpointer data)
+{
+	debug_enabled_timer = 0;
+
+	if (data)
+		pidgin_debug_window_show();
+	else
+		pidgin_debug_window_hide();
+
+	return FALSE;
+}
+
 static void
 debug_enabled_cb(const char *name, PurplePrefType type,
 				 gconstpointer value, gpointer data)
 {
-	if (value)
-		pidgin_debug_window_show();
-	else
-		pidgin_debug_window_hide();
+	debug_enabled_timer = g_timeout_add(0, debug_enabled_timeout_cb, GINT_TO_POINTER(GPOINTER_TO_INT(value)));
 }
 
 static void
@@ -984,6 +995,9 @@
 pidgin_debug_uninit(void)
 {
 	purple_debug_set_ui_ops(NULL);
+
+	if (debug_enabled_timer != 0)
+		g_source_remove(debug_enabled_timer);
 }
 
 void
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkdialogs.c	Wed May 23 23:17:50 2007 +0000
@@ -75,6 +75,7 @@
 	{"Sadrul Habib Chowdhury",		N_("developer"), NULL},
 	{"Mark 'KingAnt' Doliner",		N_("developer"), NULL},
 	{"Christian 'ChipX86' Hammond",	N_("developer & webmaster"), NULL},
+	{"Casey Harkins",               N_("developer"),   NULL},
 	{"Gary 'grim' Kramlich",		N_("developer"), NULL},
 	{"Richard 'rlaager' Laager",	N_("developer"), NULL},
 	{"Richard 'wabz' Nelson",		N_("developer"), NULL},
@@ -96,7 +97,6 @@
 	{"Ka-Hing 'javabsp' Cheung",	NULL,	NULL},
 	{"Felipe 'shx' Contreras",		NULL,	NULL},
 	{"Decklin Foster",				NULL,	NULL},
-	{"Casey Harkins",               NULL,   NULL},
 	{"Peter 'Bleeter' Lawler",      NULL,   NULL},
 	{"Robert 'Robot101' McQueen",	NULL,	NULL},
 	{"Benjamin Miller",				NULL,	NULL},
@@ -156,15 +156,15 @@
 	{N_("French"),              "fr", "Éric Boumaour", "zongo_fr@users.sourceforge.net"},
 	{N_("Galician"),            "gl", "Ignacio Casal Quinteiro", "nacho.resa@gmail.com"},
 	{N_("Gujarati"),            "gu", "Ankit Patel", "ankit_patel@users.sf.net"},
-	{N_("Gujarati"),            "gu", "Gujarati Language Team", "indianoss-gujarati@lists.sourceforge.net"},
+	{N_("Gujarati"),            "gu", N_("Gujarati Language Team"), "indianoss-gujarati@lists.sourceforge.net"},
 	{N_("Hebrew"),              "he", "Shalom Craimer", "scraimer@gmail.com"},
 	{N_("Hindi"),               "hi", "Ravishankar Shrivastava", "raviratlami@yahoo.com"},
 	{N_("Hungarian"),           "hu", "Zoltan Sutto", "sutto.zoltan@rutinsoft.hu"},
 	{N_("Indonesian"),          "id", "Rai S. Regawa", "raireg@yahoo.com"},
 	{N_("Italian"),             "it", "Claudio Satriano", "satriano@na.infn.it"},
 	{N_("Japanese"),            "ja", "Takashi Aihana", "aihana@gnome.gr.jp"},
-	{N_("Georgian"),            "ka", "Ubuntu Georgian Translators", "alexander.didebulidze@stusta.mhn.de"},
-	{N_("Kannada"),             "kn", "Kannada Translation team", "translation@sampada.info"},
+	{N_("Georgian"),            "ka", N_("Ubuntu Georgian Translators"), "alexander.didebulidze@stusta.mhn.de"},
+	{N_("Kannada"),             "kn", N_("Kannada Translation team"), "translation@sampada.info"},
 	{N_("Korean"),              "ko", "Kyung-uk Son", "vvs740@chol.com"},
 	{N_("Kurdish"),             "ku", "Erdal Ronahi", "erdal.ronahi@gmail.com"},
 	{N_("Kurdish"),             "ku", "Amed Ç. Jiyan", "amedcj@hotmail.com"},
@@ -193,7 +193,7 @@
 	{N_("Tamil"),               "ta", "Viveka Nathan K", "vivekanathan@users.sourceforge.net"},
 	{N_("Telugu"),              "te", "Mr. Subbaramaih", "info.gist@cdac.in"},
 	{N_("Thai"),                "th", "Isriya Paireepairit", "markpeak@gmail.com"},
-	{N_("Turkish"),             "tr", "Ahmet Alp BALKAN", "prf_q@users.sf.net"},
+	{N_("Turkish"),             "tr", "Serdar Soytetir", "tulliana@gmail.com"},
 	{N_("Vietnamese"),          "vi", N_("T.M.Thanh and the Gnome-Vi Team"), "gnomevi-list@lists.sf.net"},
 	{N_("Simplified Chinese"),  "zh_CN", "Funda Wang", "fundawang@linux.net.cn"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Ambrose C. Li", "acli@ada.dhs.org"},
@@ -238,6 +238,7 @@
 	{N_("Slovak"),              "sk", "Richard Golier", "golierr@gmail.com"},
 	{N_("Slovenian"),           "sl", "Matjaz Horvat", NULL},
 	{N_("Swedish"),             "sv", "Christian Rose", NULL},
+	{N_("Turkish"),             "tr", "Ahmet Alp BALKAN", "prf_q@users.sf.net"},
 	{N_("Simplified Chinese"),  "zh_CN", "Hashao, Rocky S. Lee", NULL},
 	{N_("Traditional Chinese"), "zh_TW", "Hashao, Rocky S. Lee", NULL},
 	{NULL, NULL, NULL, NULL}
@@ -377,13 +378,8 @@
 
 	g_string_append(str, "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\""
 					PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</A><BR/><BR/>");
-#ifdef _WIN32
-	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
-						   "#pidgin-win32 on irc.freenode.net<BR><BR>"));
-#else
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
 						   "#pidgin on irc.freenode.net<BR><BR>"));
-#endif
 
 	/* Current Developers */
 	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkdnd-hints.c
--- a/pidgin/gtkdnd-hints.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkdnd-hints.c	Wed May 23 23:17:50 2007 +0000
@@ -91,8 +91,6 @@
 	if (w->parent && w->parent->window == w->window)
 	{
 		get_widget_coords(w->parent, &ox, &oy, NULL, NULL);
-		ox += w->allocation.x;
-		oy += w->allocation.y;
 		height = w->allocation.height;
 		width = w->allocation.width;
 	}
@@ -174,6 +172,8 @@
 	gint x = 0, y = 0;
 
 	get_widget_coords(widget, &x1, &y1, &x2, &y2);
+	x1 += widget->allocation.x;	x2 += widget->allocation.x;
+	y1 += widget->allocation.y;	y2 += widget->allocation.y;
 
 	switch (horiz)
 	{
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkidle.c
--- a/pidgin/gtkidle.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkidle.c	Wed May 23 23:17:50 2007 +0000
@@ -103,14 +103,21 @@
 
 	/* Query xscreensaver */
 	static XScreenSaverInfo *mit_info = NULL;
+	static int has_extension = -1;
 	int event_base, error_base;
-	if (XScreenSaverQueryExtension(GDK_DISPLAY(), &event_base, &error_base)) {
-		if (mit_info == NULL) {
+
+	if (has_extension == -1)
+		has_extension = XScreenSaverQueryExtension(GDK_DISPLAY(), &event_base, &error_base);
+
+	if (has_extension)
+	{
+		if (mit_info == NULL)
 			mit_info = XScreenSaverAllocInfo();
-		}
+
 		XScreenSaverQueryInfo(GDK_DISPLAY(), GDK_ROOT_WINDOW(), mit_info);
 		return (mit_info->idle) / 1000;
-	} else
+	}
+	else
 		return 0;
 #  endif /* !_WIN32 */
 # endif /* !HAVE_IOKIT */
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkimhtml.c	Wed May 23 23:17:50 2007 +0000
@@ -932,52 +932,41 @@
 static void copy_clipboard_cb(GtkIMHtml *imhtml, gpointer unused)
 {
 	GtkTextIter start, end;
-	GtkTextMark *sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
-	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
-
-	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel);
-	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &end, ins);
-
-	gtk_clipboard_set_with_owner(gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD),
-				     selection_targets, sizeof(selection_targets) / sizeof(GtkTargetEntry),
-				     (GtkClipboardGetFunc)gtk_imhtml_clipboard_get,
-				     (GtkClipboardClearFunc)NULL, G_OBJECT(imhtml));
-
-	if (imhtml->clipboard_html_string) {
+	if (gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
+		gtk_clipboard_set_with_owner(gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD),
+						 selection_targets, sizeof(selection_targets) / sizeof(GtkTargetEntry),
+						 (GtkClipboardGetFunc)gtk_imhtml_clipboard_get,
+						 (GtkClipboardClearFunc)NULL, G_OBJECT(imhtml));
+
 		g_free(imhtml->clipboard_html_string);
 		g_free(imhtml->clipboard_text_string);
+
+		imhtml->clipboard_html_string = gtk_imhtml_get_markup_range(imhtml, &start, &end);
+		imhtml->clipboard_text_string = gtk_imhtml_get_text(imhtml, &start, &end);
 	}
 
-	imhtml->clipboard_html_string = gtk_imhtml_get_markup_range(imhtml, &start, &end);
-	imhtml->clipboard_text_string = gtk_imhtml_get_text(imhtml, &start, &end);
-
 	g_signal_stop_emission_by_name(imhtml, "copy-clipboard");
 }
 
 static void cut_clipboard_cb(GtkIMHtml *imhtml, gpointer unused)
 {
 	GtkTextIter start, end;
-	GtkTextMark *sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
-	GtkTextMark *ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
-
-	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel);
-	gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &end, ins);
-
-	gtk_clipboard_set_with_owner(gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD),
-				     selection_targets, sizeof(selection_targets) / sizeof(GtkTargetEntry),
-				     (GtkClipboardGetFunc)gtk_imhtml_clipboard_get,
-				     (GtkClipboardClearFunc)NULL, G_OBJECT(imhtml));
-
-	if (imhtml->clipboard_html_string) {
+	if (gtk_text_buffer_get_selection_bounds(imhtml->text_buffer, &start, &end)) {
+		gtk_clipboard_set_with_owner(gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_CLIPBOARD),
+						 selection_targets, sizeof(selection_targets) / sizeof(GtkTargetEntry),
+						 (GtkClipboardGetFunc)gtk_imhtml_clipboard_get,
+						 (GtkClipboardClearFunc)NULL, G_OBJECT(imhtml));
+
 		g_free(imhtml->clipboard_html_string);
 		g_free(imhtml->clipboard_text_string);
+
+		imhtml->clipboard_html_string = gtk_imhtml_get_markup_range(imhtml, &start, &end);
+		imhtml->clipboard_text_string = gtk_imhtml_get_text(imhtml, &start, &end);
+
+		if (imhtml->editable)
+			gtk_text_buffer_delete_selection(imhtml->text_buffer, FALSE, FALSE);
 	}
 
-	imhtml->clipboard_html_string = gtk_imhtml_get_markup_range(imhtml, &start, &end);
-	imhtml->clipboard_text_string = gtk_imhtml_get_text(imhtml, &start, &end);
-
-	if (imhtml->editable)
-		gtk_text_buffer_delete_selection(imhtml->text_buffer, FALSE, FALSE);
 	g_signal_stop_emission_by_name(imhtml, "cut-clipboard");
 }
 
@@ -2761,7 +2750,8 @@
 						}
 						if (textdec && font->underline != 1
 							&& g_ascii_strcasecmp(textdec, "underline") == 0
-							&& (imhtml->format_functions & GTK_IMHTML_UNDERLINE))
+							&& (imhtml->format_functions & GTK_IMHTML_UNDERLINE)
+							&& !(options & GTK_IMHTML_NO_FORMATTING))
 						{
 						    gtk_imhtml_toggle_underline(imhtml);
 						    font->underline = 1;
@@ -2790,7 +2780,7 @@
 								else
 									font->bold = 0;
 							}
-							if ((font->bold && oldfont && !oldfont->bold) || (oldfont && oldfont->bold && !font->bold) || (font->bold && !oldfont))
+							if (((font->bold && oldfont && !oldfont->bold) || (oldfont && oldfont->bold && !font->bold) || (font->bold && !oldfont)) && !(options & GTK_IMHTML_NO_FORMATTING))
 							{
 								gtk_imhtml_toggle_bold(imhtml);
 							}
@@ -2816,33 +2806,36 @@
 
 						if (!oldfont) {
 							gtk_imhtml_font_set_size(imhtml, 3);
-							if (font->underline)
+							if (font->underline && !(options & GTK_IMHTML_NO_FORMATTING))
 							    gtk_imhtml_toggle_underline(imhtml);
-							if (font->bold)
+							if (font->bold && !(options & GTK_IMHTML_NO_FORMATTING))
 								gtk_imhtml_toggle_bold(imhtml);
-							gtk_imhtml_toggle_fontface(imhtml, NULL);
-							gtk_imhtml_toggle_forecolor(imhtml, NULL);
-							gtk_imhtml_toggle_backcolor(imhtml, NULL);
+							if (!(options & GTK_IMHTML_NO_FONTS))
+								gtk_imhtml_toggle_fontface(imhtml, NULL);
+							if (!(options & GTK_IMHTML_NO_COLOURS))
+								gtk_imhtml_toggle_forecolor(imhtml, NULL);
+							if (!(options & GTK_IMHTML_NO_COLOURS))
+								gtk_imhtml_toggle_backcolor(imhtml, NULL);
 						}
 						else
 						{
 
-						    if (font->size != oldfont->size)
+						    if ((font->size != oldfont->size) && !(options & GTK_IMHTML_NO_SIZES))
 							    gtk_imhtml_font_set_size(imhtml, oldfont->size);
 
-							if (font->underline != oldfont->underline)
+							if ((font->underline != oldfont->underline) && !(options & GTK_IMHTML_NO_FORMATTING))
 							    gtk_imhtml_toggle_underline(imhtml);
 
-							if ((font->bold && !oldfont->bold) || (oldfont->bold && !font->bold))
+							if (((font->bold && !oldfont->bold) || (oldfont->bold && !font->bold)) && !(options & GTK_IMHTML_NO_FORMATTING))
 								gtk_imhtml_toggle_bold(imhtml);
 
-							if (font->face && (!oldfont->face || strcmp(font->face, oldfont->face) != 0))
+							if (font->face && (!oldfont->face || strcmp(font->face, oldfont->face) != 0) && !(options & GTK_IMHTML_NO_FONTS))
 							    gtk_imhtml_toggle_fontface(imhtml, oldfont->face);
 
-							if (font->fore && (!oldfont->fore || strcmp(font->fore, oldfont->fore) != 0))
+							if (font->fore && (!oldfont->fore || strcmp(font->fore, oldfont->fore) != 0) && !(options & GTK_IMHTML_NO_COLOURS))
 							    gtk_imhtml_toggle_forecolor(imhtml, oldfont->fore);
 
-							if (font->back && (!oldfont->back || strcmp(font->back, oldfont->back) != 0))
+							if (font->back && (!oldfont->back || strcmp(font->back, oldfont->back) != 0) && !(options & GTK_IMHTML_NO_COLOURS))
 						      gtk_imhtml_toggle_backcolor(imhtml, oldfont->back);
 						}
 
@@ -3384,7 +3377,7 @@
 		return FALSE;
 
 	pix = gdk_pixbuf_animation_get_static_image(anim);
-	image = gtk_imhtml_image_new(pix, NULL, 0);
+	image = gtk_imhtml_image_new(pix, smiley->smile, 0);
 	ret = gtk_imhtml_image_clicked(w, event, (GtkIMHtmlImage*)image);
 	g_object_set_data_full(G_OBJECT(w), "image-data", image, (GDestroyNotify)gtk_imhtml_image_free);
 	g_object_unref(G_OBJECT(pix));
@@ -4437,7 +4430,7 @@
 		}
 	}
 
-	if (imhtml_smiley->flags & GTK_IMHTML_SMILEY_CUSTOM) {
+	if (imhtml_smiley && imhtml_smiley->flags & GTK_IMHTML_SMILEY_CUSTOM) {
 		ebox = gtk_event_box_new();
 		gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
 		gtk_widget_show(ebox);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkmain.c	Wed May 23 23:17:50 2007 +0000
@@ -473,9 +473,6 @@
 #else
 	debug_enabled = FALSE;
 #endif
-
-	/* This is the first Glib function call. Make sure to initialize GThread bfeore then */
-	g_thread_init(NULL);
 	
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkprefs.c	Wed May 23 23:17:50 2007 +0000
@@ -1472,7 +1472,7 @@
 	purple_prefs_set_path(pref, "");
 	g_free(pref);
 
-	gtk_entry_set_text(GTK_ENTRY(sound_entry), "(default)");
+	gtk_entry_set_text(GTK_ENTRY(sound_entry), _("(default)"));
 }
 
 static void
@@ -1561,7 +1561,7 @@
 	file = purple_prefs_get_path(pref);
 	g_free(pref);
 	if (sound_entry)
-		gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : "(default)");
+		gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : _("(default)"));
 	g_value_unset (&val);
 }
 
@@ -1754,7 +1754,7 @@
 			       pidgin_sound_get_event_option(0));
 	file = purple_prefs_get_path(pref);
 	g_free(pref);
-	gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : "(default)");
+	gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : _("(default)"));
 	gtk_editable_set_editable(GTK_EDITABLE(sound_entry), FALSE);
 	gtk_box_pack_start(GTK_BOX(hbox), sound_entry, FALSE, FALSE, PIDGIN_HIG_BOX_SPACE);
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Wed May 23 23:17:50 2007 +0000
@@ -2334,11 +2334,16 @@
 
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(status_box->imhtml));
 
+	height = 0;
 	wrapped_lines = 1;
 	gtk_text_buffer_get_start_iter(buffer, &iter);
-	gtk_text_view_get_iter_location(GTK_TEXT_VIEW(status_box->imhtml), &iter, &oneline);
-	while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(status_box->imhtml), &iter))
+	do {
+		gtk_text_view_get_iter_location(GTK_TEXT_VIEW(status_box->imhtml), &iter, &oneline);
+		height += oneline.height;
 		wrapped_lines++;
+		if (wrapped_lines > 4)
+			break;
+	} while (gtk_text_view_forward_display_line(GTK_TEXT_VIEW(status_box->imhtml), &iter));
 
 	lines = gtk_text_buffer_get_line_count(buffer);
 
@@ -2350,8 +2355,8 @@
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(status_box->imhtml));
 	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(status_box->imhtml));
 
-	height = (oneline.height + pad_top + pad_bottom) * lines;
-	height += (oneline.height + pad_inside) * (wrapped_lines - lines);
+	height += (pad_top + pad_bottom) * lines;
+	height += (pad_inside) * (wrapped_lines - lines);
 
 	gtk_widget_set_size_request(status_box->vbox, -1, height + PIDGIN_HIG_BOX_SPACE);
 }
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/gtkutils.c	Wed May 23 23:17:50 2007 +0000
@@ -510,6 +510,10 @@
 	const char *proto_name;
 	char buf[256];
 	int i, selected_index = -1;
+	const char *gtalk_name = NULL;
+
+	if (purple_find_prpl("prpl-jabber"))
+		gtalk_name = _("Google Talk");
 
 	optmenu = gtk_option_menu_new();
 	gtk_widget_show(optmenu);
@@ -528,6 +532,28 @@
 		plugin = (PurplePlugin *)p->data;
 		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 
+		if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0)
+		{
+			GtkWidget *gtalk_item;
+
+			filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+			                            "16", "google-talk.png", NULL);
+			pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+			g_free(filename);
+
+
+			if (pixbuf)
+				image = gtk_image_new_from_pixbuf(pixbuf);
+			else
+				image = gtk_image_new();
+
+			gtalk_item = pidgin_protocol_option_menu_item(menu, sg, image, gtalk_name, "prpl-fake");
+			g_object_set_data(G_OBJECT(gtalk_item), "real_protocol", "prpl-jabber");
+			i++;
+
+			gtalk_name = NULL;
+		}
+
 		/* Load the image. */
 		proto_name = prpl_info->list_icon(NULL, NULL);
 		g_snprintf(buf, sizeof(buf), "%s.png", proto_name);
@@ -555,26 +581,6 @@
 			g_object_set_data(G_OBJECT(optmenu), "last_protocol", plugin->info->id);
 		}
 
-		if (!strcmp(plugin->info->id, "prpl-jabber"))
-		{
-			GtkWidget *gtalk_item;
-
-			filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
-			                            "16", "google-talk.png", NULL);
-			pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-			g_free(filename);
-
-
-			if (pixbuf)
-				image = gtk_image_new_from_pixbuf(pixbuf);
-			else
-				image = gtk_image_new();
-
-			gtalk_item = pidgin_protocol_option_menu_item(menu, sg, image, _("Google Talk"), "prpl-fake");
-			g_object_set_data(G_OBJECT(gtalk_item), "real_protocol", plugin->info->id);
-			i++;
-		}
-
 		if (pixbuf)
 			g_object_unref(G_OBJECT(pixbuf));
 	}
@@ -3011,7 +3017,7 @@
 	PangoLogAttr *log_attrs;
 	gchar *word;
 
-	if (strcasecmp(key, "Global Thermonuclear War") == 0)
+	if (g_ascii_strcasecmp(key, "Global Thermonuclear War") == 0)
 	{
 		purple_notify_info(NULL, "WOPR",
 				"Wouldn't you prefer a nice game of chess?", NULL);
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/plugins/pidginrc.c
--- a/pidgin/plugins/pidginrc.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/plugins/pidginrc.c	Wed May 23 23:17:50 2007 +0000
@@ -45,15 +45,12 @@
 static GtkWidget *color_widgets[G_N_ELEMENTS(color_prefs)];
 
 static const char *widget_size_prefs[] = {
-	"/plugins/gtk/purplerc/size/GtkTreeView::expander_size",
 	"/plugins/gtk/purplerc/size/GtkTreeView::horizontal_separator"
 };
 static const char *widget_size_prefs_set[] = {
-	"/plugins/gtk/purplerc/set/size/GtkTreeView::expander_size",
 	"/plugins/gtk/purplerc/set/size/GtkTreeView::horizontal_separator"
 };
 static const char *widget_size_names[] = {
-	N_("GtkTreeView Expander Size"),
 	N_("GtkTreeView Horizontal Separation")
 };
 static GtkWidget *widget_size_widgets[G_N_ELEMENTS(widget_size_prefs)];
@@ -61,16 +58,16 @@
 static const char *font_prefs[] = {
 	"/plugins/gtk/purplerc/font/*pidgin_conv_entry",
 	"/plugins/gtk/purplerc/font/*pidgin_conv_imhtml",
-	"/plugins/gtk/purplerc/font/*pidginlog_imhtml",
-	"/plugins/gtk/purplerc/font/*pidginrequest_imhtml",
-	"/plugins/gtk/purplerc/font/*pidginnotify_imhtml",
+	"/plugins/gtk/purplerc/font/*pidgin_log_imhtml",
+	"/plugins/gtk/purplerc/font/*pidgin_request_imhtml",
+	"/plugins/gtk/purplerc/font/*pidgin_notify_imhtml",
 };
 static const char *font_prefs_set[] = {
 	"/plugins/gtk/purplerc/set/font/*pidgin_conv_entry",
 	"/plugins/gtk/purplerc/set/font/*pidgin_conv_imhtml",
-	"/plugins/gtk/purplerc/set/font/*pidginlog_imhtml",
-	"/plugins/gtk/purplerc/set/font/*pidginrequest_imhtml",
-	"/plugins/gtk/purplerc/set/font/*pidginnotify_imhtml",
+	"/plugins/gtk/purplerc/set/font/*pidgin_log_imhtml",
+	"/plugins/gtk/purplerc/set/font/*pidgin_request_imhtml",
+	"/plugins/gtk/purplerc/set/font/*pidgin_notify_imhtml",
 };
 static const char *font_names[] = {
 	N_("Conversation Entry"),
@@ -81,16 +78,15 @@
 };
 static GtkWidget *font_widgets[G_N_ELEMENTS(font_prefs)];
 
+/*
 static const char *widget_bool_prefs[] = {
-	"/plugins/gtk/purplerc/bool/GtkTreeView::indent_expanders",
 };
 static const char *widget_bool_prefs_set[] = {
-	"/plugins/gtk/purplerc/set/bool/GtkTreeView::indent_expanders",
 };
 static const char *widget_bool_names[] = {
-	N_("GtkTreeView Indent Expanders"),
 };
 static GtkWidget *widget_bool_widgets[G_N_ELEMENTS(widget_bool_prefs)];
+*/
 
 static void
 purplerc_make_changes()
@@ -143,6 +139,7 @@
 		}
 	}
 
+	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		if (purple_prefs_get_bool(widget_bool_prefs_set[i])) {
 			prefbase = g_path_get_basename(widget_bool_prefs[i]);
@@ -152,6 +149,7 @@
 			g_free(prefbase);
 		}
 	}
+	*/
 
 	g_string_append(style_string, "}");
 	g_string_append(style_string, "widget_class \"*\" style \"purplerc_style\"\n");
@@ -167,7 +165,7 @@
 				g_string_append_printf(style_string,
 				                       "style \"%s_style\"\n"
 				                       "{font_name = \"%s\"}\n"
-				                       "widget \"%s\""
+				                       "widget \"%s\" "
 				                       "style \"%s_style\"\n",
 				                       prefbase, pref,
 				                       prefbase, prefbase);
@@ -236,6 +234,7 @@
 		}
 	}
 
+	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		if (purple_prefs_get_bool(widget_bool_prefs_set[i])) {
 			prefbase = g_path_get_basename(widget_bool_prefs[i]);
@@ -245,6 +244,7 @@
 			g_free(prefbase);
 		}
 	}
+	*/
 
 	g_string_append(style_string, "}");
 	g_string_append(style_string, "widget_class \"*\" style \"purplerc_style\"\n");
@@ -260,7 +260,7 @@
 				g_string_append_printf(style_string,
 				                       "style \"%s_style\"\n"
 				                       "{font_name = \"%s\"}\n"
-				                       "widget \"%s\""
+				                       "widget \"%s\" "
 				                       "style \"%s_style\"\n",
 				                       prefbase, pref,
 				                       prefbase, prefbase);
@@ -486,6 +486,7 @@
 	g_signal_connect(G_OBJECT(check), "toggled",
 	                 G_CALLBACK(pidgin_toggle_sensitive), widget);
 
+	/*
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
@@ -495,15 +496,16 @@
 		gtk_size_group_add_widget(labelsg, check);
 
 		widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-		/*
+		*
 		gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-		*/
+		*
 		gtk_widget_set_sensitive(widget_bool_widgets[i],
 		                         purple_prefs_get_bool(widget_bool_prefs_set[i]));
 		g_signal_connect(G_OBJECT(check), "toggled",
 		                 G_CALLBACK(pidgin_toggle_sensitive),
 		                 widget_bool_widgets[i]);
 	}
+	*/
 
 	frame = pidgin_make_frame(ret, _("Interface colors"));
 	/* imhtml stuff */
@@ -677,12 +679,14 @@
 		purple_prefs_add_bool(font_prefs_set[i], FALSE);
 	}
 
+	/*
 	purple_prefs_add_none("/plugins/gtk/purplerc/bool");
 	purple_prefs_add_none("/plugins/gtk/purplerc/set/bool");
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		purple_prefs_add_bool(widget_bool_prefs[i], TRUE);
 		purple_prefs_add_bool(widget_bool_prefs_set[i], FALSE);
 	}
+	*/
 }
 
 PURPLE_INIT_PLUGIN(purplerc, purplerc_init, purplerc_info)
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/win32/gtkwin32dep.c	Wed May 23 23:17:50 2007 +0000
@@ -251,7 +251,13 @@
 
 static gboolean stop_flashing(GtkWidget *widget, GdkEventFocus *event, gpointer data) {
 	GtkWindow *window = data;
+	gpointer handler_id;
+
 	winpidgin_window_flash(window, FALSE);
+
+	if ((handler_id = g_object_get_data(G_OBJECT(window), "flash_stop_handler_id")))
+		g_signal_handler_disconnect(G_OBJECT(window), (gulong) GPOINTER_TO_UINT(handler_id));
+
 	return FALSE;
 }
 
@@ -275,12 +281,12 @@
 		memset(&info, 0, sizeof(FLASHWINFO));
 		info.cbSize = sizeof(FLASHWINFO);
 		info.hwnd = GDK_WINDOW_HWND(gdkwin);
-		if (flash)
-			info.dwFlags = FLASHW_ALL | FLASHW_TIMERNOFG;
-		else
+		if (flash) {
+			info.uCount = 3;
+			info.dwFlags = FLASHW_ALL | FLASHW_TIMER;
+		} else
 			info.dwFlags = FLASHW_STOP;
 		info.dwTimeout = 0;
-		info.dwTimeout = 0;
 
 		MyFlashWindowEx(&info);
 	} else
@@ -314,8 +320,11 @@
 
 	winpidgin_window_flash(window, TRUE);
 	/* Stop flashing when window receives focus */
-	g_signal_connect(G_OBJECT(window), "focus-in-event",
-					 G_CALLBACK(stop_flashing), window);
+	if (g_object_get_data(G_OBJECT(window), "flash_stop_handler_id") == NULL) {
+		gulong handler_id = g_signal_connect(G_OBJECT(window), "focus-in-event",
+						     G_CALLBACK(stop_flashing), window);
+		g_object_set_data(G_OBJECT(window), "flash_stop_handler_id", GUINT_TO_POINTER(handler_id));
+	}
 }
 
 static gboolean
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Wed May 23 23:17:50 2007 +0000
@@ -519,8 +519,7 @@
   SectionEnd
   Section $(PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE) SecStartMenuShortcut
     SetOverwrite on
-    CreateDirectory "$SMPROGRAMS\Pidgin"
-    CreateShortCut "$SMPROGRAMS\Pidgin\Pidgin.lnk" "$INSTDIR\pidgin.exe"
+    CreateShortCut "$SMPROGRAMS\Pidgin.lnk" "$INSTDIR\pidgin.exe"
     SetOverwrite off
   SectionEnd
 SectionGroupEnd
@@ -750,7 +749,6 @@
     RMDir "$INSTDIR"
 
     ; Shortcuts..
-    RMDir /r "$SMPROGRAMS\Pidgin"
     Delete "$DESKTOP\Pidgin.lnk"
 
     Goto done
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/win32/nsis/translations/hebrew.nsh
--- a/pidgin/win32/nsis/translations/hebrew.nsh	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/win32/nsis/translations/hebrew.nsh	Wed May 23 23:17:50 2007 +0000
@@ -1,39 +1,84 @@
-;;
-;;  hebrew.nsh
-;;
-;;  Hebrew language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1255
-;;
-;;  Author: Eugene Shcherbina <eugene@websterworlds.com>
-;;  Version 2
-;;
-
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			".�� ����� �� ����� ������ GTK+ �����$\r����� ���� v${GTK_MIN_VERSION} .GTK+ �� ����� ���� �� �����"
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"��� >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) .������� ���� ��� ����� ���� ���� .GPL ������ ��� ������ $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"(����) .Pidgin �����"
-!define GTK_SECTION_TITLE			"(����) .GTK+ �����"
-!define PIDGIN_SECTION_DESCRIPTION		".������� DLL-� Pidgin ����"
-!define GTK_SECTION_DESCRIPTION		".�����-���������� GUI ���"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"A?�����. ����� GTK+ ����� ���� ��$\rNote: .���� �� ����� �� �� $(^Name)"
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin���� ���� ��"
-
-; Pidgin Section Prompts and Texts
-!define PIDGIN_UNINSTALL_DESC			"$(^Name) (����� ����)"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			".GTK+ ����� ������ �����"
-!define GTK_BAD_INSTALL_PATH			".������ ������ �� ���� �������"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		".GTK+ ������ �� ���� �� �������� ��$\r.���� ����� ������� ��� ����� �� ������ ����"
-!define un.PIDGIN_UNINSTALL_ERROR_2		".��� �� ���� ����� ����� ���"
+;;
+;;  hebrew.nsh
+;;
+;;  Hebrew language strings for the Windows Pidgin NSIS installer.
+;;  Windows Code page: 1255
+;;
+;;  Updated: Shalom Craimer <scraimer@gmail.com>
+;;  Origional Author: Eugene Shcherbina <eugene@websterworlds.com>
+;;  Version 3
+;;
+
+; Startup checks
+!define INSTALLER_IS_RUNNING			"����� ������ ��� ���."
+!define PIDGIN_IS_RUNNING			"���� �� ����'�� ��� ��. �� ����� �� ����'�� ������ ����."
+!define GTK_INSTALLER_NEEDED			".�� ����� �� ����� ������ GTK+ �����$\r����� ���� v${GTK_MIN_VERSION} .GTK+ �� ����� ���� �� �����"
+
+; License Page
+!define PIDGIN_LICENSE_BUTTON			"��� >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) .������� ���� ��� ����� ���� ���� .GPL ������ ��� ������ $_CLICK"
+
+; Components Page
+!define PIDGIN_SECTION_TITLE			"(����) .Pidgin �����"
+!define GTK_SECTION_TITLE			"(����) .GTK+ �����"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"������ ���"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"����� ������"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"����� �����"
+!define PIDGIN_SECTION_DESCRIPTION		".������� DLL-� Pidgin ����"
+!define GTK_SECTION_DESCRIPTION		"�����-��������, �� ���� ����'�� GUI ���"
+
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"������-��� ������ ����'��"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"��� �����-��� ���� ����'�� �� ����� ������"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"��� �����-��� ���� ����'�� ������ �����"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"A?�����. ����� GTK+ ����� ���� ��$\rNote: .���� �� ����� �� �� $(^Name)"
+!define GTK_WINDOWS_INCOMPATIBLE		"������ 95/98/������� ���� ������ �-GTK+ 2.8.0 �����. GTK+ ${GTK_INSTALL_VERSION} �� �����.$\r�� ��� �� GTK+ ${GTK_MIN_VERSION} ����� �����, ������ ��� �����."
+
+; Installer Finish Page
+!define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin���� ���� �� "
+
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (����� ����)"
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"�� ����� ����� �� ������ ������� �� ����'��. ������ ����� ����� ��� ���� ����� �������."
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			".GTK+ ����� ������ �����"
+!define GTK_BAD_INSTALL_PATH			".������ ������ �� ���� �������"
+
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"����� URI"
+
+; Uninstall Section Prompts
+!define un.PIDGIN_UNINSTALL_ERROR_1		".GTK+ ������ �� ���� �� �������� ��$\r.���� ����� ������� ��� ����� �� ������ ����"
+!define un.PIDGIN_UNINSTALL_ERROR_2		".��� �� ���� ����� ����� ���"
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE	"����� ������� ����"
+!define PIDGIN_SPELLCHECK_ERROR		"����� ������ ������ ����"
+!define PIDGIN_SPELLCHECK_DICT_ERROR	"����� ������ ����� ������� ����"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"����� ���� ������ ���� (���� ����� ������� ������)"
+!define ASPELL_INSTALL_FAILED			"������ �����"
+!define PIDGIN_SPELLCHECK_BRETON		"�����"
+!define PIDGIN_SPELLCHECK_CATALAN		"�������"
+!define PIDGIN_SPELLCHECK_CZECH		"�'���"
+!define PIDGIN_SPELLCHECK_WELSH		"������"
+!define PIDGIN_SPELLCHECK_DANISH		"����"
+!define PIDGIN_SPELLCHECK_GERMAN		"������"
+!define PIDGIN_SPELLCHECK_GREEK		"������"
+!define PIDGIN_SPELLCHECK_ENGLISH		"������"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"�������"
+!define PIDGIN_SPELLCHECK_SPANISH		"������"
+!define PIDGIN_SPELLCHECK_FAROESE		"�����"
+!define PIDGIN_SPELLCHECK_FRENCH		"������"
+!define PIDGIN_SPELLCHECK_ITALIAN		"�������"
+!define PIDGIN_SPELLCHECK_DUTCH		"�������"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"��������"
+!define PIDGIN_SPELLCHECK_POLISH		"������"
+!define PIDGIN_SPELLCHECK_PORTUGUESE	"���������"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"������"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"�����"
+!define PIDGIN_SPELLCHECK_SLOVAK		"�������"
+!define PIDGIN_SPELLCHECK_SWEDISH		"������"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"���������"
+
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/win32/nsis/translations/hungarian.nsh
--- a/pidgin/win32/nsis/translations/hungarian.nsh	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/win32/nsis/translations/hungarian.nsh	Wed May 23 23:17:50 2007 +0000
@@ -27,8 +27,8 @@
 !define GTK_SECTION_DESCRIPTION			"A Pidgin �ltal haszn�lt t�bbplatformos grafikus eszk�zk�szlet"
 
 !define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Parancsikonok a Pidgin ind�t�s�hoz"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Parancsikon l�trehoz�sa a Pidginhoz az asztalon"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Start Men� bejegyz�s l�trehoz�sa a Pidginhoz"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Parancsikon l�trehoz�sa a Pidginhez az asztalon"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Start Men� bejegyz�s l�trehoz�sa a Pidginhez"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"Egy r�gi verzi�j� GTK+ futtat�k�rnyezet van telep�tve. K�v�nja friss�teni?$\rMegjegyz�s: a Pidgin nem fog m�k�dni, ha nem friss�ti."
@@ -46,6 +46,8 @@
 !define GTK_INSTALL_ERROR			"Hiba a GTK+ futtat�k�rnyezet telep�t�se k�zben."
 !define GTK_BAD_INSTALL_PATH			"A megadott el�r�si �t nem �rhet� el, vagy nem hozhat� l�tre."
 
+!define URI_HANDLERS_SECTION_TITLE		"URI kezel�k"
+
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"Az elt�vol�t� nem tal�lta a Pidgin registry bejegyz�seket.$\rVal�sz�n�leg egy m�sik felhaszn�l� telep�tette az alkalmaz�st."
 !define un.PIDGIN_UNINSTALL_ERROR_2		"Nincs jogosults�ga az alkalmaz�s elt�vol�t�s�hoz."
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/win32/nsis/translations/trad-chinese.nsh
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh	Wed May 23 23:17:50 2007 +0000
@@ -7,13 +7,13 @@
 ;;  Author: Paladin R. Liu <paladin@ms1.hinet.net>
 ;;  Minor updates: Ambrose C. Li <acli@ada.dhs.org>
 ;;
-;;  Last Updated: July 5, 2005
+;;  Last Updated: May 21, 2007
 ;;
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"�w�˵{�����b���椤�C"
 !define PIDGIN_IS_RUNNING				"Pidgin ���b���椤�A�Х������o�ӵ{����A��w�ˡC"
-!define GTK_INSTALLER_NEEDED			"�䤣��ŦX�� GTK+ �������ҩάO�ݭn�Q��s�C$\r�Цw�� v${GTK_MIN_VERSION} �H�W������ GTK+ �������ҡC"
+!define GTK_INSTALLER_NEEDED			"�䤣��ŦX�� GTK+ �������ҩάO�ݭn�Q��s�C$\r�Цw�� v${GTK_MIN_VERSION} �ΥH�W������ GTK+ �������ҡC"
 
 ; License Page
 !define PIDGIN_LICENSE_BUTTON			"�U�@�B >"
@@ -34,17 +34,52 @@
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"�o�{�@���ª��� GTK+ �������ҡC�z�n�N���ɯŶܡH$\r�Ъ`�N�G�p�G�z���ɯšA $(^Name) �i��L�k���T���Q����C"
+!define GTK_WINDOWS_INCOMPATIBLE		"�۪��� 2.8.0 �}�l�AGTK�� �P Windows 95/98/Me �w���A�ۮe�AGTK+ ${GTK_INSTALL_VERSION} �]���N���|�Q�w�ˡC$\r�p�G�t�Τ������w�g�w�˪� GTK+ ${GTK_MIN_VERSION} �Χ�s�������A�w�˵{���N�H�Y�����C"
 
 ; Installer Finish Page
 !define PIDGIN_FINISH_VISIT_WEB_SITE		"���X Windows Pidgin ����"
 
 ; Pidgin Section Prompts and Texts
 !define PIDGIN_UNINSTALL_DESC			"$(^Name) (�u�Ѳ���)"
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"�L�k�����ثe�w�w�˪� Pidgin�A�s�����N�b���g�����ª��������p�U�i��w�ˡC"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"�w�� GTK+ �������Үɵo�Ϳ��~�C"
 !define GTK_BAD_INSTALL_PATH			"�z�ҿ�J���w�˥ؿ��L�k�s���ΫإߡC"
 
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"URI �B�z�{��"
+
 ; Uninstall Section Prompts
 !define un.PIDGIN_UNINSTALL_ERROR_1		"�����{���L�k��� Pidgin ���w�˸�T�C$\r�o���ӬO����L���ϥΪ̭��s�w�ˤF�o�ӵ{���C"
-!define un.PIDGIN_UNINSTALL_ERROR_2		"�z�ثe���v���L�k���� Pidgin �C"
+!define un.PIDGIN_UNINSTALL_ERROR_2		"�z�ثe���v���L�k���� Pidgin�C"
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"���r�ˬd�\��"
+!define PIDGIN_SPELLCHECK_ERROR			"�w�˫��r�ˬd�~���o�Ϳ��~"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"�w�˫��r�ˬd�Ϊ�����~���o�Ϳ��~"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"���r�ˬd�䴩�]�w�˶������ں����s�u�^�C"
+!define ASPELL_INSTALL_FAILED			"�w�˥���"
+!define PIDGIN_SPELLCHECK_BRETON		"�����h����"
+!define PIDGIN_SPELLCHECK_CATALAN		"�[������"
+!define PIDGIN_SPELLCHECK_CZECH			"���J��"
+!define PIDGIN_SPELLCHECK_WELSH			"�º�����"
+!define PIDGIN_SPELLCHECK_DANISH		"������"
+!define PIDGIN_SPELLCHECK_GERMAN		"�w��"
+!define PIDGIN_SPELLCHECK_GREEK			"��þ��"
+!define PIDGIN_SPELLCHECK_ENGLISH		"�^��"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"�@�ɻy"
+!define PIDGIN_SPELLCHECK_SPANISH		"��Z����"
+!define PIDGIN_SPELLCHECK_FAROESE		"�kù�s�q��"
+!define PIDGIN_SPELLCHECK_FRENCH		"�k��"
+!define PIDGIN_SPELLCHECK_ITALIAN		"�N�j�Q��"
+!define PIDGIN_SPELLCHECK_DUTCH			"������"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"���¤�"
+!define PIDGIN_SPELLCHECK_POLISH		"�i����"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"���"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"ù�����Ȥ�"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"�X��"
+!define PIDGIN_SPELLCHECK_SLOVAK		"������J��"
+!define PIDGIN_SPELLCHECK_SWEDISH		"����"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"�Q�J����"
+
diff -r 6ec8bae7d98a -r cb5bd3c045a9 pidgin/win32/winpidgin.c
--- a/pidgin/win32/winpidgin.c	Wed May 23 23:13:11 2007 +0000
+++ b/pidgin/win32/winpidgin.c	Wed May 23 23:17:50 2007 +0000
@@ -145,7 +145,7 @@
 		putenv(settingsdir);
 
 		snprintf(aspelldir, sizeof(aspelldir), "PIDGIN_ASPELL_DIR=%s\\Aspell\\bin", path);
-		printf("%s", aspelldir);
+		printf("%s\n", aspelldir);
 		putenv(aspelldir);
 
 		/* set the GTK+ path to be \\path\to\GTK\bin */
diff -r 6ec8bae7d98a -r cb5bd3c045a9 po/ChangeLog
--- a/po/ChangeLog	Wed May 23 23:13:11 2007 +0000
+++ b/po/ChangeLog	Wed May 23 23:17:50 2007 +0000
@@ -1,5 +1,18 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.0.1
+	* Chinese (Hong Kong) translation added (Ambrose C. Li)
+	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Chinese (Traditional) win32 translation updated (Ambrose C. Li)
+	* Finnish translation updated (Timo Jyrinki)
+	* Hebrew translation updated (Shalom Craimer)
+	* Hebrew win32 translation updated (Shalom Craimer)
+	* Hungarian translation updated (Gabor Kelemen)
+	* Hungarian win32 installer updated (Gabor Kelemen)
+	* Russian translation updated (Dmitry Beloglazov)
+	* Turkish Translation updated (Serdar Soytetir)
+
 version 2.0.0 (5/3/2007):
 	* Afrikaans translation added (Friedel Wolff)
 	* Afrikaans win32 translation added (Friedel Wolff)
diff -r 6ec8bae7d98a -r cb5bd3c045a9 po/fi.po
--- a/po/fi.po	Wed May 23 23:13:11 2007 +0000
+++ b/po/fi.po	Wed May 23 23:17:50 2007 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-09 21:58+0300\n"
-"PO-Revision-Date: 2007-04-09 21:58+0300\n"
+"POT-Creation-Date: 2007-05-21 18:54+0300\n"
+"PO-Revision-Date: 2007-05-21 18:54+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -45,14 +45,31 @@
 "  -n, --nologin       älä kirjaudu automaattisesti\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../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
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s havaitsi ongelmia siirrettäessä asetuksia ohjelmasta %s ohjelmaan %s. "
+"Tutki asiaa ja suorita asetusten siirto käsin. Ilmoita tästä ongelmasta "
+"osoitteessa http://developer.pidgin.im/"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "Virhe"
@@ -65,16 +82,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Käyttäjätilin näyttönimi ei voi olla tyhjä."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "Muista salasana"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
@@ -82,103 +99,103 @@
 msgid "New Account"
 msgstr "Uusi tili"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Yhteyskäytäntö:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Näyttönimi:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "Alias:"
 
 #. 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
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "Peru"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -189,298 +206,319 @@
 msgstr "Poista tili"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Poista"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr ""
 "Voit ottaa käyttöön/pois käytöstä käyttäjätilejä seuraavasta luettelosta."
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Lisää"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavalistalleen%s%s"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "Valtuuta tuttava?"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "Kiellä"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "Tuttavan näyttönimi on annettava."
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "Ryhmä on määritettävä."
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "Käyttäjätili täytyy valita."
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "Valittu käyttäjätili ei ole linjoilla."
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "Virhe lisättäessä tuttavaa"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "Tili"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "Syötä tuttavan tiedot."
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Ryhmäkeskustelut"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nimi"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "Voit muokata lisää tietoja myöhemmin pikavalikosta."
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "Virhe lisättäessä ryhmää"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "Lisättävän ryhmän nimi on annettava."
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "Valitun niminen ryhmä on jo olemassa"
 
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "Anna ryhmän nimi"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "Muokkaa ryhmäkeskustelua"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "Päivitä vaaditut kentät."
 
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: ../finch/gntblist.c:754
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "Liity automaattisesti"
 
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "Muokkaa asetuksia"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "Tiedot"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "Haetaan..."
+
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "Lisää tuttavailmoitin"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
 #: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "Näytä loki"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Anna uusi nimi kohteelle %s"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "Aseta lempinimi"
+
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "Syötä tyhjä merkkijono palauttaaksesi oletusnimen."
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Kontaktin poistaminen poistaa myös kaikki kontaktissa olevat tuttavat"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Ryhmän poistaminen poistaa myös kaikki ryhmässä olevat tuttavat"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "Vahvista poistaminen"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Poista"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "Paikka merkitty"
 
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "Merkitse/poista merkintä"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "Jouten"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -489,12 +527,12 @@
 "Kirjautuneena: %d\n"
 "Yhteensä: %d"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Tili: %s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -503,89 +541,89 @@
 "\n"
 "Viimeksi nähty: %s sitten"
 
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Uusi..."
 
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Tallennettu..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
 "pikaviestin."
 
-#: ../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
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "Lähetä pikaviesti..."
 
-#: ../finch/gntblist.c:2077
-msgid "Toggle offline buddies"
-msgstr "Näytä/piilota poissaolevat tuttavat"
-
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "Näytä poissa linjoilta olevat tuttavat"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "Lajittele tilan mukaan"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "Lajittele aakkosittain"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "Lajittele lokin koon mukaan"
 
@@ -608,56 +646,56 @@
 "Yhteys katkesi kohteeseen %s seuraavasta syystä:\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
 
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "Komentoja ei tueta vielä. Viestiä EI lähetetty."
 
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -666,24 +704,48 @@
 "\n"
 "%s kirjoittaa..."
 
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "Olet poistunut tästä keskustelusta."
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "Lähetä käyttäjälle"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "Keskustelu"
+
 #: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "Tyhjennä takaisinvieritys"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "Näytä aikaleimat"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "Lisää tuttavailmoitin..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATTIVASTAUS> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "Luettelo käyttäjistä:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -691,7 +753,7 @@
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -699,52 +761,56 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
 "keskusteluun."
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users:  Näytä luettelo keskustelussa olevista käyttäjistä"
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Näytä liitännäiset-ikkuna."
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Näytä tuttavaluettelo."
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Näytä käyttäjätilit-ikkuna."
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Näytä virheenjäljitysikkuna."
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs: Näytä asetukset-ikkuna."
 
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Näytä tallennetut tilat -ikkuna"
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "Virheenjäljitysikkuna"
 
@@ -752,18 +818,18 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "Suodatin: "
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "Tauko"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "Aikaleimat"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -795,26 +861,26 @@
 msgstr "Jäljellä"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/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
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Tila"
 
@@ -831,10 +897,10 @@
 msgstr "Pysäytä"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Sulje"
 
@@ -864,68 +930,80 @@
 msgid "Transferring"
 msgstr "Siirtää"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "Sähköpostit"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "Sinulle on postia."
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s): %d uusi viesti."
 msgstr[1] "%s (%s): %d uutta viestiä."
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Uusi sähköposti"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "Tiedot"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "Liity"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "VIRHE"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "liitännäisen lataus epäonnistui"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "liitännäisen poistaminen käytöstä epäonnistui"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -942,41 +1020,38 @@
 "Sivusto: %s\n"
 "Tiedostonimi: %s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr ""
 "Liitännäinen tulee olla käytössä ennen kuin sen asetuksia voidaan muuttaa."
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "Tälle täytyy edelleen tehdä jotain."
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "Tälle liitännäiselle ei ole asetuksia."
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr ""
 "Voit ottaa käyttöön/pois käytöstä liitännäisiä seuraavasta luettelosta."
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "Liitännäisen asetukset"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
@@ -986,8 +1061,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
@@ -996,52 +1071,52 @@
 msgstr "Tuttavan nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "Ilmoita kun tuttava..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "kirjautuu sisään"
-
 #: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "kirjautuu ulos"
+msgid "Signs on"
+msgstr "kirjautuu sisään"
 
 #: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "kirjautuu ulos"
+
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "poistuu"
 
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "palaa"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "on jouten"
+msgid "Returns from away"
+msgstr "palaa"
 
 #: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "on jouten"
+
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "ei enää ole jouten"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "alkaa kirjoittaa"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "keskeyttää kirjoittamisen"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "lopettaa kirjoittamisen"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "lähettää viestin"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "Toiminto"
 
@@ -1069,141 +1144,136 @@
 msgid "Pounce only when my status is not available"
 msgstr "Ilmoita vain kun tilani on \"ei tavoitettavissa\""
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Haluatko varmasti poistaa ilmoituksen %s käyttäjältä %s?"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "Tuttavailmoittimet"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s keskeytti kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "Perustuen näppäimistön käyttöön"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "Viimeisestä lähetetystä viestistä"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "Näytä joutenoloaika"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "Näytä poissaolevat tuttavat"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "Näytä aikaleimat"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "Ilmoita tuttaville kun kirjoitat heille"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "Lokin muoto"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "Kirjaa pikaviestit"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "Kirjaa ryhmäkeskustelut"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "Kirjaa tilamuutokset"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Asetukset"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "Ominaisuutta ei ole vielä toteutettu."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
@@ -1216,102 +1286,102 @@
 msgid "Delete Status"
 msgstr "Poista tila"
 
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "Tallennetut tilat"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "Otsikko"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/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/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Viesti"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "Käytä"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "Epäkelpo otsikko"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "Tilan otsikko ei voi olla tyhjä."
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "Otsikon toisinto"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "Anna toinen otsikko tilalle."
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "Alatila"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Tila:"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "Viesti:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "Muokkaa tilaa"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "Käytä eri tilaa seuraaville käyttäjätileille"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "Tallenna ja käytä"
 
@@ -1335,64 +1405,64 @@
 "Kun gnt:n leikepöydän sisältö muuttuu, sisältö annetaan X:lle jos "
 "mahdollista."
 
-#: ../finch/plugins/gntgf.c:209
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s kirjautui sisään"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s kirjautui ulos"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s lähetti sinulle viestin"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s mainitsi kutsumanimesi keskustelussa %s"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s lähetti viestin keskustelussa %s"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Tuttava kirjautuu sisään/ulos"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Saat pikaviestin"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Joku sanoo jotain ryhmäkeskustelussa"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Joku sanoo nimesi ryhmäkeskustelussa"
 
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Huomauta leivänpaahtimella kun"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Anna myös äänimerkki."
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Aseta pääteikkuna tilaan \"kiireellinen\"."
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Leivänpaahdin-liitännäinen"
 
@@ -1450,83 +1520,84 @@
 msgid "Lastlog plugin."
 msgstr "Lastlog-liitännäinen."
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "käyttäjätilit"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "Salasana tarvitaan kirjautumiseen."
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Anna salasana käyttäjätilille %s (%s)"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Tallenna salasana"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Tuttavat"
@@ -1550,7 +1621,7 @@
 msgstr "+++ %s kirjautui ulos"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1573,40 +1644,40 @@
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "_Lähetä viesti"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
@@ -1627,6 +1698,10 @@
 msgid "Failed to get serv name: %s"
 msgstr "Palvelinnimen saaminen epäonnistui: %s"
 
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "Purplen D-BUS-palvelin ei ole käynnissä alla mainitusta syystä"
+
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "Ei nimeä"
@@ -1676,7 +1751,7 @@
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1720,22 +1795,22 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ei ole tavallinen tiedosto. Ei suostuta ylikirjoittamaan sitä.\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s on lähettämässä sinulle %s (%s)"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "Käyttäjä %s tahtoo lähettää sinulle tiedoston"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Hyväksytäänkö tiedostonsiirtopyyntö käyttäjältä %s?"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1746,60 +1821,60 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s tarjoaa tiedostoa %s"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole kelvollinen tiedostonimi.\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Tarjotaan tiedostoa %s lähetettäväksi käyttäjälle %s."
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Tiedoston %s siirto valmis"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "Tiedostonsiirto valmis"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Peruutit tiedoston %s siirron"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "Tiedostonsiirto peruutettu"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s peruutti tiedoston %s siirron"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "Käyttäjä %s peruutti tiedostonsiirron"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tiedostonsiirto käyttäjälle %s epäonnistui."
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tiedostonsiirto käyttäjältä %s epäonnistui."
@@ -2113,41 +2188,41 @@
 msgid "Set Autoaccept Setting"
 msgstr "Aseta automaattihyväksynnän asetus"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Kysy"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Hyväksy automaattisesti"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Hylkää automaattisesti"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "Tiedostonsiirtojen automaattihyväksyminen..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2155,11 +2230,11 @@
 "Polku johon tiedostot tallennetaan\n"
 "(Anna koko polku)"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "Hylkää automaattisesti käyttäjiltä jotka eivät ole tuttavalistassa"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2168,113 +2243,8 @@
 "valmis\n"
 "(vain kun keskustelua lähettäjän kanssa ei avoinna)"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "Automaattivastaus"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "Automaattivastaus kaikille yhteyskäytännöille"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"Tämä liitännäinen mahdollistaa automaattiset vastaukset jokaisella "
-"yhteyskäytännöllä. Voit asettaa yleisen automaattivastauksen liitännäisen "
-"asetuksista. Asettaaksesi tietyn vastauksen jollekin tuttavalle, napsauta "
-"tuttavan kohdalla oikeata hiiren painiketta tuttavalistaikkunassa. "
-"Asettaaksesi automaattivastauksen jollekin käyttäjätilille, mene "
-"\"Lisäasetukset\"-käyttäjälehdelle Muokkaa tiliä -valintaikkunassa."
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "Aseta automaattivastauksen viesti: %s"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "Aseta automaattivastauksen viesti"
-
-#: ../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 ""
-"Seuraava viesti lähetetään tuttavalle kun tuttava lähettää sinulle viestin "
-"ja automaattivastaus on otettu käyttöön."
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "Aseta _automaattivastauksen viesti"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "Automaattivastauksen viesti"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "Lähetä automaattivastaus kun"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "Kun käyttäjätilini on asetettu _poissa-tilaan"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "Kun käyttäjätilini on _jouten"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "_Oletusvastaus"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "Tilaviesti"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "Automaattivastaus tilaviestillä"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "Aina kun on olemassa tilaviesti"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "Vain kun ei ole automaattivastausviestiä"
-
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "Viive automaattivastausten välillä"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "_Minimiviive (min)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "Kuinka monta kertaa vastaus lähetetään"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "Ma_ksimimäärä"
-
-#: ../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 ""
-"En ole tällä hetkellä tavoitettavissa. Jätä viesti, ja palaan asiaan niin "
-"pian kuin mahdollista."
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "Merkinnät"
 
@@ -2282,10 +2252,12 @@
 msgid "Enter your notes below..."
 msgstr "Kirjoita merkintäsi alle..."
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "Muokkaa merkintöjä..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2302,7 +2274,7 @@
 msgid "Store notes on particular buddies."
 msgstr "Tallenna merkintöjä tiettyjen tuttavien kohdalle."
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
@@ -2364,46 +2336,46 @@
 msgid "Allows control by entering commands in a file."
 msgstr "Mahdollistaa hallinnan komentotiedostolla."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuuttia"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Joutenoloajan säätö"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Aseta tilin joutenoloaika"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Aseta"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Yksikään käyttäjätileistäsi ei ole jouten."
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Poista tilin joutenoloajan asetus"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Poista asetus"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Aseta joutenoloaika kaikille käyttäjätileille"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Ota pois joutenoloaika kaikilta jouten olevilta tileiltä"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Antaa sinun säätää itse kuinka kauan olet ollut jouten"
 
@@ -2473,19 +2445,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Liity/poistu piilotus"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Piilottaa ylimääräiset liittymis/poistumisviestit."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2604,19 +2576,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "Lokikatselin"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Sisällyttää muiden pikaviestinohjelmien lokit lokikatselimeen."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2630,12 +2602,12 @@
 "\n"
 "Varoitus: Tämä liitännäinen on vielä kehitysasteella ja voi kaatua usein."
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono-liitännäisen lataaja"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Lataa .NET-liitännäisiä Monon avulla."
 
@@ -2658,7 +2630,7 @@
 msgid "Prepends a newline to displayed message."
 msgstr "Lisää näytettävän viestin eteen rivinvaihdon."
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2704,31 +2676,31 @@
 msgstr ""
 "Voit muokata/poistaa ilmoittimen \"Tuttavailmoittimet\"-valintaikkunassa"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Ei"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "Tallenna yhteydettömät viestit ilmoittimeen"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "Älä kysy. Tallenna aina ilmoittimeen."
 
@@ -2738,51 +2710,51 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl-liitännäisten lataaja"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Tuo mahdollisuuden ladata perl-liitännäisiä."
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Meediotila"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Meediotila sisääntuleville keskusteluille"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Keskusteluikkunat ilmestyvät, kun muut käyttäjät alkavat kirjoittaa viestiä "
-"sinulle. Tämä toimii AIM-, ICQ-, Jabber-, Sametime- ja Yahoo!-"
-"yhteiskäytännöillä."
-
-#: ../libpurple/plugins/psychic.c:66
+"sinulle. Tämä toimii AIM-, ICQ-, XMPP-, Sametime- ja Yahoo!-"
+"yhteyskäytännöillä."
+
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Tunnet häiriön voimassa..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Salli vain tuttavalistassa oleville käyttäjille"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Pois käytöstä poissaollessa"
 
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Näytä ilmoitusviesti keskusteluissa"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Nosta meediotilan huomaamat keskustelut"
 
@@ -2847,7 +2819,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2855,8 +2827,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tuo SSL-tuen GNUTLS:n kautta."
 
@@ -2866,7 +2838,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -2874,8 +2846,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tuo SSL-tuen Mozilla-NSS:n kautta."
 
@@ -2926,7 +2898,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Tuttavan tilan ilmoitus"
 
@@ -2934,8 +2906,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -2943,15 +2915,15 @@
 "Ilmoittaa keskusteluikkunassa kun tuttava on poissa tai jouten ja kun hän "
 "palaa."
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-liitännäisten lataaja"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Mahdollistaa Tcl-liitännäisten latauksen."
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2974,18 +2946,18 @@
 #. * 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
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Poissa"
 
@@ -2999,51 +2971,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "Purple-henkilö"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "Isäntä"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "Sähköposti"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM-tili"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber-tili"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP-tili"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -3127,67 +3099,67 @@
 msgid "Save buddylist..."
 msgstr "Tallenna tuttavalista..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Täytä rekisteröitymiskentät."
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Uuden käyttäjätilin rekisteröinti epäonnistui virheen takia.\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Uusi Gadu-Gadu-käyttäjätili rekisteröity"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Rekisteröinti onnistui!"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "Salasana"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Syötä nykyinen vastamerkki"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Nykyinen vastamerkki"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekisteröi uusi Gadu-Gadu-käyttäjätili"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Täytä seuraavat kentät"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Paikkakunta"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../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
@@ -3195,219 +3167,219 @@
 msgid "Gender"
 msgstr "Sukupuoli"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Mies vai nainen"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Mies"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Nainen"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Vain linjoilla"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Etsi tuttavia"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "Anna hakukriteerisi alla"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Täytä kentät."
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "Nykyinen salasanasi ei ole se jonka kirjoitit."
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Salasanaa ei voitu muuttaa. Tapahtui virhe.\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Vaihda Gadu-Gadu-käyttäjätilin salasana"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "Salasanan vaihto onnistui!"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Syötä sekä nykyinen että uusi salasana tunnukselle: "
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Muuta Gadu-Gadu-salasana"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Valitse ryhmäkeskustelu tuttavalle: %s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Lisää ryhmäkeskusteluun..."
 
-#: ../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/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "Ei voida näyttää hakutuloksia."
 
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadun julkinen hakemisto"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "Hakutulokset"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "Käyttäjistä ei löytynyt osumia"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "Hakuvalintojasi vastaavia käyttäjiä ei ole."
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "Tuttavalista ladattu"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "Tuttavalistasi ladattiin palvelimelta."
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "Tuttavalista lähetettiin"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "Tuttavalistasi tallennettiin palvelimelle."
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "Estä"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "Ei yhdistettynä palvelimeen."
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "Etsi tuttavia..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
-msgid "Change password..."
-msgstr "Vaihda salasana..."
-
-#: ../libpurple/protocols/gg/gg.c:2020
-msgid "Upload buddylist to Server"
-msgstr "Vie tuttavalista palvelimelle"
-
 #: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "Vaihda salasana..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
+msgid "Upload buddylist to Server"
+msgstr "Vie tuttavalista palvelimelle"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "Tuo tuttavalista palvelimelta"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "Poista tuttavalista palvelimelta"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "Vie tuttavalista tiedostoon..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "Tuo tuttavalista tiedostosta..."
 
@@ -3422,35 +3394,35 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-yhteyskäytäntöliitännäinen"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "Puolalainen suosittu pikaviestin"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
@@ -3485,7 +3457,7 @@
 msgstr "MOTD %s:lle"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "Palvelin on katkaissut yhteyden"
 
@@ -3508,59 +3480,59 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Yhdistetään"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen epäonnistui"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3574,56 +3546,55 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-yhteyskäytäntöliitännäinen joka on vähemmän huono..."
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Palvelin"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Portti"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "Merkistöt"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "Oikea nimi"
 
@@ -3631,155 +3602,155 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "Käytä SSL:ää"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Väärä tila"
 
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sinut on kielletty kanavalta %s."
 
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Kielletty"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Ei voida estää käyttäjää %s: estolista on täynnä"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr "<i>(tunnistettu)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Kutsumanimi"
 
-#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Tällä hetkellä"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Jouten "
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Linjoilla"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Kuvaava adjektiivi:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Loistokas"
 
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s on vaihtanut aiheeksi: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s on poistanut aiheen."
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s:n aihe on: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Tuntematon viesti \"%s\""
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "Tuntematon viesti"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC-palvelin vastaanotti viestin jota se ei ymmärtänyt."
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Käyttäjät %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "Vastaus time-komentoon "
 
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "IRC palvelimen paikallinen aika:"
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "Kanavaa ei ole"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "kanavaa ei ole"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "Käyttäjä ei ole kirjautuneena sisään"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "Kutsumanimeä/kanavaa ei ole olemassa"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "Ei voitu lähettää"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Liittyminen kanavalle %s vaatii kutsun."
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
 msgstr "Virheellinen lempinimi"
 
-#: ../libpurple/protocols/irc/msgs.c:888
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3787,7 +3758,7 @@
 "Palvelin hylkäsi valitsemasi kutsumanimen. Siinä on todennäköisesti "
 "kiellettyjä merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3795,52 +3766,52 @@
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
-#, c-format
-msgid "Cannot join %s:"
-msgstr "Ei voi liittyä %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "Ei voitu liittyä kohteeseen %s: Vaatii rekisteröinnin."
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;tehtävä toiminta&gt;: Tee toiminta."
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3848,11 +3819,11 @@
 "away [viesti]: Aseta poissaoloviesti, tai jätä viesti tyhjäksi poistaaksesi "
 "poissaolotilan."
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Lähetä komento chanserv:lle"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3860,7 +3831,7 @@
 "deop &lt;nimi1&gt; [nimi2] ...: Poista kanavaoperaattorin status joltakulta. "
 "Sinun tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3870,7 +3841,7 @@
 "puhumasta jos kanava on moderoitu (+m). Sinun tulee olla kanavaperaattori "
 "tehdäksesi näin."
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3878,7 +3849,7 @@
 "invite &lt;nimi&gt; [huone]: Kutsu joku liittymään kanssasi tietylle tai "
 "tämänhetkiselle kanavalle."
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3886,7 +3857,7 @@
 "j &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle tai "
 "useammalle kanavalle, antaen myös kanava-avaimen mikäli tarpeen."
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3894,7 +3865,7 @@
 "join &lt;huone1&gt;[,huone2][,...] [avain1[,avain2][,...]]: Liity yhdelle "
 "tai useammalle kanavalle antaen myös kanava-avaimen mikäli tarpeen."
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3902,7 +3873,7 @@
 "kick &lt;nimi&gt; [viesti]: Poista joku kanavalta. Sinun tulee olla "
 "kanavaoperaattori tehdäksesi näin."
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3910,15 +3881,15 @@
 "list: Näytä lista keskusteluhuoneista verkossa. <i>Varoitus, jotkut "
 "palvelimet saattavat katkaista yhteytesi jos teet näin.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;tehtävä toiminto&gt;: Suorita toiminto."
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Lähetä komento memoserv:lle"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -3926,7 +3897,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nimi|kanava&gt;: Aseta tai poista kanavan "
 "tai käyttäjän tila."
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3934,20 +3905,20 @@
 "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle "
 "(ollessasi kanavalla)."
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Lähetä komento nickserv:lle"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3955,7 +3926,7 @@
 "op &lt;nimi1&gt; [nimi2] ...: Anna kanavaoperaattorin status jollekulle. "
 "Sinun tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3963,11 +3934,11 @@
 "operwall &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
 "tule käyttää tätä."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Lähetä komento operserv:lle"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3975,7 +3946,7 @@
 "part [huone] [viesti]: Poistu tämänhetkiseltä kanavalta tai tietyltä "
 "kanavalta valinnaisen viestin kanssa."
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3983,7 +3954,7 @@
 "ping [nimi]: Kysyy kuinka paljon viivettä käyttäjällä(tai palvelimella jos "
 "ei käyttäjää annettu) on."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3991,15 +3962,15 @@
 "query &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle (kun "
 "olet kanavalla)."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle + valinnainen viesti."
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: Lähetä \"raaka\" komento palvelimelle."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4007,23 +3978,23 @@
 "remove &lt;nimi&gt; [viesti]: Poista joku huoneesta. Sinun tulee olla "
 "kanavaoperaattori tehdäksesi näin."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Näyttää paikallisen ajan IRC palvelimella."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda kanavan aihetta."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;nimi1&gt; [nimi2] ...: Aseta tai poista käyttäjän tila."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [nimi]: lähetä CTCP VERSION -pyyntö käyttäjälle"
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4031,7 +4002,7 @@
 "voice &lt;nimi1&gt; [nimi2] ...: Aseta kanavan ääni-tila jollekulle. Sinun "
 "tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4039,55 +4010,80 @@
 "wallops &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
 "tulee käyttää sitä."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [palvelin] &lt;nimi&gt;: Hae tietoja käyttäjästä."
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;nimi&gt;: Hae tietoja käyttäjästä joka on kirjautunut ulos."
+
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../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 "Yhteys katkennut."
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Palvelin vaatii TSL/SSL-tuen kirjautumiseen. TLS/SSL tukea ei löydy."
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "Palvelin ei voinut todentaa sinua ilman salasanaa"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden yli. "
+"Sallitaanko tämä ja jatketaan?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "Palvelin ei käytä mitään tuettuista tunnistautumismenetelmistä"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "Kelvoton vastaus palvelimelta."
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4095,95 +4091,78 @@
 "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko tämä ja jatketaan?"
 
-#: ../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 "Palvelin ei käytä mitään tuettuista tunnistautumismenetelmistä"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "Kelvoton vastaus palvelimelta."
-
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "SASL-virhe"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Koko nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "Etunimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "Katuosoite"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "Alue"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "Seutu"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "Postinumero"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "Maa"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "Puhelin"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4191,40 +4170,40 @@
 msgstr "Sähköposti"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "Asema"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Muokkaa Jabberin vCardia"
-
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
+msgid "Edit XMPP vCard"
+msgstr "Muokkaa XMPP-vCardia"
+
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4232,113 +4211,113 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "Asiakasohjelma"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "Käyttöjärjestelmä"
 
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr "Lähde"
 
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "Postilokero"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "Peru paikallaoloilmoitus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "Pyydä valtuutusta uudelleen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "Hakutulokset"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4346,68 +4325,68 @@
 "Etsi henkilöä syöttämällä hakukriteerit kenttiin. Huom: jokainen kenttä "
 "tukee jokerimerkkejä (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "Hakemistohaku epäonnistui"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "Ei voitu hakea hakemistopalvelimelta."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Palvelimen ohjeet: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Täytä yksi tai useampia kentistä etsiäksesi Jabber-käyttäjiä."
-
 #: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Täytä yksi tai useampia kentistä etsiäksesi XMPP-käyttäjiä."
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Etsi Jabber-käyttäjiä"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "Etsi XMPP-käyttäjiä"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "Virheellinen kansio"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "Syötä käyttäjähakemisto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "Valitse käyttäjähakemisto, josta haetaan"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Huone:"
@@ -4420,80 +4399,80 @@
 msgid "_Handle:"
 msgstr "_Keskustelunimi:"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ei ole kelvollinen keskusteluhuoneen nimi"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ei ole kelvollinen palvelinnimi."
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Palvelimen nimi ei kelpaa"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ei ole kelvollinen keskustelunimi (room handle)"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Keskustelunimi ei kelpaa"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Konfigurointivirhe"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Ei voida konfiguroida"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Huoneen konfigurointivirhe"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Tätä huonetta ei voida konfiguroida"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Rekisteröintivirhe"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Kutsumanimeä ei voi muuttaa muissa kuin MUC-keskusteluhuoneissa"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Virhe haettaessa huonelistaa"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Palvelin ei kelpaa"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Syötä konferenssipalvelin"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Valitse konferenssipalvelin"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
@@ -4516,416 +4495,420 @@
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Epäkelpo Jabber ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "Epäkelpo XMPP-ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "Lääni"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Rekisteröi uusi Jabber-tili"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "Rekisteröi uusi XMPP-tili"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "molemmille"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Vaihda Jabber-salasana"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "Vaihda XMPP-salasana"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Epäkelpo Jabber ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "Muodoltaan virheellinen XMPP-ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Lähdekonflikti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ei voitu asettaa roolia \"%s\" käyttäjälle: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configuroi ryhmäkeskusteluhuone."
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4933,7 +4916,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4941,20 +4924,20 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4970,55 +4953,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber-yhteyskäytäntöliitännäinen"
-
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP-yhteyskäytäntöliitännäinen"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "Palvelin"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "Käytä vanhaa (portti 5223) SSL:ää"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s on lähtenyt keskustelusta."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "Viesti %s:lta"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s vaihtoi aiheeksi: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "Aihe on: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber viestivirhe"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP-viestivirhe"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
@@ -5027,16 +5020,16 @@
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5044,20 +5037,20 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "_Aseta huoneen asetuksia"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
@@ -5289,7 +5282,7 @@
 msgstr "Palvelimella liikaa ruuhkaa "
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5325,39 +5318,39 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-virhe: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "Olet lähettänyt tönäisyn!"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tämä on nimi jona MSN-tuttavasi sinut näkevät."
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "Aseta kotipuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "Aseta työpuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "Aseta matkapuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "Salli MSN-mobiilihaut"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323
 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?"
@@ -5365,315 +5358,315 @@
 "Haluatko sallia tai estää henkilöitä tuttavalistallasi lähettää MSN- "
 "mobiilihakuja matkapuhelimeesi tai muuhun mobiililaitteeseen?"
 
-#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "Salli"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "Lähetä"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "Olet hänen listallaan"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "Aseta kotipuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "Aseta työpuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "Aseta matkapuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aseta päälle/pois mobiililaitteet..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Salli/estä mobiilihaut..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhmäkeskustelu"
 
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto."
 
-#: ../libpurple/protocols/msn/msn.c:719
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Yleinen"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Ikä"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../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
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "Vapaa-aika"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "Huumorintaju"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "Musiikki"
 
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "Yhteystiedot"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "Koti"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "Työ"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "Yritys"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "Asmatti"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
 msgstr "Työhakulaite"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "Työfaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1805
 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 "
@@ -5682,7 +5675,7 @@
 "MSN ilmoitti ettei voida löytää käyttäjän profiilia. Tämä tarkoittaa joko "
 "sitä että käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5690,7 +5683,7 @@
 "Käyttäjän profiilista ei löytynyt mitään tietoja. Käyttäjää ei "
 "todennäköisesti ole olemassa."
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profiilin URL"
@@ -5705,19 +5698,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
@@ -5786,15 +5779,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "Ryhmää ei voitu poistaa"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5849,8 +5842,8 @@
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
@@ -5963,87 +5956,87 @@
 msgid "The screen name specified is invalid."
 msgstr "Syötetty näyttönimi on virheellinen."
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Vaadittuja parametreja ei syötetty"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Ei voida kirjoittaa verkkoon"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Ei voida lukea verkosta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Virhe kommunikoitaessa palvelimelle"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Konferenssia ei löydy"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Konferenssia ei ole"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Valitun niminen kansio on jo olemassa"
 
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Ei tueta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Salasana vanhentunut"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Virheellinen salasana"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Käyttäjää ei löydy"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Käyttäjätili on poistettu käytöstä"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Palvelin ei pääse hakemistoon"
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Järjestelmänne ylläpitäjä on estänyt tämän toiminnon."
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Palvelin ei ole käytössä; yritä myöhemmin uudelleen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Tuttavaa ei voi lisätä samaan kansioon kahdesti"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Et voi lisätä itseäsi"
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Pääarkisto on väärin konfiguroitu"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Virheellinen näyttönimi tai salasana"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "Ei voitu tunnistaa syötetyn näyttönimen isäntäpalvelinta"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -6051,31 +6044,31 @@
 "Käyttäjätilisi käyttö on estetty koska liian monta väärää salasanaa on "
 "syötetty"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Et voi lisätä samaa henkilöä kahdesti keskusteluun"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Olet saavuttanut rajasi sallittujen tuttavien määrässä"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "Olet syöttänyt epäkelvon näyttönimen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Virhe tapahtui päivitettäessä hakemistoa"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Epäyhteensopiva yhteyskäytäntöversio"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Käyttäjä on estänyt sinut"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -6083,11 +6076,11 @@
 "Tämä kokeiluversio ei salli enempää kuin kymmenen käyttäjää kirjautuneena "
 "sisään samaan aikaan"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "Käyttäjä on joko poissa linjoilta tai sinut on estetty"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Tuntematon virhe: 0x%X"
@@ -6175,7 +6168,7 @@
 msgstr "Ei voitu poistaa %s yksityisyys-listalta (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Ei voitu muuttaa palvelinpuolen yksityisyys-asetuksia (%s)."
@@ -6186,7 +6179,7 @@
 msgstr "Ei voitu luoda konferenssia (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Virhe kommunikoitaessa palvelimelle. Suljetaan yhteys."
 
@@ -6202,8 +6195,8 @@
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Käyttäjän ID"
 
@@ -6213,41 +6206,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Koko nimi"
 
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferenssi %d"
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Palvelimeen ei kyetty muodostamaan SSL-yhteyttä."
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
+
 #: ../libpurple/protocols/novell/novell.c:1735
-msgid "Unable to connect to server."
-msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
-
-#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s on kutsuttu tähän keskusteluun."
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Keskustelukutsu"
 
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6258,17 +6251,17 @@
 "\n"
 "Lähetetty: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6278,7 +6271,7 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6286,11 +6279,11 @@
 "Ei voitu yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle "
 "haluat yhdistää."
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
@@ -6304,22 +6297,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger -yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Palvelimen portti"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
 #: ../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
@@ -6327,8 +6320,8 @@
 msgstr "Palvelin on katkaissut yhteyden."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6365,8 +6358,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM-yhteyskäytäntöliitännäinen"
 
@@ -6380,14 +6373,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Merkistö"
 
@@ -6518,7 +6511,7 @@
 msgid "Not while on AOL"
 msgstr "Ei kun AOL on käytössä"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 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 "
@@ -6530,7 +6523,7 @@
 "merkistöä hän käyttää, voit määritellä sen AIM/ICQ-käyttäjätilisi "
 "lisäasetuksissa.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6541,144 +6534,144 @@
 "asiakasohjelma.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "Ääni"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM:n suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "Pelit"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "Lisäykset"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "Lähetä tuttavalista"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ-suorayhteys"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "AP-käyttäjä"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilistinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ-palvelimen välitys"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "Vanha ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian-salaus"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "Turvatoimet käytössä"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "Videokeskustelu"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "Varattu"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "Net-tietoinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "Linjoilla"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP-osoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6687,7 +6680,7 @@
 "Ei saatu yhteyttä todentamispalvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6696,20 +6689,20 @@
 "Ei saatu yhteyttä BOS-palvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6720,28 +6713,29 @@
 "virheellinen. Näyttönimien tulee alkaa joko kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "Epäkelpo näyttöjänimi."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 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."
@@ -6750,44 +6744,44 @@
 "ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6796,53 +6790,53 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-"
 "yhteyskäytäntöä kunnes tämä on korjattu. Tarkista päivitykset: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kelvollista AIM-sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "Kelvollista sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttavalistalleni?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "Voisitko valtuuttaa minut?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6853,17 +6847,17 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6876,7 +6870,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6889,7 +6883,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6902,38 +6896,38 @@
 "Viesti on:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-käyttäjä %u on lähettänyt sinulle tuttavan: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, 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] "Et saanut %hu viestiä %s:lta koska se oli epäkelpo."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat epäkelpoja."
 
-#: ../libpurple/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, 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] "Et saanut %hu viestiä %s:lta koska se oli liian suuri."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat liian suuria."
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6942,21 +6936,21 @@
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, 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] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, 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] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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."
@@ -6964,61 +6958,61 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Viestiä ei voitu lähettää: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "Profiili"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7026,11 +7020,7 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr "Määrärajoitusvirhe"
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7038,85 +7028,85 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "Asema"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7125,14 +7115,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7141,7 +7131,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7150,7 +7140,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7159,7 +7149,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7168,32 +7158,32 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4440
 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 "
@@ -7203,24 +7193,24 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
+#: ../libpurple/protocols/oscar/oscar.c:4454
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] ""
-"Maksimi profiilin koko %d tavu ylitetty. Se on nyt lyhennetty puolestasi."
+"Maksimi profiilin koko %d tavu ylitetty.  Se on nyt lyhennetty puolestasi."
 msgstr[1] ""
-"Maksimi profiilin koko %d tavua ylitetty. Se on nyt lyhennetty puolestasi."
-
-#: ../libpurple/protocols/oscar/oscar.c:4482
+"Maksimi profiilin koko %d tavua ylitetty.  Se on nyt lyhennetty puolestasi."
+
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7235,11 +7225,11 @@
 "Maksimi poissaoloviestin koko %d tavua ylitetty. Viesti lyhennettiin "
 "puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4532
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4578
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7250,17 +7240,17 @@
 "tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
 "välilyöntejä tai sisältää vain numeroita."
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4685
 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."
@@ -7268,16 +7258,16 @@
 "Tuttavalistan hakeminen AIM-pavelimelta epäonnistui. Tuttavalistasi ei ole "
 "kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4914
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5096
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5001
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7286,12 +7276,12 @@
 "Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
 "hyvä ja poista joku ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7301,7 +7291,7 @@
 "Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on se "
 "että listasi maksimituttavamäärä on ylittynyt."
 
-#: ../libpurple/protocols/oscar/oscar.c:5133
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7310,22 +7300,22 @@
 "Käyttäjä %s on antanut sinulle oikeuden lisätä itsesi hänen "
 "tuttavalistalleen. Haluatko lisätä hänet omallesi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/oscar/oscar.c:5218
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7336,53 +7326,53 @@
 "syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5222
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM- "
 "ryhmäkeskustelussa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "iTunes-musiikkikauppalinkki"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5844
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7390,65 +7380,65 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "Y_hdistä"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5947
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5969
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6155
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6156
+#: ../libpurple/protocols/oscar/oscar.c:6124
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7456,73 +7446,73 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7560,7 +7550,7 @@
 "lähetettäessä kuvia. Koska IP-osoitteesi paljastuu, tätä voi pitää "
 "yksityisyysriskinä."
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "_Yhdistä"
 
@@ -7725,93 +7715,99 @@
 msgid "Update my information"
 msgstr "Päivitä tietoni"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Tietosi on päivitetty"
 
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr ""
-"Omien kuvien asettaminen ei ole tällä hetkellä tuettua. Valitse kuva "
-"seuraavista: "
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr ""
+"Omien kuvien asettaminen ei ole tällä hetkellä tuettua. Valitse kuva: %s."
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Epäkelpo QQ-kuva (face)"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Kieltäydyit %d:n pyynnöstä"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Anna syy:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Kieltäydy pyynnöstä"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "Pahoittelut, en ole kiinnostunut..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Kieltäydy"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "Lisää tuttava jolla on valtuuspyyntöjen epännistumisia"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "Tuttava poistettu onnistuneesti"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "Olet poistanut itsesi tuttavaltasi"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Käyttäjä %d tarvitsee valtuutuksen"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "Anna syy tähän"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "Haluaisitko olla kaverini?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "Lähetä"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Käyttäjä %d lisätty tuttavalistalle"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid-virhe"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "Epäkelpo QQid"
 
@@ -7847,59 +7843,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Voit etsiä vain pysyviä QQ-ryhmiä\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "Käyttäjä %d haki ryhmän %d jäsenyyttä"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Syy: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "QQ Qun -toiminta"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Hyväksy"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Pyyntösi liittyä ryhmään %d evättiin ylläpitäjän %d toimesta"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "Pyyntösi liittyä ryhmään %d hyväksyttiin ylläpitäjän %d toimesta"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Sinä (%d) olet poistunut ryhmästä \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Sinä (%d) olet lisätty ryhmään \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "Tämä ryhmä on lisätty tuttavalistallesi"
 
@@ -7927,27 +7923,27 @@
 msgid "This group does not allow others to join"
 msgstr "Tämä ryhmä ei salli muiden liittyä"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "Ryhmästä poistuminen onnistui"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "QQ-ryhmän valtuutus"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "QQ-palvelin on hyväksynyt valtuutustoimintosi"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Olet syöttänyt hyväksyttävän skaalan ulkopuolisen ryhmätunnisteen (ID)"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "Haluatko varmasti poistua tästä Qun:sta?"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -7955,7 +7951,7 @@
 "Huomaa, että olet samalla Qun:n luoja, \n"
 "Tämä toiminto poistaa lopulta tämän Qun:n."
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "Jatka"
 
@@ -7968,40 +7964,41 @@
 msgid "Group Operation Error"
 msgstr "Ryhmätoimintovirhe"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Haluatko hyväksyä pyynnön?"
 
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "Qun-jäsentä muokattu onnistuneesti"
 
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "Qun-tietojen muokkaus onnistui"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "Qun:n luonti onnistui"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "Haluatko asettaa Qun:n yksityiskohdat nyt?"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "Asetukset"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "Järjestelmäviesti"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "Palvelimen \"ACK\""
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "Pikaviestin lähetys epäonnistui\n"
 
@@ -8020,11 +8017,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8065,47 +8062,47 @@
 msgid "Invalid name"
 msgstr "Epäkelpo nimi"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Parhaillaan kirjautuneena</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Viimeisin päivitys:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Yhteystila</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Palvelimen IP:</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Oma julkinen IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Kirjautumisaika</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Viimeisimmän kirjautumisen IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Viimeisin kirjautumisaika:</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "Kirjautumistietoja"
 
@@ -8125,6 +8122,10 @@
 msgid "Exit this QQ Qun"
 msgstr "Poistu tästä QQ-Qun:sta"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "Estä tämä tuttava"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8135,15 +8136,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "Kirjaudu TCP:llä"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "Piilotettu kirjautuminen"
 
@@ -8187,51 +8188,53 @@
 msgid "Login failed, no reply"
 msgstr "Kirjautuminen epäonnistui, ei vastausta"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "Haluatko lisätä tämän tuttavan?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Sinut on lisännyt %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "Haluatko lisätä hänet?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s on lisännyt sinut (%s)"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Käyttäjä %s on kieltäytynyt pyynnöstäsi"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi."
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "Käyttäjä %s tahtoo lisätä sinut (%s) kaverikseen"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Viesti: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s ei ole tuttavalistallasi"
 
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Haluatko lisätä hänet?"
 
@@ -8323,7 +8326,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
 
@@ -8340,41 +8343,41 @@
 msgid "Unable to send message: "
 msgstr "Viestiä ei voitu lähettää: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Paikka suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofoni"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Kaiuttimet"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Tiedostonsiirto"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Tukee"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Ulkoinen käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Aloita neuvottelu käyttäjän kanssa"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8383,11 +8386,11 @@
 "Kirjoita uuden neuvottelun puheenaihe sekä kutsuviesti joka lähetetään "
 "käyttäjälle %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Aloita"
 
@@ -8418,23 +8421,23 @@
 msgid "Invite to Conference"
 msgstr "Kutsu neuvotteluun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Kutsu neuvotteluun..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8443,38 +8446,38 @@
 "Isäntää tai IP-osoitetta ei ole astetettu Meanwhile-käyttäjätilille %s. "
 "Lisää sellainen alle ennen kirjautumista sisään."
 
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhilen yhteysasetukset"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Viimeksi nähty asiakasohjelma"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Epäselvä käyttäjätunnus syötetty"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8483,15 +8486,15 @@
 "Tunniste '%s' voi viitata keneen tahansa seuraavista käyttäjistä. Valitse "
 "oikea käyttäjä alla olevasta luettelosta lisätäksesi hänet tuttavalistallesi."
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Ei voitu lisätä käyttäjää: käyttäjää ei löydy"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8500,11 +8503,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana "
 "onpoistettu tuttavalistaltasi."
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Ei voitu lisätä käyttäjää"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8513,64 +8516,64 @@
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Etätallennettu tuttavalista"
 
 # NOTE source: gftt glossary
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Tuttavalistan tallennustapa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Vain paikallinen tuttavalista"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Yhdistä tuttavalista palvelimelta"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Yhdistä ja tallenna lista palvelimelle"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Täsmää lista palvelimen kanssa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Tuo Sametime-lista käyttäjätililtä %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Vie Sametime-lista käyttäjätilille %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Ei voitu lisätä ryhmää: ryhmä on jo olemassa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ryhmä '%s' on jo tuttavalistallasi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Ryhmää ei voitu lisätä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Mahdollisia osumia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notesin osoitekirjan ryhmätulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8581,15 +8584,15 @@
 "ryhmistä. Valitse oikea ryhmä alla olevasta luettelosta lisätäksesi sen "
 "tuttavalistallesi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Ei voitu lisätä ryhmää: ryhmää ei löytynyt"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8598,11 +8601,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisösi Notesin osoitekirjan "
 "ryhmistä."
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhmä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5481
 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."
@@ -8610,12 +8613,12 @@
 "Kirjoita Notesin osoitekirjan ryhmän nimi allaolevaan kenttään lisätäksesi "
 "ryhmän ja sen jäsenet tuttavalistallesi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8626,28 +8629,28 @@
 "lisätä nämä käyttäjät tuttavalistallesi tai lähettää heille viestejä alla "
 "olevilla painikkeilla."
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Etsi käyttäjiä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8655,39 +8658,39 @@
 "Kirjoita nimi tai osittainen käyttäjätunnus alla olevaan kenttään etsiäksesi "
 "käyttäjiä Sametime-yhteisöstäsi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Käyttäjähaku"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Tuo Sametime-lista..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Vie Sametime-lista..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Lisää Notesin osoitekirjan ryhmä..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Käyttäjähaku..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sisäänkirjautuminen (älä välitä palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8733,12 +8736,12 @@
 msgstr "Avainsopimusta et voi tehdä itsesi kanssa"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Etäkäyttäjä ei enää ole paikalla verkossa"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8747,7 +8750,7 @@
 "Avainsopimuspyyntö vastaanotettu käyttäjältä %s. Haluatko suorittaa "
 "avainsopimuksen?"
 
-#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8758,49 +8761,49 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Avainsopimuspyyntö"
 
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Ei voida asettaa pikaviestiavainta"
 
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "Aseta pikaviestin salasana"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Hae julkinen avain"
 
-#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Ei voitu hakea julkista avainta"
 
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Näytä julkinen avain"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Ei voitu ladata julkista avainta"
 
-#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -8809,18 +8812,18 @@
 msgid "User Information"
 msgstr "Käyttäjätiedot"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Ei voitu hakea käyttäjätietoja"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Käyttäjä %s ei ole luotettu"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8829,16 +8832,16 @@
 "Voit käyttää Hae julkinen avain -komentoa saadaksesi julkisen avaimen."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "Avaa..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Tuttava %s ei ole kirjautuneena verkossa"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8846,15 +8849,15 @@
 "Lisätäksesi tuttavan tarvitsen hänen julkisen avaimensa. Paina Tuo "
 "tuodaksesi julkisen avaimen."
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "_Tuo..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "Valitse oikea käyttäjä"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8862,7 +8865,7 @@
 "Useammalla kuin yhdellä käyttäjällä on sama julkinen avain. Valitse oikea "
 "käyttäjä listalta."
 
-#: ../libpurple/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8870,154 +8873,154 @@
 "Useammalla kuin yhdellä käyttäjällä on sama nimi. Valitse oikea käyttäjä "
 "listalta."
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "Irroitettu"
 
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "Vastahakoinen"
 
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "Herätä minut"
 
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiivinen"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "Robotti"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Onnellinen"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "Surullinen"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "Vihainen"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "Häpeää"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Haavoittumaton"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "Rakastunut"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Unelias"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "Tylsistynyt"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "Innostunut"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "Levoton"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Käyttäjätilat"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Mieliala"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Suosikkituttava"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Ensisijainen kieli"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Laite"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Maantieteellinen paikka"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Tyhjennä pikaviestiavain"
 
-#: ../libpurple/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "Pikaviesti avaimienvaihdolla"
 
-#: ../libpurple/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "Pikaviesti salasanalla"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Hae julkinen avain..."
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "Poista käyttäjä"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Piirrä kirjoitustaululle"
 
@@ -9093,15 +9096,15 @@
 msgid "Open Public Key..."
 msgstr "Avaa julkinen avain..."
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanavan salasana"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Kanavan julkisten avainten lista"
 
-#: ../libpurple/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9115,132 +9118,132 @@
 "pääsemiseksi. Jos käytetään kanavan julkisia avaimia niin silloin pääsevät "
 "vain käyttäjät joiden julkinen avain on listalla."
 
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "Kanavalle tunnistautuminen"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "Lisää / poista"
 
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "Ryhmän nimi"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "Salasana"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Syötä kanavan %s yksityinen ryhmänimi ja salasana."
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Lisää kanavaan yksityinen ryhmä"
 
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "Käyttäjäraja"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Aseta käyttäjärajoitus kanavalle. Aseta nollaksi poistaaksesi rajoituksen."
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "Kutsulista"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "Kieltolista"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "Lisää yksityinen ryhmä"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "Nollaa pysyvä"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "Aseta pysyvä"
 
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "Aseta käyttäjärajoitus"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Poista aiherajoitus"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Aseta aiherajoitus"
 
-#: ../libpurple/protocols/silc/chat.c:943
-msgid "Reset Private Channel"
-msgstr "Poista yksityinen kanava"
-
 #: ../libpurple/protocols/silc/chat.c:948
+msgid "Reset Private Channel"
+msgstr "Poista yksityinen kanava"
+
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "Aseta yksityinen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Poista salainen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Aseta salainen kanava"
 
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Olet kanavan perustaja kanavalla <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanavan perustaja kanavalla <I>%s</I> on <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sinun tulee liittyä kanavalle %s ennenkuin voit liittyä yksityiseen ryhmään"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "Liity yksityiseen ryhmään"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "Kutsu komentoa"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
@@ -9350,7 +9353,7 @@
 msgstr "Asema työssä"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "Organisaatio"
 
@@ -9391,7 +9394,7 @@
 msgstr "_Lisää..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "Irroita palvelimelta"
 
@@ -9530,51 +9533,51 @@
 msgid "Verifying server public key"
 msgstr "Tarkistetaan palvelimen julkinen avain"
 
-#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "Vaatii salasanan"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Virhe: Etäkone ei luota/tue julkista avaintasi"
 
-#: ../libpurple/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Virhe: Etäkone ei tue ehdotettua KE-ryhmää"
 
-#: ../libpurple/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Virhe: Etäkone ei tue ehdotettua salausta"
 
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Virhe: Etäkone ei tuo ehdotettua PKCS:aa"
 
-#: ../libpurple/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Virhe: Etäkone ei tue ehdotettua tiivistysfunktiota"
 
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Virhe: Etäkone ei tue ehdotettua HMAC:ia"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "Virhe: Virheellinen allekirjoitus"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "Virhe: Virheellinen eväste"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9583,12 +9586,12 @@
 "Vastaanotettiin käyttäjän %s julkinen avain. Paikallinen kopiosi ei täsmää. "
 "Haluatko silti hyväksyä tämän julkisen avaimen?"
 
-#: ../libpurple/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Vastaanotettiin julkinen avain käyttäjältä %s. Hyväksytäänkö se?"
 
-#: ../libpurple/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9601,15 +9604,15 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "Tarkista julkinen avain"
 
-#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "_Näytä..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Julkisen avaimen tyyppiä ei tuettu"
 
@@ -9659,7 +9662,7 @@
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "Normaali"
 
@@ -9724,168 +9727,168 @@
 "henkilökohtaiset tietosi. Syötä tiedot jotka haluat toisten näkevän "
 "itsestäsi."
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "Päivän viestiä ei ole"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "Luo uusi SILC-avainpari"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "Salasanat eivät täsmää"
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "Avainparin luonti epäonnistui"
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "Avaimen pituus"
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "Luo avainpari"
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "Tila"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "Näytä päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "Luo SILC-avainpari..."
 
-#: ../libpurple/protocols/silc/silc.c:1104
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "Aihe liian pitkä"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "Sinun täytyy syöttää lempinimi"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanavaa %s ei löydy"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanavan tilat kanavalle %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "cmodes asetus epäonnistui, %s"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Tuntematon komento: %s, (mahdollisesti asiakasohjelman virhe)"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanava]:  Poistu keskustelusta"
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanava]:  Poistu keskustelusta"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;uusi aihe&gt;]: Näytä tai aseta aihe"
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../libpurple/protocols/silc/silc.c:1616
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;nimi&gt; [&lt;viesti&gt;]: Lähetä yksityisviesti käyttäjälle"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Näytä palvelimen päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach: Irroita tämä istunto"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komento&gt;: Kutsu mitä vain silc:n asiakaskomentoa."
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi)nimesi."
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9893,7 +9896,7 @@
 "cmode &lt;kanava&gt; [+|-&lt;tila&gt;] [argumentit]: Aseta tai näytä kanavan "
 "tilat."
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9901,15 +9904,15 @@
 "cumode &lt;kanava&gt; +|-&lt;tila&gt; &lt;nimi&gt;: Muuta nimen tilaa "
 "kanavalla."
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;käyttäjätilat&gt;: Aseta omat tilasi verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9917,37 +9920,37 @@
 "invite &lt;kanava&gt; [-|+]&lt;nimi&gt;: Kutsu käyttäjä tai lisää/poista "
 "kanavan kutsu- listalta"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista käyttäjä kanavalta"
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [%lt;kanava%gt; +|-&lt;nimi&gt;]: Kiellä käyttäjä kanavalta"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nimi|palvelin&gt;: Hae käyttäjän tai palvelimen julkinen avain"
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Näytä palvelimen ja verkon tilastot"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanava&gt;: Näytä käyttäjät kanavalla"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9964,64 +9967,64 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC-yhteyskäytäntöliitännäinen"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "Verkko"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "Salaus"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "Evää katsominen toisilta käyttäjiltä"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "Estä kutsut"
 
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: ../libpurple/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "Evää paikallaolotilan pyynnöt"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "Estä viestit kirjoitustaululle"
 
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "Avaa kirjoitustaulu automaattisesti"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
@@ -10143,26 +10146,26 @@
 msgstr "Ei voitu kirjoittaa"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "Ei voitu yhdistää"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "Kuuntelupistokkeen luominen epäonnistui"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "Yhteyttä isäntään ei voitu löytää"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "Isäntänimeä ei voitu selvittää"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-näyttönimissä ei tule olla välilyöntejä tai @-merkkejä"
 
@@ -10174,36 +10177,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Julkaise tilasi (huom: kuka tahansa voi seurata tilaasi)"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "Käytä UDP:tä"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use proxy"
 msgstr "Käytä välipalvelinta"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "Todennus/käyttäjä"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
@@ -10424,11 +10427,11 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:878
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
@@ -10438,18 +10441,18 @@
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-järjestelmäviesti käyttäjälle %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "Valtuutuksen eväysviesti:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10458,11 +10461,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10473,11 +10476,11 @@
 "luultavasti mahdollista kirjautua Yahoo-palveluun tällä asiakasohjelmalla. "
 "Tarkista päivitykset osoitteesta: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10487,151 +10490,152 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "Odottamaton HTTP-vastaus palvelimelta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
-msgid "Not at Desk"
-msgstr "Poissa työpöydältä"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+msgid "Not at Desk"
+msgstr "Poissa työpöydältä"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "Minkä tunnuksen (ID) haluat aktivoida?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "Olet lähettänyt tönäisyn!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Anna tuttavalle äänimerkki huomion saamiseksi"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -10645,56 +10649,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "Hakulaitepalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
@@ -10900,8 +10904,8 @@
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(Tämän viestin muunnoksessa oli virhe.\t Katso \"koodaus\"-optio "
-"tilieditorista)"
+"(Tämän viestin muunnoksessa oli virhe.\t Tarkista \"Merkistö\"-valinta tilin "
+"muokkausikkunasta)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -10909,76 +10913,76 @@
 msgstr "Ei voida lähettää ryhmäkeskusteluun %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Käyttäjä"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Näkymättömänä tai poissa linjoilta"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Paikassa: %s saapunut: %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Kuka tahansa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Luokka:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Ilmentymä:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Vastaanottaja:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Yritys tilata %s,%s,%s epäonnistui"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Liity uuteen "
 "ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ilmentymä&gt;: Lähetä viesti &lt;viesti,<i>ilmentymä</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10986,7 +10990,7 @@
 "zci &lt;luokka&gt; &lt;ilmentymä&gt;: Lähetä viesti &lt;<i>luokka</i>,"
 "<i>ilmentymä</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 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;"
@@ -10994,7 +10998,7 @@
 "zcir &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti "
 "&lt;<i>luokka</i>,<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11002,15 +11006,15 @@
 "zir &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti &lt;VIESTI,"
 "<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;luokka&gt;: Lähetä viesti &lt;<i>luokka</i>,YKSITYINEN,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Uudelleentilaa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Hae tilaukset palvelimelta"
 
@@ -11024,40 +11028,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Käytä tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc-komento"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Vie tiedostoon .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Tuo tiedostosta .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Tuo tiedostosta .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Alue(realm)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Altistus"
 
@@ -11099,18 +11103,18 @@
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_Ei"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Hyväksy"
 
@@ -11121,16 +11125,16 @@
 msgid "I'm not here right now"
 msgstr "En ole täällä juuri nyt"
 
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "tallennetut tilat"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimeltään %s.\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11139,58 +11143,58 @@
 "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "Hyväksy ryhmäkeskustelukutsu?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Poista asetus"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "Tavoittamattomissa"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "Liikkeellä"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s on vaihtanut tilasta %s tilaan %s"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s on nyt %s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ei ole enää %s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s on jouten"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
@@ -11200,12 +11204,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11214,62 +11218,62 @@
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../libpurple/util.c:2906
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tunti"
 msgstr[1] "%s, %d tuntia"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuutti"
 msgstr[1] "%s, %d minuuttia"
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3488
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11278,17 +11282,17 @@
 "Ei voitu varata riittävästi muistia säilyttämään kohteen %s sisältö. "
 "Verkkopalvelin voi olla yrittämässä tehdä jotain pahantahtoista."
 
-#: ../libpurple/util.c:3403
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Virhe luettaessa kohteesta %s: %s"
 
-#: ../libpurple/util.c:3434
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Virhe kirjoitettaessa kohteseen %s: %s"
 
-#: ../libpurple/util.c:3459
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Ei voitu yhdistää kohteeseen %s: %s"
@@ -11314,55 +11318,55 @@
 msgstr "Tarjottimen asento."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "Paikallinen lempinimi:"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjätilille:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "Käytä GNOMEn välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "Käytä yleisiä välipalvelinasetuksia"
 
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -11371,60 +11375,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11447,106 +11451,106 @@
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Lisää/muokkaa</b> Tuttavalista-ikkunassa."
 
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "_Poista esto"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "Liity automaattisesti"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -11554,126 +11558,126 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../pidgin/gtkblist.c:2763
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:2764
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:2765
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:2766
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Tuttavat/Näytä _joutenoloajat"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Käyttäjätilit/Lisää\\/muokkaa"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Huone_lista"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "/O_hje"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "/Ohje/O_hjeita verkossa"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11682,131 +11686,127 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "Tuttavan lempinimi"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "Kirjautui sisään"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "Viimeksi nähty"
 
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "Aavemainen"
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "Mahtava"
 
-#: ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "Rokkaava"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dt %02dm"
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/Työkalut/Tuttavailmoittimet"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/Työkalut/Huonelista"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d lukematon viesti käyttäjältä %s\n"
 msgstr[1] "%d lukematonta viestiä käyttäjältä %s\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>Käyttäjänimi:</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>Salasana:</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "_Sisäänkirjautuminen"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11825,23 +11825,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:4428
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:4434
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:4437
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/Tuttavat/Näytä joutenoloajat"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:5367
 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. "
@@ -11851,17 +11851,17 @@
 "myös valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta "
 "aina kuin mahdollista.\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Ryhmä:"
 
-#: ../pidgin/gtkblist.c:5590
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11869,7 +11869,7 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:5743
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11877,39 +11877,39 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Käyttäjätilit/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "_Muokkaa käyttäjätiliä"
 
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Käyttäjätilit/Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
@@ -11926,65 +11926,65 @@
 "%s ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja otat "
 "tilin uudelleen käyttöön."
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa yhteyskäytäntöä kuin tämä ryhmäkeskustelu."
 
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "Etsi"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../pidgin/gtkconv.c:1338
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
@@ -12007,129 +12007,129 @@
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "Aseta oma kuvake..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "Poista oma kuvake"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä l_oki..."
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../pidgin/gtkconv.c:2790
-msgid "/Conversation/Se_nd File..."
-msgstr "/Keskustelu/_Lähetä tiedosto..."
-
-#: ../pidgin/gtkconv.c:2791
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
-
 #: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/Se_nd File..."
+msgstr "/Keskustelu/_Lähetä tiedosto..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
+
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/Keskustelu/Lis_ää"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/Keskustelu/_Alias..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/Keskustelu/Poista est_o..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
@@ -12138,229 +12138,229 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/Keskustelu/Poista esto..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../pidgin/gtkconv.c:3030
+#: ../pidgin/gtkconv.c:3033
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../pidgin/gtkconv.c:3049
-msgid "/Options/Show Timestamps"
-msgstr "/Valinnat/Näytä aikaleima"
-
 #: ../pidgin/gtkconv.c:3052
+msgid "/Options/Show Timestamps"
+msgstr "/Valinnat/Näytä aikaleima"
+
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "_Lähetä käyttäjälle"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Tallenna virheenjäljitysloki"
 
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr "Käännä"
 
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "Korosta osumat"
 
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "Vain _kuvake"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "_Sekä kuvake että teksti"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "Suodin"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "Näytä lisää valintoja oikealla hiiren painikkeella."
 
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "Taso "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "Valitse virheenjäljityssuodattimen taso."
 
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "Kaikki"
 
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "Muut"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "Varoitukset"
 
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
 msgstr "Virheet "
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "Vakavat virheet"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "pääkehittäjä"
 
@@ -12369,8 +12369,9 @@
 #: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "kehittäjä"
 
@@ -12378,409 +12379,424 @@
 msgid "developer & webmaster"
 msgstr "kehittäjä & verkkosivujen ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
 msgid "support"
 msgstr "tuki"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support/QA"
 msgstr "tuki/laadunvarmistus"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "win32-käännös"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "ylläpitäjä"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaim-ylläpitäjä"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hakkeri ja kuski [laiska pummi]"
 
-#: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber-kehittäjä"
-
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
+msgid "XMPP developer"
+msgstr "XMPP-kehittäjä"
+
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "alkuperäinen tekijä"
 
-#: ../pidgin/gtkdialogs.c:121
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "afrikaans"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "arabia"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
 msgid "Bulgarian"
 msgstr "bulgaria"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
 #: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "bengali"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "katalaani"
 
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "valencian katalaani"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "tšekki"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "tanska"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
 msgid "German"
 msgstr "saksa"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "dzongkha"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "kreikka"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "australian englanti"
 
-#: ../pidgin/gtkdialogs.c:144
-msgid "Canadian English"
-msgstr "kanadan englanti"
-
-#: ../pidgin/gtkdialogs.c:145
-msgid "British English"
-msgstr "brittienglanti"
-
 #: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "kanadan englanti"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "brittienglanti"
+
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "espanja"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "euskara (baski)"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "persia"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "ranska"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "galego"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "gudžarati"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "Gujaratin kääntäjäryhmä"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "heprea"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
 msgstr "unkari"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "indonesia"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "italia"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "japani"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "georgia"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntun georgian kääntäjät"
+
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "kannada"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "Kannadan kääntäjäryhmä"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "korea"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
 msgstr "kurdi"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "liettua"
 
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:173
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:174
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
 msgstr "nepal"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:176
 msgid "Dutch, Flemish"
 msgstr "hollanti, flaami"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
 msgstr "norja"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "puola"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:181
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese-Brazil"
 msgstr "portugali (brasilialainen)"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
 msgstr "paštu"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
 msgstr "romania"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "slovakki"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:189
 msgid "Albanian"
 msgstr "albania"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
 msgstr "tamil"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../pidgin/gtkdialogs.c:193
-msgid "Thai"
-msgstr "thai"
-
-#: ../pidgin/gtkdialogs.c:194
-msgid "Turkish"
-msgstr "turkki"
-
-#: ../pidgin/gtkdialogs.c:195
-msgid "Vietnamese"
-msgstr "vietnam"
-
 #: ../pidgin/gtkdialogs.c:195
+msgid "Thai"
+msgstr "thai"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "turkki"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "Vietnamese"
+msgstr "vietnam"
+
+#: ../pidgin/gtkdialogs.c:197
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "Hong Kongin kiina"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:327
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %sistä"
 
-#: ../pidgin/gtkdialogs.c:359
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s on modulaarinen pikaviestinsovellus, joka kykenee käyttämään AIM-, MSN-, "
-"Yahoo!-, Jabber-, ICQ-, IRC-, SILC-, SIP/SIMPLE-, Novell GroupWise-, Lotus "
-"Sametime-, Bonjour-, Zephyr-, Gadu-Gadu- ja QQ-yhteyskäytäntöjä "
-"yhtäaikaisesti. Se on ohjelmoitu käyttäen Gtk+-kirjastoa.<BR><BR>Voit "
-"muokata ja jakaa ohjelmaa GPL-lisenssin (versio 2 tai myöhempi) ehdoilla. "
-"Kopio GPL:stä on sisällytetty \"COPYING\"-tiedostoon, joka tulee %sin "
-"mukana. %sin tekijänoikeudet on sen tekemiseen osallistuneilla. Täydellinen "
-"luettelo osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät "
-"anna ohjelmalle minkäänlaista takuuta.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:374
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to 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 ""
+"%s on graafinen ja modulaarinen libpurple-kirjastoon perustuva "
+"pikaviestinsovellus, joka kykenee käyttämään AIM-, MSN-, Yahoo!-, XMPP-, "
+"ICQ-, IRC-, SILC-, SIP/SIMPLE-, Novell GroupWise-, Lotus Sametime-, "
+"Bonjour-, Zephyr-, Gadu-Gadu- ja QQ-yhteyskäytäntöjä yhtäaikaisesti. Se on "
+"ohjelmoitu käyttäen Gtk+-kirjastoa.<BR><BR>Voit muokata ja jakaa ohjelmaa "
+"GPL-lisenssin (versio 2 tai myöhempi) ehdoilla. Kopio GPL:stä on "
+"sisällytetty \"COPYING\"-tiedostoon, joka tulee %sin mukana. %sin "
+"tekijänoikeudet on sen tekemiseen osallistuneilla. Täydellinen luettelo "
+"osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät anna "
+"ohjelmalle minkäänlaista takuuta.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 palvelimella irc.freenode.net<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:377
+"<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 palvelimella irc.freenode."
+"net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #pidgin palvelimella irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:398
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:428
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
 msgstr "Graafikot"
 
-#: ../pidgin/gtkdialogs.c:443
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12795,30 +12811,30 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Olet yhdistämässä ryhmää \"%s\" ryhmään \"%s\".  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "_Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1159
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12826,29 +12842,29 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa \"%s\":n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1225
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12857,11 +12873,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -12869,30 +12885,27 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Näytä lisää viestejä hiiren oikealla painikkeella...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "Vaihda tila"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Näytä tuttavalista"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "Uusi viesti..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Vaimenna äänet"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "Vilkuta uuden viestin saapuessa"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Lopeta"
 
@@ -12973,7 +12986,7 @@
 msgstr "Tiedostonsiirron yksityiskohdat"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Tauko"
 
@@ -12982,11 +12995,11 @@
 msgid "_Resume"
 msgstr "_Jatka"
 
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:792
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:809
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
@@ -13018,7 +13031,7 @@
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13028,7 +13041,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13038,7 +13051,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13049,7 +13062,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13060,11 +13073,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
@@ -13174,7 +13187,7 @@
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13183,7 +13196,7 @@
 "Haluatko varmasti poistaa käyttäjän %s kanssa käydyn viestilokin joka alkoi %"
 "s?"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13191,29 +13204,29 @@
 msgstr ""
 "Haluatko varmasti poistaa kohteessa %s käydyn viestilokin joka alkoi %s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "Haluatko varmasti poistaa järjestelmälokin joka alkoi %s?"
 
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Keskustelu huoneessa %s: %s</span>"
 
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:430
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr ""
 "<span size='larger' weight='bold'>Keskustelu käyttäjän %s kanssa %s</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13221,7 +13234,7 @@
 "Järjestelmätapahtumat kirjataan lokiin vain jos \"Kirjaa kaikki "
 "tilamuutokset järjestelmälokiin\" on asetettu."
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13229,46 +13242,46 @@
 "Pikaviestit kirjataan lokiin vain jos \"Kirjaa kaikki pikaviestit lokiin\" "
 "on asetettu."
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Ryhmäkeskustelut kirjataan lokiin vain jos \"Kirjaa kaikki ryhmäkeskustelut "
 "lokiin\" on asetettu."
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:535
 msgid "No logs were found"
 msgstr "Lokeja ei löytynyt"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "_Selaa lokikansiota"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "Lokin kokonaiskoko:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr "Keskustelut paikassa %s"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "Keskustelut käyttäjän %s kanssa"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
 
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13293,44 +13306,44 @@
 "                      määrittelee käytettävät tilit pilkuin eroteltuina)\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../pidgin/gtkmain.c:550
+#: ../pidgin/gtkmain.c:493
 #, 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"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\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"
+"%swiki/GetABacktrace\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"
+"%swiki/DeveloperPages\n"
 msgstr ""
 "%s on kaatunut ja yrittänyt tallentaa muistivedoksen.\n"
 "Tämä on ohjelmavirhe ja se ei tapahtunut minkään\n"
 "tekemäsi virheen takia.\n"
 "\n"
-"Jos voit toistaa ongelman, ilmoita siitä Pidginin\n"
-"kehittäjille raportoimalla virheestä osoitteessa\n"
-"%sbug.php\n"
+"Jos voit toistaa ongelman, ilmoita siitä \n"
+"kehittäjille raportoimalla virheestä osoitteessa:\n"
+"%snewticket/\n"
 "\n"
 "Varmista että kerrot mitä teit vian ilmetessä ja lähetä myös\n"
 "pinolistaus muistivedostiedostosta. Jos et tiedä kuinka\n"
 "pinolistaus (backtrace) haetaan, lue ohjeita osoitteessa\n"
-"%sgdb.php.\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "Jos tarvitset lisäapua, lähetä pikaviesti joko tunnukselle SeanEgn tai "
 "LSchiere (AIMissa). Seanin ja Luken yhteystiedot muilla yhteyskäytännöillä "
 "ovat osoitteessa\n"
-"%scontactinfo.php.\n"
+"%swiki/DeveloperPages\n"
 
 #: ../pidgin/gtknotify.c:337
 msgid "Open All Messages"
@@ -13358,22 +13371,22 @@
 msgstr[0] "<b>Sinulla on %d uusi sähköposti.</b>"
 msgstr[1] "<b>Sinulla on %d uutta sähköpostia.</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Selainkomento \"%s\" on virheellinen."
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen epäonnistui"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Virhe käynnistettäessä \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento -asetus valittu, mutta komentoa ei ole asetettu."
@@ -13386,11 +13399,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "Useita liitännäisiä otetaan pois käytöstä."
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "Poista liitännäiset käytöstä"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13401,7 +13414,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13412,11 +13425,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Virhe: %s\n"
 "Tarkista onko liitännäiswebsivustolla päivitystä.</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "Liitännäisen _asetukset"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Liitännäisen yksityiskohdat</b>"
 
@@ -13425,95 +13438,95 @@
 msgstr "Valitse tiedosto"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "Kenestä ilmoitetaan"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "_kirjautuu sisään"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "kirjautuu _ulos"
 
-#: ../pidgin/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "poi_stuu"
-
 #: ../pidgin/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "_palaa"
+msgid "Goes a_way"
+msgstr "poi_stuu"
 
 #: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "_palaa"
+
+#: ../pidgin/gtkpounce.c:593
 msgid "Becomes _idle"
 msgstr "on _jouten"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:595
 msgid "Is no longer i_dle"
 msgstr "ei enää ole j_outen"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "_alkaa kirjoittaa"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
 msgstr "_keskeyttää kirjoittamisen"
 
-#: ../pidgin/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "lope_ttaa kirjoittamisen"
-
 #: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "lope_ttaa kirjoittamisen"
+
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "lähettää _viestin"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
 msgstr "Avaa pikav_iesti-ikkuna"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "_Selaa"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "S_elaa"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "I_lmoita vain kun tilani on \"ei tavoitettavissa\""
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "_Toistuva"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "Ilmoituksen kohde"
 
@@ -13541,7 +13554,7 @@
 msgid "_Show system tray icon:"
 msgstr "_Näytä tarjotinkuvake:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13560,7 +13573,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "Poissaollessa"
 
@@ -13786,59 +13799,64 @@
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset järjestelmälokiin"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "(oletus)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "Hiljaisin"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "Äänekäs"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "Äänekkäin"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../pidgin/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "Konsoliäänimerkki"
-
 #: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "Konsoliäänimerkki"
+
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1606
 msgid "Command"
 msgstr "Komento"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1607
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1615
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13847,117 +13865,117 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Enable sounds:"
 msgstr "Ota äänet käyttöön:"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Only when available"
 msgstr "Kun tavoitettavissa"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when not available"
 msgstr "Kun ei tavoitettavissa"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1655
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1683
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1734
 msgid "Play"
 msgstr "Soita"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1741
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1764
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1768
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1811
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1816
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1825
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1829
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1835
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1837
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../pidgin/gtkprefs.c:1839
+#: ../pidgin/gtkprefs.c:1841
 msgid "_Minutes before changing status:"
 msgstr "_Minuutteja ennen tilan asetusta:"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1849
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1870
 msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1872
 msgid "Use status from last _exit at startup"
 msgstr "Käytä viimeksi poistuttaessa ollutta tilaa"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1878
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota _käytetään käynnistettäessä:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1916
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1918
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1919
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "Browser"
 msgstr "Selain"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Status / Idle"
 msgstr "Tila / jouten"
 
@@ -13994,7 +14012,7 @@
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
@@ -14006,38 +14024,38 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "_Salli"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -14046,23 +14064,23 @@
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko korvata sen?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "Korvaa"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "Valitse uusi nimi"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "Valitse kansio..."
 
@@ -14085,37 +14103,37 @@
 msgstr "Haluatko varmasti poistaa valitut tallenetut tilat?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "_Käytä"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Otsikko on käytössä. Sinun täytyy valita yksilöllinen otsikko."
 
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "Eriävyys"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "Käytä eri tilaa joillekin käyttäjätileille"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
@@ -14168,39 +14186,43 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreameria ei voitu alustaa."
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "Odotetaan verkkoyhteyttä"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "Kuvan avaus epäonnistui"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ei voida lähettää kansiota %s."
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1472
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"%s ei voi siirtää kansiota. Sinun täytyy lähettää kansion sisältämät "
-"tiedostot erikseen."
-
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+"individually."
+msgstr ""
+"%s ei voi siirtää kansiota. Kansion sisältämät tiedostot täytyy lähettää "
+"erikseen."
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1505
 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."
@@ -14208,23 +14230,23 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "Lähetä kuvatiedosto"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "Liitä viestiin"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Haluatko asettaa sen tuttavakuvakkeeksi tälle käyttäjälle?"
 
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1524
 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."
@@ -14232,7 +14254,7 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1526
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14245,11 +14267,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "Ei voida lähettää käynnistintä"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14257,7 +14279,7 @@
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14268,25 +14290,25 @@
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %d × %d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Tiedosto \"%s\" on liian suuri \"%s\":lle. Kokeile pienempää kuvaa.\n"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Kuvakevirhe"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Kuvaketta ei voitu asettaa"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Ei voitu avata tiedostoa \"%s\": %s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14294,35 +14316,41 @@
 "Ei voitu ladata kuvaa \"%s\": syy ei ole tiedossa, mahdollisesti vioittunut "
 "kuvatiedosto"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "Tallenna tiedosto"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "Valitse väri"
 
-#: ../pidgin/pidginstock.c:88
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "Sulje _välilehdet"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "_Hae tiedot"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "_Kutsu"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Muokkaa"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
@@ -14344,7 +14372,7 @@
 msgstr "Suurin vastauksen aikakatkaisu:"
 
 #: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minuuttia"
 
@@ -14429,20 +14457,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Kontaktin tärkeys"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "Mahdollistaa tuttavan tila-arvojen hallinnan"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14503,11 +14531,20 @@
 msgid "Conversation Placement"
 msgstr "Keskustelun asettelu"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Huom: \"Uudet keskustelut\" -asetuksen tulisi olla asetettu seuraavaksi: "
+"\"Keskustelujen määrän mukaan\"."
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Keskustelujen määrä per ikkuna"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Erota pikaviesti- ja ryhmäkeskusteluikkunat aseteltaessa määrän mukaan"
 
@@ -14517,19 +14554,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Lisäasettelu"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Keskustelun lisäasetteluvalinnat."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -14537,37 +14574,6 @@
 "Rajoita keskustelujen määrää ikkunaa kohti, valinnaisesti erotellen "
 "pikaviesti- ja ryhmäkeskustelut"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin-esittelyliitännäinen"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Esimerkkiliitännäinen joka tekee jotain - katso kuvaus."
-
-#. *  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 ""
-"Tämä liitännäinen on tosi viilee ja tekee vaikka mitä:\n"
-"- Kertoo kuka laati ohjelman kun kirjaudut sisään\n"
-"- Kääntää kaiken tulevan tekstin ympäri\n"
-"- Lähettää viestin listallaoleville tuttavillesi aina kun he kirjautuvat "
-"sisään"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14592,19 +14598,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Hiirieleet"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Lisää tuen hiirieleille"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14697,7 +14703,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Evolution-integrointi"
 
@@ -14705,8 +14711,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "Mahdollistaa integroinnin Evolutionin kanssa."
 
@@ -14863,12 +14869,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musiikkiviestintäliitännäinen yhdessä säveltämistä varten."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -14955,7 +14961,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "Viestihuomautus"
 
@@ -14963,10 +14969,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ilmoittaa lukemattomista viesteistä monilla tavoilla."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin-esittelyliitännäinen"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Esimerkkiliitännäinen joka tekee jotain - katso kuvaus."
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Tämä liitännäinen on tosi viilee ja tekee vaikka mitä:\n"
+"- Kertoo kuka laati ohjelman kun kirjaudut sisään\n"
+"- Kääntää kaiken tulevan tekstin ympäri\n"
+"- Lähettää viestin listallaoleville tuttavillesi aina kun he kirjautuvat "
+"sisään"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Kohdistimen väri"
@@ -14979,38 +15016,30 @@
 msgid "Hyperlink Color"
 msgstr "Hyperlinkin väri"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Laajentajan koko"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView - leveyssuuntainen erotus"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Keskustelumerkintä"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "Keskusteluhistoria"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "Lokikatselin"
 
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Pyyntövalintaikkuna"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Huomautusvalintaikunna"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "Sisennä laajentajat"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "Valitse väri"
@@ -15032,36 +15061,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekstioikopolkuteema"
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "Käyttöliittymän värit"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Säädinkoot"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "Kirjasimet"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "Työkalut"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Kirjoita asetukset tiedostoon %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "Lue uudelleen gtkrc-tiedostot"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+-teemanhallinta"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Antaa pääsyn usein käytettyihin gtkrc-asetuksiin."
 
@@ -15077,11 +15126,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "Antaa sinun lähettää raakamuotoista syötettä tekstipohjaisilla  "
-"yhteyskäytännöillä (Jabber MSN, IRC, TOC). Paina \"Enter\" "
+"yhteyskäytännöillä (XMPP, MSN, IRC, TOC). Paina \"Enter\" "
 "viestinsyöttölaatikossa lähettääksesi. Tarkkaile virheenjäljitysikkunaa."
 
 #: ../pidgin/plugins/relnot.c:71
@@ -15134,8 +15183,8 @@
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"Tarkistaa määräajoin onko uusi Pidgin-versio julkaistu ja huomauttaa käyttäjää "
-"näyttämällä muutoslokin."
+"Tarkistaa määräajoin onko uusi Pidgin-versio julkaistu ja huomauttaa "
+"käyttäjää näyttämällä muutoslokin."
 
 #: ../pidgin/plugins/spellchk.c:1965
 msgid "Duplicate Correction"
@@ -15196,11 +15245,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "Salli viimeisen sanan korvaus lähetettäessä"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "Tekstin korvaus"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Korvaa lähetetettävän tekstin käyttäjän määritelmän mukaan."
 
@@ -15222,7 +15271,7 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vaakatasossa rullaava versio tuttavalistasta."
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "Näytä aikaleimat joka"
 
@@ -15232,19 +15281,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Aikaleima"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "Näytä iChat-tyyliset aikaleimat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Näytä iChat-tyyliset aikaleimat N minuutin välein."
 
@@ -15253,9 +15302,8 @@
 msgstr "Aikaleiman muotoiluasetukset"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "_Pakota (perinteiseen %s-tyyliin) 24 tunnin aika"
+msgid "_Force 24-hour time format"
+msgstr "_Pakota 24 tunnin aikamuoto"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15285,19 +15333,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Viestin aikaleimamuodot"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Muokkaa viestin aikaleimamuotoja."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15357,19 +15405,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Vaihteleva läpinäkyvyys tuttavalistalle ja keskusteluille."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15413,15 +15461,15 @@
 msgid "_Flash window when chat messages are received"
 msgstr "_Vilkuta ikkunaa ryhmäkeskusteluviestien saapuessa"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
-msgstr "Pidgwin-valinnat"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin -valinnat"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
 msgstr "Asetukset jotka liittyvät erityisesti Pidginin Windows-versioon "
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
@@ -15477,6 +15525,142 @@
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "Toggle offline buddies"
+#~ msgstr "Näytä/piilota poissaolevat tuttavat"
+
+#~ msgid "Timestamps"
+#~ msgstr "Aikaleimat"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "Still need to do something about this."
+#~ msgstr "Tälle täytyy edelleen tehdä jotain."
+
+#~ msgid "Autoreply"
+#~ msgstr "Automaattivastaus"
+
+#~ msgid "Autoreply for all the protocols"
+#~ msgstr "Automaattivastaus kaikille yhteyskäytännöille"
+
+#~ msgid ""
+#~ "This plugin lets you set autoreply message for any protocol. You can set "
+#~ "the global autoreply message from the Plugin-options dialog. To set some "
+#~ "specific autoreply message for a particular buddy, right click on the "
+#~ "buddy in the buddy-list window. To set autoreply messages for some "
+#~ "account, go to the `Advanced' tab of the Account-edit dialog."
+#~ msgstr ""
+#~ "Tämä liitännäinen mahdollistaa automaattiset vastaukset jokaisella "
+#~ "yhteyskäytännöllä. Voit asettaa yleisen automaattivastauksen liitännäisen "
+#~ "asetuksista. Asettaaksesi tietyn vastauksen jollekin tuttavalle, napsauta "
+#~ "tuttavan kohdalla oikeata hiiren painiketta tuttavalistaikkunassa. "
+#~ "Asettaaksesi automaattivastauksen jollekin käyttäjätilille, mene "
+#~ "\"Lisäasetukset\"-käyttäjälehdelle Muokkaa tiliä -valintaikkunassa."
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "Aseta automaattivastauksen viesti: %s"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "Aseta automaattivastauksen viesti"
+
+#~ msgid ""
+#~ "The following message will be sent to the buddy when the buddy sends you "
+#~ "a message and autoreply is enabled."
+#~ msgstr ""
+#~ "Seuraava viesti lähetetään tuttavalle kun tuttava lähettää sinulle "
+#~ "viestin ja automaattivastaus on otettu käyttöön."
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "Aseta _automaattivastauksen viesti"
+
+#~ msgid "Autoreply message"
+#~ msgstr "Automaattivastauksen viesti"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "Lähetä automaattivastaus kun"
+
+#~ msgid "When my account is _away"
+#~ msgstr "Kun käyttäjätilini on asetettu _poissa-tilaan"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "Kun käyttäjätilini on _jouten"
+
+#~ msgid "_Default reply"
+#~ msgstr "_Oletusvastaus"
+
+#~ msgid "Status message"
+#~ msgstr "Tilaviesti"
+
+#~ msgid "Autoreply with status message"
+#~ msgstr "Automaattivastaus tilaviestillä"
+
+#~ msgid "Always when there is a status message"
+#~ msgstr "Aina kun on olemassa tilaviesti"
+
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "Vain kun ei ole automaattivastausviestiä"
+
+#~ msgid "Delay between autoreplies"
+#~ msgstr "Viive automaattivastausten välillä"
+
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "_Minimiviive (min)"
+
+#~ msgid "Times to send autoreplies"
+#~ msgstr "Kuinka monta kertaa vastaus lähetetään"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "Ma_ksimimäärä"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr ""
+#~ "En ole tällä hetkellä tavoitettavissa. Jätä viesti, ja palaan asiaan niin "
+#~ "pian kuin mahdollista."
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber-tili"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "Ei voi liittyä %s:"
+
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "Palvelin ei voinut todentaa sinua ilman salasanaa"
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "Etsi Jabber-käyttäjiä"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Epäkelpo Jabber ID"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "Vaihda Jabber-salasana"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber-yhteyskäytäntöliitännäinen"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "Määrärajoitusvirhe"
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/Työkalut/Tuttavailmoittimet"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber-kehittäjä"
+
+#~ msgid "Slovack"
+#~ msgstr "slovakki"
+
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "Laajentajan koko"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "Sisennä laajentajat"
+
+#~ msgid "Pidgwin Options"
+#~ msgstr "Pidgwin-valinnat"
+
 #~ msgid "<span size='larger' weight='bold'>Welcome to "
 #~ msgstr "<span size='larger' weight='bold'>Tervetuloa "
 
@@ -15519,9 +15703,6 @@
 #~ msgid "Pidgin %s. Try `%s -h' for more information.\n"
 #~ msgstr "Pidgin %s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
 
-#~ msgid "WinPidgin Options"
-#~ msgstr "WinPidgin-valinnat"
-
 #~ 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 "
@@ -15579,8 +15760,8 @@
 
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going through. "
-#~ "This is only temporary, please be patient."
+#~ "off if you send a message. Pidgin will prevent anything from going "
+#~ "through. This is only temporary, please be patient."
 #~ msgstr ""
 #~ "Kun tämä tapahtuu, TOC ei välitä mistään sille lähetetyistä viesteistä ja "
 #~ "voi potkaista sinut ulos jos lähetät viestin. Pidgin estää kaiken "
@@ -15598,8 +15779,8 @@
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, which "
-#~ "will result in reduced functionality and features."
+#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
+#~ "which will result in reduced functionality and features."
 #~ msgstr ""
 #~ "Tavallinen tunnistautumismenetelmä on epäonnistunut. Tämä tarkoittaa joko "
 #~ "sitä että salasanasi on väärin, tai Yahoo!:n tunnistautumismenetelmä on "
@@ -16425,9 +16606,6 @@
 #~ msgid "Hello!"
 #~ msgstr "Hei!"
 
-#~ msgid "Pidgin"
-#~ msgstr "Pidgin"
-
 #~ msgid "Pidgin - Signed off"
 #~ msgstr "Pidgin - Kirjauduttu ulos"
 
@@ -16905,9 +17083,6 @@
 #~ msgid "Show fewer options"
 #~ msgstr "Näytä vähemmän valintoja"
 
-#~ msgid "Information"
-#~ msgstr "Tiedot"
-
 #~ msgid "/Buddies/_Signoff"
 #~ msgstr "/Tuttavat/Kirjaudu _ulos"
 
@@ -16972,9 +17147,6 @@
 #~ msgid "Warn the user"
 #~ msgstr "Varoita käyttäjää"
 
-#~ msgid "Block the user"
-#~ msgstr "Estä käyttäjä"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Lähetä tiedosto käyttäjälle"
 
@@ -17172,8 +17344,8 @@
 #~ msgstr "Ei voitu ladata asetuksia"
 
 #~ msgid ""
-#~ "Pidgin was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "Pidgin was not able to load your preferences because they are stored in "
+#~ "an old format that is no longer used.  Please reconfigure your settings "
 #~ "using the Preferences window."
 #~ msgstr ""
 #~ "Pidgin ei voinut lukea asetuksia koska ne ovat vanhassa tiedostotyypissä "
@@ -17259,8 +17431,9 @@
 #~ "Pidgin was unable to complete your request due to a problem communicating "
 #~ "with the Gadu-Gadu HTTP server.  Please try again later."
 #~ msgstr ""
-#~ "Pidgin ei voinut toteuttaa pyyntöäsi koska tapahtui virhe kommunikoitaessa "
-#~ "Gadu-Gadu HTTP-palvelimen kanssa. Yritä myöhemmin uudelleen."
+#~ "Pidgin ei voinut toteuttaa pyyntöäsi koska tapahtui virhe "
+#~ "kommunikoitaessa Gadu-Gadu HTTP-palvelimen kanssa. Yritä myöhemmin "
+#~ "uudelleen."
 
 #~ msgid "Unable to import Gadu-Gadu buddy list"
 #~ msgstr "Ei voitu tuoda Gadu-Gadu:n tuttavalistaa."
@@ -17286,15 +17459,15 @@
 #~ msgstr "Hakemistoon ei yhteyttä"
 
 #~ msgid ""
-#~ "Pidgin was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to search the Directory because it was unable to "
+#~ "connect to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin ei voinut suorittaa hakua, koska hakemistopalvelimeen ei saatu "
 #~ "yhteyttä. Yritä myöhemmin uudelleen."
 
 #~ msgid ""
-#~ "Pidgin was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
+#~ "Pidgin was unable to change your password due to an error connecting to "
+#~ "the Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin ei voinut vaihtaa salasanaa koska yhteyttä Gadu-Gadu -palvelimelle "
 #~ "ei voitu muodostaa. Yritä myöhemmin uudelleen."
@@ -17303,8 +17476,8 @@
 #~ msgstr "Käyttäjäprofiiliin ei pääsyä."
 
 #~ msgid ""
-#~ "Pidgin was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
+#~ "Pidgin was unable to access this user's profile due to an error "
+#~ "connecting to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Pidgin ei voinut lukea tämän käyttäjän profiilia koska "
 #~ "käyttäjäprofiilipalvelimeen ei saatu yhteyttä. Yritä myöhemmin uudelleen."
@@ -17315,9 +17488,6 @@
 #~ msgid "Send message through server"
 #~ msgstr "Lähetä viesti palvelimen kautta"
 
-#~ msgid "Connecting..."
-#~ msgstr "Yhdistetään..."
-
 #~ msgid "Nick:"
 #~ msgstr "Kutsumanimi:"
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 po/he.po
--- a/po/he.po	Wed May 23 23:13:11 2007 +0000
+++ b/po/he.po	Wed May 23 23:17:50 2007 +0000
@@ -1,4 +1,4 @@
-# Gaim Hebrew translation
+# Pidgin Hebrew translation
 # Copyright (C) 2005-2007, Shalom Craimer <scraimer at gmail dot com>
 # Copyright (C) 2003, Pavel Bibergal cyberkm@barak-online.net
 #
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-09 08:32-0400\n"
-"PO-Revision-Date: 2006-03-21 08:51+0200\n"
+"POT-Creation-Date: 2007-05-22 00:04-0400\n"
+"PO-Revision-Date: 2007-05-22 09:01+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at gmail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. יש לנסות את '%s –h' למידע נוסף.\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -43,14 +43,30 @@
 "  -n, --nologin       אל תתחבר אוטומטית\n"
 "  -v, --version       הצג את הגירסא של התוכנה וצא\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../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
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "פינץ'"
+
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s נתקל בשגיאות בעת המרת הגדרותיך מ- %s ל- %s. יש לחקור את העניין, ולסיים את "
+"ההעברה ידנית. נשמח אם באפשורתך לדווח על תקלה זו ב- http://developer.pidgin.im"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "שגיאה"
@@ -63,16 +79,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "השם לתצוגה של החשבון חייב להיות לא-ריק."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "הודעה על דואר חדש"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "זכור סיסמה"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "עריכת החשבון"
 
@@ -80,103 +96,103 @@
 msgid "New Account"
 msgstr "חשבון חדש"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "פרוטוקול:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "שם לתצוגה:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "סיסמא:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 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
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "ביטול"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "שמור"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -187,297 +203,318 @@
 msgstr "מחק חשבון"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "מחק"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "חשבונות"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "אפשר להפעיל ולהשעות חשבונות מן הרשימה להלן."
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "הוסף"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "ערוך"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s הפך %s לחבר שלו/שלה %s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "להוסיף את איש הקשר לרשימה שלך?"
 
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s רוצה להוסיף את %s לרשימת אנשי-הקשר שלו או שלה%s%s"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "לתת אישור לחבר?"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "אשר"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "דחה"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "חובה להזין שם לתצוגה לאיש הקשר."
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "חובה להזין קבוצה."
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "חובה לבחור חשבון."
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "החשבון שבחרת איננו מחובר."
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "שגיאה בהוספת איש קשר"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "שם לתצוגה"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "שם נוסף"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "חשבון"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "הוסף איש קשר"
 
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "יש להזין מידע על איש הקשר."
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
 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
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "שם"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "הוסף שיחה"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "ניתן לערוך עוד מידע מתפריט-ההקשר אחר-כך."
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "שגיאה בהוספת קבוצה"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "חובה להזין שם לקבוצה להוספה."
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:427
 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
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "הוסף קבוצה"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "יש להזין את שם הקבוצה"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "ערוך שיחה"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "יש לעדכן את השדות הנחוצים."
 
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "ערוך"
 
-#: ../finch/gntblist.c:754
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "הצטרף אוטומטית"
 
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "ערוך הגדרות"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "מידע"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "שולף..."
+
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "הצג פרטים"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "הוסף תגובה לפעולת איש קשר"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
 #: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "שלח קובץ"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "הצג רישום"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "אנא הזן את השם חדש עבור %s"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "שנה שם"
 
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "קבע שם"
+
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "הזנת מחרוזת ריקה תאפס את השם."
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "הסרת איש-קשר זה תסיר את על החברים באיש הקשר"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "הסרת קבוצה זו גם תסיר את כל החברים בקבוצה"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "האם אתה בטוח שברצונך להסיר את %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "אשר הסרה"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "הסר"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "רשימת אנשי קשר"
 
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "המקום סומן"
 
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "החלף סימון"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "כינוי"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "חוסר פעילות"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -486,12 +523,12 @@
 "מחוברים: %d\n"
 "סה\"כ: %d"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "חשבון: %s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -500,87 +537,87 @@
 "\n"
 "נראה לאחרונה: לפני %s"
 
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "חדש..."
 
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "שמור..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "תוספים"
 
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "שם_"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr " חשבון"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "הודעה מידית חדשה"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
 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
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "אישור"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "אפשרויות"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "שמור..."
 
-#: ../finch/gntblist.c:2077
-msgid "Toggle offline buddies"
-msgstr "הדלק/כבה חברים שלא מחוברים"
-
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "הצג חברים מנותקים"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "מיין לפי מצב"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "מיין אלפבתית"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "מיין לפי גודל יומן השיחות"
 
@@ -603,55 +640,55 @@
 "%s נותק עקב התקלה הבאה:\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "שגיעת התחברות"
 
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "התחבר"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "אין פקודה כזו."
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "שגיאת תחביר:  הקלדת מספר שגוי של ארגומנטים לפקודה זו."
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "הפקודה שלך נכשלה מסיבה לא ידועה."
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "פקודה זו פועלת רק בתוך צ'אטים, לא בהודעות."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "פקודה זו פועלת רק בהודעות, לא בתוך צ'אטים."
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "פקודה זו לא פועלת בפקוטוקול זה."
 
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "אין עדיין תמיכה בפקודות. ההודעה לא נשלחה."
 
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -660,24 +697,48 @@
 "\n"
 "%s כותב כרגע..."
 
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "עזבת את הצ'אט הזה."
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "שלח אל"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "שיחה"
+
 #: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "נקה גלילה לאחור"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "הצג חתימות-זמן"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "הוסף תגובה לפעולת איש קשר..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<מענה-אוטומטי> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "רשימת משתמשים:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "אפשרויות ניפוי הבאגים הנתמכות הן:  version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "אין פקודה כזו (בהקשר הזה)."
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -685,55 +746,59 @@
 "התשמש ב-\"help &lt;פקודה&gt;\" לקבלת עזרה על פקודה ספציפית.\n"
 "להלן הפקודות שאפשריים בהקשר הנוכחי:\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;message&gt;:  שלח הודעה כרגיל, כאילו לא דרך פקודה."
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט פעולה נוסח IRC."
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;option&gt;:  שלח כל מיני רסיסי מידע לחלון שיחה הנוכחי."
 
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: נקה את תוכן חלון השיחה."
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  עזרה על פקודה ספציפית."
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users:  הצג את רשימת המשתמשים בצ'אט."
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins: : הצג את חלון התוספים."
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: הצג את רשימת החברים."
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts: הצג את חלון החשבונות."
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: הצג את חלון ניפוי הבאגים."
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs: הצג את חלון ההעדפות."
 
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: הצג את חלון המצבים-השמורים."
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "חלון ניפוי באגים"
 
@@ -741,18 +806,18 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "נקה"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "נפה: "
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
 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"
@@ -784,26 +849,26 @@
 msgstr "נשאר"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/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
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "מצב"
 
@@ -820,10 +885,10 @@
 msgstr "עצור"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "סגור"
 
@@ -853,68 +918,80 @@
 msgid "Transferring"
 msgstr "מעביר"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "דוא\"ל"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "יש לך דואר!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "מאת"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "הנדון"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) יש הודעה חדשה %d."
 msgstr[1] "%s (%s) יש %d הודעות חדשות."
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "דוא\"ל חדש"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "מידע עבור %s"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "מידע עבור איש הקשר"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "המשך"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "מידע"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "הודעה"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "הצטרף"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "הזמן"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(ללא)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "שגיאה"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "טעינת התוסף נכשלה"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "כיבוי התוסף נכשל"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -931,39 +1008,36 @@
 "אתר: %s\n"
 "קובץ: %s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "על התוסף להיות טעון לפני שניתן לשנות לו הגדרות."
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "עדיין צריך לעשות משהו בקשר לזה."
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "אין אפשרויות הגדרה לתוסף זה."
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "ניתן לטעון ולהשעות תוספים מן הרשימה שלהלן."
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "הגדר את התוסף"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "העדפות"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "הזן איש קשר שיש להגיב לפעילות שלו."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "צור תגובת פעילות חדשה"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "ערוך שינויים בתגובת פעילות"
 
@@ -973,8 +1047,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "חשבון:"
 
@@ -983,52 +1057,52 @@
 msgstr "שם איש הקשר:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "הפעל כאשר איש-קשר..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "מתחבר"
-
 #: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "מתנתק"
+msgid "Signs on"
+msgstr "מתחבר"
 
 #: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "מתנתק"
+
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "מתרחק/ת מהמחשב"
 
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "חוזר/ת למחשב"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "חסר/ת פעילות"
+msgid "Returns from away"
+msgstr "חוזר/ת למחשב"
 
 #: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "חסר/ת פעילות"
+
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "כבר לא חסר/ת פעילות"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "מתחיל/ה להקליד"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "עוצר בעת הקלדה"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "מפסיק/ה להקליד הודעה"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "שולח הודעה"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "פעולה"
 
@@ -1056,141 +1130,136 @@
 msgid "Pounce only when my status is not available"
 msgstr "הגב רק כאשר אני מסומן כלא זמין"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "חוזר"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "האם אתה בטוח שברצונך למחוק את התגובה על %s עבור %s?"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "תגובות פעילות"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s התחיל לכתוב לך הודעה (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s עצר בזמן כתיבת הודעה אליך (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s התחבר (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s חזר לפעילות (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s חזר למחשב (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s הפסיק להקליד לך הודעה (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s התנתק (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s חסר פעילות (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s התרחק/ה מהמחשב. (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s שלך לך הודעה. (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "אירעה פעילות לא מוכרת. אנא דווח על כך!"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "על-פי פעילות מקלדת"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "מזמן שליחת ההודעה האחרונה"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "לעולם לא"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "הצג זמן חוסר פעילות"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "הצג חברים מנותקים"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "הצג חתימות-זמן"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "הודע לאנשי קשר בעת שאת/ה מקליד"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "מבנה הרישום"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "רשום הודעות מיידיות"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "רשום שיחות"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "רשום את כל שינויי הסטטוס"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "שיחות"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "רישום"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "העדפות"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "טרם יושם."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "שמירה בשם..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "פתח..."
 
@@ -1203,102 +1272,102 @@
 msgid "Delete Status"
 msgstr "מחק מצב"
 
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "סטטוסים נשמרו"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "תואר"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "סוג"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/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/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "הודעה"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "השתמש"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "כותרת לא-תקפה"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "יש להזין כותרת לא-ריקה עבור המצב."
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "כפילות בכותרות"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "יש להזין כותרת שונה עבור המצב."
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "תת-מצב"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "מצב:"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "הודעה:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "ערוך מצב"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "השתמש בסטטוס שונה עבור החשבונות הבאים"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "שמור והשתמש"
 
@@ -1318,67 +1387,66 @@
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
-msgstr ""
-"כאשר תוכן לוח ההעתקה של gnt משתנה, התוכן גם נעשה זמין עבור X, אם ניתן."
-
-#: ../finch/plugins/gntgf.c:209
+msgstr "כאשר תוכן לוח ההעתקה של gnt משתנה, התוכן גם נעשה זמין עבור X, אם ניתן."
+
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s כרגע התחבר"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s כרגע התנתק"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s שלך לך הודעה"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s אמר את השם-כינוי שלך בתוך %s"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s שלך לך הודעה בתוך %s"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "איש קשר מתחבר/מתנתק"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "את/ה מקבל/ת הודעה מיידית"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "מישהו מדבר בשיחה"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "מישהו מזכיר את שמך בשיחה"
 
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "התרעה עם טוסטר כאשר"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "גם צפצף!"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "קבע כדחוף בחלון הטרמינל"
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "תוסף טוסטר"
 
@@ -1432,83 +1500,84 @@
 msgid "Lastlog plugin."
 msgstr "תוסף Lastlog."
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "חשבונות"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "ססמתך נחוצה להתחברות."
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "הזן סיסמה עבור %s (%s)"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "הזן סיסמא"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "שמור חדשה"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "חסר תוסף הפרוטוקול עבור %s"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "הסיסמה החדשה ווידואה אינם תואמים."
 
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "יש למלא את כל שדות הטופס."
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "סיסמא מקורית"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "סיסמה חדשה"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "ודא סיסמה חדשה"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "שנה סיסמא עבור %s"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "אנא הזן את סיסמתך הנוכחית וסיסמתך החדשה:"
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "שנה פרטי משתמש עבור %s"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "מידע כללי על המשתמש"
 
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "אנשי קשר"
@@ -1532,7 +1601,7 @@
 msgstr "+++ %s התנתק"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1555,40 +1624,40 @@
 msgid "Unable to send message."
 msgstr "לא ניתן לשלוח הודעה"
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "שלח הודעה"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "שלח הודעה"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s נכנס לחדר"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] נכנס לחדר."
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "%s ידוע כעת בשם אתה"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ידוע כעת בשם %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s עזב את החדר"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s עזב את החדר (%s)."
@@ -1608,6 +1677,10 @@
 msgid "Failed to get serv name: %s"
 msgstr "כישלון בהשגת שם שרת: %s"
 
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "שרת ה- D-BUS של Purple אינה פועלת עקב הסיבות שלהלן"
+
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "ללא שם"
@@ -1657,7 +1730,7 @@
 msgid "Unknown reason"
 msgstr "סיבה לא ידועה"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1701,22 +1774,22 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s אינו קובץ רגיל. מסרב בפחדנות לכתוב עליו.\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s רוצה לשלוח לך %s (%s)"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s רוצה לשלוח לך קובץ"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "האם ברצונך לקבל את הבקשה להעברת קובץ מ-%s?"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1727,60 +1800,60 @@
 "שרת מרוחק: %s\n"
 "יציאה מרוחקת: %d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s מציע/ה לשלוח קובץ %s"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s אינו שם חוקי לקובץ.\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "מציע לשלוח %s ל-%s"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "מתחיל את ההעברה של %s מ-%s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "העברה של קובץ %s הושלמה"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "הושלמה העברת הקובץ"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "ביטלת את העברת %s"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "העברת הקובץ בוטלה"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ביטל את העברת %s"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ביטל את העברת הקובץ"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "העברת הקובץ ל-%s נכשלה."
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "העברת הקובץ מ-%s נכשלה."
@@ -2073,41 +2146,41 @@
 msgid "Set Autoaccept Setting"
 msgstr "קבע הגדרות אישור קבלה אוטומטי"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "שמור"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "ביטול"
 
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "שאל"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "אשר אוטומטית"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "התחבר מחדש בצורה אוטומטית"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "אשר העברת קבצים אוטומטית..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2115,11 +2188,11 @@
 "נתיב לשמור בו את הקבצים\n"
 "(יש לספק נתיב מלא)"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "דחה אוטומטית ממשתמשים שאינם ברשימת החברים שלי"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2127,108 +2200,8 @@
 "הצג התרעה לאחר שהעברת קובץ שאושר אוטומטית הסתיימה\n"
 "(רק כאשר אין שיחה עם השולח)"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "מענה אוטומטי לכל הפרוטוקולים"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"תוסף זה מאפשר קביעת הודעת מענה אוטומטי לכל פרוטוקול. ניתן לקבוע הודעת מענה "
-"גלובאלית מתוך חלון הגדרות התוספים. לקביעת הודעת מענה עבור איש-קשר מסויים, יש "
-"ללחוץ כפתור ימני על אותו איש קשר בחלון רשימת אנשי הקשר. לקביעת הודעות מענה "
-"עבור חשבון מסויים, יש לגשת לכרטיסיית ה'מתקדם' של חלון עריכת החשבון."
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "קבע הודעת מענה אוטומטי עבור %s"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "קבע הודעת מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-"ההודעה להלן תישלח אל איש הקשר כאשר הוא שולח הודעה אליך, והמענה האוטומטי פעיל."
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "קבע הודעת מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "הודעת מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "שלח הודעות מענה אוטומטי כאשר"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "כאשר החשבון שלי מרוחק"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "כאשר החשבון שלי חסר פעילות"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "מענה ברירת מחדל"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "הודעת מצב"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "ענה אוטומטית עם הודעת המצב"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "תמיד כאשר יש הודעת מצב"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "רק כאשר אין הודעת מענה אוטומטי"
-
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "השהייה בין מענים אוטומטיים"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "השהייה מינימלית (בדקות)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "פעמים לשלוח מענות אוטומטיים"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "מירב הפעמים"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr "אינני זמין כרגע. אנא השאר/י לי את הודעתך, ואני אחזור אליך בהקדם."
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "הערות"
 
@@ -2236,10 +2209,12 @@
 msgid "Enter your notes below..."
 msgstr "הזן את הערותיך להלן..."
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "ערוך הערות..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2256,7 +2231,7 @@
 msgid "Store notes on particular buddies."
 msgstr "אחסן הערות על אנשי-קשר מסויימים"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "מוסיף את האפשרות לרשום הערות על אנשי הקשר ברשימתך."
@@ -2316,46 +2291,46 @@
 msgid "Allows control by entering commands in a file."
 msgstr "מאפשר שליטה ע\"י הכנסת פקודות לקובץ."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "דקות"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "אני רוצה לנוח"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "קבע את זמן חוסר פעילות של החשבון"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_קבע"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "אף אחד מן החשבונות שלך חסר-פעילות."
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "בטל את זמן חוסר פעילות של החשבון"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "ב_טל"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "קבע את זמן חוסר הפעילות עבור כל החשבונות"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "בטל את זמן חוסר הפעילות עבור כל החשבונות"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "מאפשר להגדיר ידנית כמה זמן החשבון בחוסר פעילות"
 
@@ -2425,19 +2400,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "הסתרת הצטרפות/עזיבה"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "מסתיר הודעות הצטרפות/עזיבה לא נחוצות."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2554,19 +2529,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "הצופה ביומנים"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "כלול יומנים של תוכנות צ'אט אחרות בצופה-היומנים."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2580,12 +2555,12 @@
 "אזהרה: תוסף זה עדיין בשלבי פיתוח מוקדמים וייתכן ויקרוס לעיתים קרובות.  יש "
 "להשתמש בו על חשבון סיכונך האישי בלבד!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "אשף הטענת תוספי Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "טוען תוספי .NET עם Mono."
 
@@ -2608,7 +2583,7 @@
 msgid "Prepends a newline to displayed message."
 msgstr "מוסיף שורה חדשה לפני הודעה מוצגת."
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2650,31 +2625,31 @@
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "ניתן לערוך/למחוק את תגובת-הפעילות מתוך חלון תגובות-הפעילות"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "כן"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "לא"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "שמור הודעות לא-מקוונות בתגובת-פעילות"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "אל תשאל. תמיד שמור בתגובת פעילות."
 
@@ -2684,50 +2659,50 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "תוסף להפעלת תוכנות Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "מאפשר טעינה של תוספי Perl."
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "מצב מנבא-עתידות"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "מצב מנבא-עתידות לשיחות נכנסות"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "גורם לחלונות-שיחה להופיע כבר כאשר אנשי קשר מתחילים לכתוב הודעה.  זה עובד "
-"עבור AIM, ICQ, Jabber, Sametime, Yahoo!"
-
-#: ../libpurple/plugins/psychic.c:66
+"עבור AIM, ICQ, XMPP, Sametime, Yahoo!"
+
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "אתה מרגיש הפרעה בכוח..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "אפשר רק עבור משתמשים ברשימת אנשי-הקשר שלי"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "כבה כאשר מרוחק מהמחשב"
 
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "הצג הודעת התרעה בשיחות"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "הצג שיחות מנובאות"
 
@@ -2792,7 +2767,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2800,8 +2775,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "מספק תמיכה ב-SSL דרך GNUTLS."
 
@@ -2811,7 +2786,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -2819,8 +2794,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "מספק תמיכה ב-SSL דרך מוזילה NSS."
 
@@ -2871,7 +2846,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "התרעות על מצב אנשי הקשר"
 
@@ -2879,8 +2854,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -2888,15 +2863,15 @@
 "מודיע בחלון השיחה כאשר איש הקשר מתרחק מהמתחשב, עובר למצב של חוזר פעילות, או "
 "חוזר."
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "מטעין לתוספי Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "מספק תמיכה לטעינת תוספי Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2918,18 +2893,18 @@
 #. * 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
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "רחוק מהמחשב"
 
@@ -2943,51 +2918,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "תוסף פרוטוקול Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "אדם סגול"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "שם שרת"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "שם פרטי"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "שם משפחה"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "דוא\"ל"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "חשבון AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "חשבון Jabber"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "חשבון XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -3070,67 +3045,67 @@
 msgid "Save buddylist..."
 msgstr "שמור את רשימת אנשי הקשר..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "יש למלא את שדות ההרשמה."
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "לא ניתן לבצע הרשמה לחשבון חדש. אירעה שגיאה.\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "הושלמה ההרשמה לחשבון החדש של Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "הרישום בוצע בהצלחה"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "סיסמה"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "סיסמא )שוב("
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "הזן ערך נוכחי"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "ערך נוכחי"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "בצע רישום לחשבון חדש של Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "יש למלא את השדות הבאים"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "עיר"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "שנת לידה"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../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
@@ -3138,219 +3113,219 @@
 msgid "Gender"
 msgstr "מין"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "זכר או נקבה"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "זכר"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "נקבה"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "רק כשמחובר"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "חפש אנשי קשר"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "יש להזין את הגדרות החיפוש להלן"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "יש למלא את השדות."
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "הסיסמא הנוכחית שלך שונה מזו שהוזנה."
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "לא ניתן לשנות את הסיסמה. אירעה שגיאה.\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "שנה סיסמא עבור חשבון ה-Gadu-Gadu."
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "הסיסמא שונתה בהצלחה!"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "סיסמא נוכחית"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "יש להזין את סיסמתך הנוכחית וסיסמתך החדשה עבור משתמש מספר: "
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "שינוי סיסמת Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "בחר צ'אט עבור איש הקשר: %s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "הוסף לשיחה..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "מנותק"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "זמין"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "מספר זיהוי"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "שם פרטי"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "שנת לידה"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "לא ניתן להציג את תוצאות החיפוש."
 
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "מדריך ציבורי ל-Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "תוצאות חיפוש"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "לא נמצאו משתמשים תואמים"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "לא נמצאו משתמשים התואמים לקריטריוני החיפוש שלך."
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "אין אפשרות לקרוא את השקע"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "רשימת אנשי הקשר הועתקה"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "רשימת אנשי הקשר שלך הועתקה מן השרת."
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "רשימת אנשי הקשר נשלחה"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "רשימת אנשי הקשר שלך אוכסנה על השרת"
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "ההתחברות נכשלה."
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "חסום"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "הוסף לשיחה"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "הסר חסימה"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "חסום"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "שם _צ'אט:"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "שגיאה בצ'אט"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "שם הצ'אט הזה כבר בשימוש"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "לא מחובר לשרת."
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "חפש אנשי קשר..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
-msgid "Change password..."
-msgstr "שנה סיסמא..."
-
-#: ../libpurple/protocols/gg/gg.c:2020
-msgid "Upload buddylist to Server"
-msgstr "שלח את רשימת אנשי הקשר לשרת"
-
 #: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "שנה סיסמא..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
+msgid "Upload buddylist to Server"
+msgstr "שלח את רשימת אנשי הקשר לשרת"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "שלוף את רשימת אנשי הקשר מהשרת"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "מחק את רשימת אנשי קשר מהשרת"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "שמור את רשימת אנשי הקשר לקובץ..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "טען את רשימת אנשי הקשר מקובץ..."
 
@@ -3365,35 +3340,35 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "תוסף פרוטוקול Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "מערכת הודעות פופולרית בפולין"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "משתמש Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "פקודה בלתי מוכרת: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "הנושא הוא: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "אין כותרת"
 
@@ -3428,7 +3403,7 @@
 msgstr "הודעת היום עבור %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "השרת התנתק"
 
@@ -3451,59 +3426,59 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "מתחבר"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "אין תמיכה ב-SSL."
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
-msgstr "אין אפשרות ליצור שקע "
-
-#: ../libpurple/protocols/irc/irc.c:402
+msgstr "אין אפשרות ליצור שקע"
+
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "לא ניתן להתחבר לשרת"
 
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "ההתחברות נכשלה"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "כשל בלחיצת היד של SSL"
 
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "שגיאה בקריאה"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "משתמשים"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3517,56 +3492,55 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "תוסף פרוטוקול IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "תוסף פרוטוקול IRC שפחות מבאס"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "שרת"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "י_ציאה"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "קידוד"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "שם משתמש"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "שם אמיתי"
 
@@ -3574,223 +3548,223 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "השתמש ב-SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "מצב לא תקין"
 
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "מחסמה גישתך ל %s/"
 
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "חסום"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "לא ניתן לחסום %s: רשימת החסימה מלאה"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(שוטר צא'ט)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(מזוהה)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "כינוי"
 
-#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "כרגע ב-"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "לא פעיל כבר"
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "מחובר מאז"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>התואר המגדיר:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "מרומם"
 
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s שינה את הנושא להיות: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s איפס את הנושא."
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "הנושא של %s הוא: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "הודעת לא מוכרת '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "הודעת לא מוכרת"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "שרת ה-IRC קיבל הודעה שלא הבין."
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "משתמשים ב-%s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "מענה זמן"
 
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "השעה מקומית אצל שרת ה-IRC היא:"
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "אין כזה ערוץ"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "אין כזה ערוץ"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "המשתמש לא מחובר"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "לא קיים כזה משתמש או ערוץ"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "שליחת המסר נכשלה"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "הצטרפות ל %s דורשת הזמנה."
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "בהזמנה בלבד"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "נבעטת ע\"י: %s (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "נבעט ע\"י %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "מצב (%s %s) ע\"י %s"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
 msgstr "שם המשתמש לא חוקי"
 
-#: ../libpurple/protocols/irc/msgs.c:888
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "הכינוי שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "שם החשבון שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "כשל בשינוי הכינוי"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "אין אפשרות לשנות כינוי"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "עזבת את הערוץ%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "שגיאה: התקבל PONG לא תקף מהשרת"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "מענה PING – בהשהייה של: %lu שניות"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
-#, c-format
-msgid "Cannot join %s:"
-msgstr "לא ניתן להצטרף ל %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "לא ניתן להצטרף אל %s: דרושה הרשמה."
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "לא ניתן להצטרף לערוץ"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "שם הכינוי או הערוץ לא זמינים כרגע."
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "כאפה מ-%s"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;פעולה לביצוע&gt;: פעל פעולה ."
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
 "away [הודעה]:  קבע הודעת ריחוק מהמחשב, או השתמש ללא הודעה לחזור לזמינות."
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: שלח פקודה אל chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3798,7 +3772,7 @@
 "deop &lt;שם1&gt1; [שם2] ...:  הסר סטטוס של מפעיל הערוץ ממישהו. חובה להיות "
 "מפעיל ערוץ כדי לבצע פעולה זו."
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3808,7 +3782,7 @@
 "מהם לדבר אם הערוץ במצב של תיווך (+m). חובה להיות מפעיל ערוץ כדי לבצע פעולה "
 "זו."
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3816,7 +3790,7 @@
 "invite &lt;שם&gt; [חדר]:  הזמן מישהו להצטרף אליך בערוץ הנתון, או בערוץ "
 "הנוכחי."
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3824,7 +3798,7 @@
 "j &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם "
 "אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3832,7 +3806,7 @@
 "join &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, "
 "עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3840,7 +3814,7 @@
 "kick &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מהערוץ. צריך להיות מפעיל הערוץ כדי "
 "לעשות זאת."
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3848,15 +3822,15 @@
 "list: הצג רשימה של חדרי צ'אט ברשת. <i>אזהרה, יש שרתים שינתקו אותך ברגע ביצוע "
 "פעולה זו.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;פעולה לביצוע&gt;:  בצע פעולה"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: שלח פקודה אל memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -3864,27 +3838,27 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;שם כינוי|ערוץ&gt;:  קבע או הסר מצבי ערוץ "
 "או משתמש."
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:135
 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;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [ערוץ]:  הצג את רשימת המשתמשים שכרגע בערוץ."
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;כינוי חדש&gt;:  שינוי שם הכינוי שלך."
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: שלח פקודה אל nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3892,7 +3866,7 @@
 "op &lt;שם כינוי1&gt; [שם כינוי2] ...:  נותן סטטוס של מפעיל ערוץ למישהו. עליך "
 "להיות מפעיל ערוץ לבצע פעולה זו."
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3900,18 +3874,18 @@
 "operwall &lt;הודעה&gt;:  אם אינך יודע/ת מה זה עושה, כנראה את/ה לא יכול/ה "
 "להשתמש בזה."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr " operserv: שלח פקודה אל operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 "part [חדר] [הודעה]:  עזוב את החדר הנוכחי, או חדר מסויים, עם אפשרות להודעה."
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3919,22 +3893,22 @@
 "ping [שם כינוי]:  שואל כמה איטית התגובה של משתמש (או של השרת אם לא צויין "
 "משתמש."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:144
 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;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [הודעה]:  התנתקות מהשרת, עם אפשרות להודעה."
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  שלח פקודה ישירות לשרת."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -3942,23 +3916,23 @@
 "remove &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מחדר. צריך להיות מפעיל הערוץ "
 "לבצע פעולה זו."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: מציג את השעה המקומית בשרת ה-IRC."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [נושא חדש]:  הצג או שנה את נושא הערוץ."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  קבע או הסר מצב משתמש."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [שם כינוי]: שלח בקשה CTCP VERSION למשתמש"
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -3966,155 +3940,161 @@
 "voice &lt;שם כינוי1&gt; [שם כינוי2] ...:  תן סטטוס דיבור למישהו. חובה להיות "
 "מפעיל הערוץ לבצע פעולה זו."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;הודעה&gt;:  אם אינך יודע/ת מה זה, את/ה כנראה לא יכול להשתמש בזה."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [שרת] &lt;שם כינוי&gt;:  השג מידע על משתמש."
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;שם כינוי&gt;:  השג מידע על משתמש שהתנתק."
+
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "זמן מענה מ-%s: %lu שניות"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "פונג"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "מענה CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "מנותק."
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "השרת דורש TLS/SSL להתחברות. לא נמצאה תמיכה ל-TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "השרת לא היה מסוגל לאמת אותך ללא סיסמא"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "%s דורש אימות לא מוצפן מעל תקשורת לא מוצפנת. לאפשר ולהמשיך בכל זאת?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "אימות לא מוצפן"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "השרת לא תומך באימות באף תצורה"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "שגיעה בתגובה מהשרת"
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת.להמשיך בכל זאת?"
 
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
-msgid "Server does not use any supported authentication method"
-msgstr "השרת לא תומך באימות באף תצורה"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "שגיעה בתגובה מהשרת"
-
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "תשובת אימות לא תקפה מהשרת"
 
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "שגיאת SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "שם מלא"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "שם משפחה"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "שם פרטי"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "קישור"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "כתובת"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "מידע כתובת מורחב"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "מיקום"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "איזור"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "מיקוד"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "מדינה"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "טלפון"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4122,152 +4102,152 @@
 msgstr "דואר"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "שם האירגון"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "מחלקה"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "תפקיד"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "יום הולדת"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "תיאור"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "ערוך את ב-Jabber vCard"
-
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
+msgid "Edit XMPP vCard"
+msgstr "ערוך את ה- XMPP vCard"
+
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "כל הפריטים להלן הם בחירה. יש להזין רק את המידע שאת/ה מרגיש/ה נוח לתת."
 
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "לקוח"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "מערכת הפעלה"
 
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr "משאב"
 
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "עדיפות"
 
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "שם אמצעי"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "כתובת"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "תיבת דואר"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "תצלום"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "סמל"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "הצג תבנית"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "הסתר את התבנית זמנית"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "בטל התרעת נוכחות"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "בקש אימות (מחדש)"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
-msgstr "בטל את המנוי "
-
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+msgstr "בטל את המנוי"
+
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "פטפטן"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "העדרות ממושכת"
 
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "נא לא להפריע"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "שם משפחה"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "להלן תוצאות החיפוש שלך"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4275,68 +4255,68 @@
 "מצא איש קשר על ידי הזנן קריטריונים לחיפוש בשדות הנתונים. הערה: כל שדה תומך "
 "בחיפושים עם אותיות חלופיות (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "שגיאה בשאילתת הספרייה"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "לא ניתן לתשאל את שרת הספרייה"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "הנחיות שרת: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "יש להזין אחד או יותר מן השדות לביצוע חיפוש של משתמשי Jabber מתאימים."
-
 #: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "יש להזין אחד או יותר מן השדות לביצוע חיפוש של משתמשי XMPP מתאימים."
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "כתובת דוא\"ל"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "חפש משתמשי Jabber"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "חיפוש משתמשי XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "ספרייה לא חוקית"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "כנס לספריית משתמש"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "בחר ספריית משתמש לחיפוש"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "חפש בספרייה"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_חדר:"
@@ -4349,80 +4329,80 @@
 msgid "_Handle:"
 msgstr "כ_ינוי:"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s אינו שם חדר תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "שם החדר אינו תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s אינו שם תקף לשרת"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "שם שרת לא תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s אינו כינוי-חדר תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "כינוי-חדר לא תקף"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "שגיאת הגדרות"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "לא ניתן לבצע הגדרה"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "שגיאה בהגדרות החדר"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "לא ניתן לשנות הגדרות חדר זה"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "שגיאת הרשמה"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "לא ניתן לשנות את כינוי המשתמש בחדרי צ'אט של מסוג MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "שגיאה בעת הורדת רשימת החדרים"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "שם השרת אינו תקין"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "יש להזין שרת ועידה"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "יש לבחור שרת ועידה לתישאול"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "חפש חדרים"
 
@@ -4445,416 +4425,420 @@
 msgid "Unable to create socket"
 msgstr "אין אפשרות ליצור שקע"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "זיהוי משתמש Jabber לא תקין"
-
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "מזהה XMPP לא תקין"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "מזהה XMPP שגוי. יש להגדיר את הדומיין."
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "הרישום של %s@%s בוצע בהצלחה"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "רישום בוצע בהצלחה"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "שגיאה לא ידועה"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "הרישום נכשל"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "הכינוי כבר רשום."
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "מחוז"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "מיקוד"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "טלפון"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "תאריך"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr ".יש להזין את המידע להלן כדי לרשום את החשבון החדש שלך"
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "רשום חשבון Jabber חדש"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "רשום חשבון XMPP חדש"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "הרשם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "מאתחל זרם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "מאמת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "מאתחל את הזרם מחדש"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "לא מורשה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "שניהם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "מאת (אל מושהה)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "אל"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "אין (אל מושהה)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "ללא"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "מנוי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "סיסמה שונתה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "הסיסמה שלך שונתה."
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "שגיאה במהלך שינוי הסיסמה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "סיסמא (שנית)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "הסיסמה שלך שונתה בהצלחה"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "שנה סיסמת XMPP"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "הזן את הסיסמה החדשה שלך."
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "קבע את המידע על המשתמש..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "שנה סיסמא..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "_חפש משתמשים..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "בקשה שגויה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "התנגשות"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "טרם יושם."
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "אסור"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "לא-נמצא"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "שגיאה פנימית בשרת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "פריט לא נמצא"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "זיהוי משתמש Jabber לא תקין"
-
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "זיהוי משתמש XMPP לא תקין"
+
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "לא קביל"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "לא מורשה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "נדרש תשלום"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "נמען לא זמין"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "נדרשת הרשמה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "שרת לא נמצא"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "תם הזמן המוקצב לתקשורת שרת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "עומס יתר על השרת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "השירות אינו זמין"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "נדרש מנוי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "בקשה לא צפוייה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "אימות בוטל"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "קידוד שגוי באימות"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "authzid לא תקף"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "מנגנון האימות לא תקף"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "מנגנון האימות חלש מדי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "כשל זמני באימות"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "כשל באימות"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "מבנה לא תקין"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "נתיב הקשר-שם שגוי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "התנגשויות משאבים"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "אזל הזמן המוקצב לחיבור"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "המארח נעלם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "מארח לא מוכר"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "כיתובת לא נכונה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "זיהוי לא תקין"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "הקשר-שם לא תקף"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "XML שגוי"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "מארחים לא תואמים"
 
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "חילול ההסכם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "שגיאת תקשורת בצד המרוחק"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "הגבלת משאבים"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML מוגבל"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "צפה במארח אחר"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "כיבוי המערכת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "מקרה לא מוגדר מראש"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "קידוד שלא נתמך"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "סוג סטנזה שלא נתמכת"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "גירסא ללא תמיכה"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML לא מובנה נכון"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "שגיאה בזרם"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "לא ניתן לחסום משתמש %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "ייחוס לא מוכר: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "לא ניתן לייחס את משתמש %s בתור \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "תפקיד לא מוכר: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "לא ניתן לקבוע תפקיד \"%s\" עבור משתמש: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "לא ניתן לבעוט במשתמש %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:  קבע הגדרות חדר צ'אט."
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  קבע הגדרות חדר צ'אט."
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [חדר]:  עזוב את החדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:  הרשם בחדר צ'אט."
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [נושא חדש]:  הצג או שנה את הנושא."
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;משתמש&gt; [חדר]:  חסום משתמש מן החדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4862,7 +4846,7 @@
 "affiliate &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt;: קביעת ייחוס משתמש "
 "עם החדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4870,19 +4854,19 @@
 "role &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt;: קביעת ייחוס משתמש עם "
 "החדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;משתמש&gt; [חדר]:  הזמן משתמש לחדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;חדר&gt; [שרת]:  הצטרף לצ'אט בשרת זה."
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;משתמש&gt; [חדר]:  בעט משתמש מהחדר."
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש אחר."
@@ -4897,55 +4881,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "תוסף פרוטוקול Jabber"
-
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
+msgid "XMPP Protocol Plugin"
+msgstr "תוסף פרוטוקול XMPP"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "דומיין"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "אלץ שימוש ב-SSL ישן )יציאה 5223("
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "אפשר אישרור לא מוצפן בתקשורת לא מוצפנת"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "יציאת ההתחברות"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "שרת ההתחברות"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s עזב את השיחה."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "הודעה מ-%s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s שינה את הנושא להיות: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "הנושא הוא: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "תקלה במשלוח הודעה אל %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "הודעת שגיאה לא מוכרת (Jabber)"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "הודעת שגיאת XMPP"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr "(קוד %s)"
@@ -4954,36 +4948,36 @@
 msgid "XML Parse error"
 msgstr "שגיאת פיענוח XML"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "שגיאה לא מוכרת בנוכחות"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "צור חדר חדש"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 "החדר החדש שיצרת. האם ברצונך לשנות את ההגדרות שלו, או לקבל את ברירות המחדל?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "הגדרות החדר"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "קבל את ברירות המחדל"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "שגיאה בשיחה %s"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "שגיאה בהצטרפות לצ'אט %s"
@@ -5212,7 +5206,7 @@
 msgstr "השרת עסוק מדי"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5248,39 +5242,39 @@
 msgid "MSN Error: %s\n"
 msgstr "שגיאת MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "כרגע שלחת דחיפה קלה!"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "השם הידידותי החדש שלך ל-MSN ארוך מדי."
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "קבע/י את שמך הידידותי."
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "זהו השם שאותו יראו אנשי הקשר שלך ב-MSN."
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "קבע/י את מספר הטלפון בבית."
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr ". קבע/י את מספר הטלפון בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "קבע/י את מספר הטלפון הנייד."
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "אפשר הודעות לנייד מ-MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323
 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?"
@@ -5288,316 +5282,315 @@
 "האם ברצונך לאפשר או לא לאפשר לאנשים מרשימת אנשי הקשר שלך לשלוח לך הודעות "
 "לטלפון הנייד או שאר מכשירים ניידים?"
 
-#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "אפשר"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "אל תאפשר"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "ייתכן וחשבון ה-Hotmail הזה אינו פעיל."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "שלח בתור הודעה לנייד."
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "דף"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "יש אותך"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
-msgstr "חוזר עוד שניה"
-
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
+msgstr "מיד אשוב"
+
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "משוחח בטלפון"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "יצא לאכול"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "קבע/י שם ידידותי..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "קבע/י מספר טלפון בבית..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "קבע/י מספר טלפון בעבודה..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "קבע/י מספר טלפון נייד..."
 
-#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "אפשר/בטל מכשירים ניידים..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "אפשר/בטל הודעות למכשירים ניידים..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "פתח את תיבת הדואר של Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "שלח למכשיר נייד"
 
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "יז_ום שיחה"
 
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת."
-
-#: ../libpurple/protocols/msn/msn.c:719
+msgstr "נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת."
+
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "כשל בהתחברות לשרת"
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "שגיאה בשליפת הפרופיל"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "כללי"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "גיל"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "עיסוק"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../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
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "מיקום"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "תחביבים ותחומי עניין"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "קצת אודותיי"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "חברתי"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "מצב משפחתי"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "תחומי עניין"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "חיות מחמד"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr "עיר המולדת"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "ערי מגורים"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "אופנה"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "הומור"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "מוסיקה"
 
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "ציטוט אהוב"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "מידע על איש הקשר"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "אישי"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "בן/בת-זוג"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "טלפון בבית"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "טלפון בבית 2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "כתובת בבית"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
 msgstr "טלפון נייד"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "פקס בבית"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "דוא\"ל אישי"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "IM אישי"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "יום נישואין"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "תואר"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "חברה"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "מחלקה"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "מקצוע"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "טלפון בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "טלפון בעבודה 2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "כתובת העבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
 msgstr "טלפון נייד בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
 msgstr "ביפר בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "פקס בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "דוא\"ל בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "IM בעבודה"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "תאריך תחילה"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "דברים מועדפים"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "עודכן לאחרונה"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "כתובת אתר בית"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "המשתמש לא יצר פרופיל ציבורי."
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1805
 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 "
@@ -5606,13 +5599,13 @@
 "MSN דיווחה שלא יכלה למצוא את פרופיל המשתמש. זאת אומרת שהמשתמש לא קיים, או "
 "שהמשתמש קיים אך לא יצר פרופיל ציבורי."
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr "לא יכול למצוא מידע בתוך פרופיל המשתמש. ככל הנראה המשתמש לא קיים."
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL לפרופיל"
@@ -5627,19 +5620,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "תוסף פרוטוקול MSN"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "השתמש בשיטת HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
 msgstr "הצג סמייליים שלי"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: שלח דחיפה לאיש קשר כדי להשיג את תשומת ליבם"
 
@@ -5708,15 +5701,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "השירות אינו זמין כרגע."
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "אין אפשרות לשנות את שם הקבוצה"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "אין אפשרות למחוק את הקבוצה"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5769,8 +5762,8 @@
 msgstr "שגיאה בפיענוח HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "אתה התחברת ממיקום נוסף."
 
@@ -5878,127 +5871,127 @@
 msgid "The screen name specified is invalid."
 msgstr "השם שניתן לתצוגה אינו חוקי."
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "פרמטרים נחוצים לא הועברו"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "לא ניתן לכתוב לרשת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "לא ניתן לקרוא מהרשת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "שגיאה בתקשורת עם השרת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "ועידה לא נמצאה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "ועידה לא קיימת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "תיקיה עם שם זה כבר קיימת"
 
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
-msgstr "לא נתמך "
-
-#: ../libpurple/protocols/novell/nmuser.c:1905
+msgstr "לא נתמך"
+
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "פג תוקף סיסמתך"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "סיסמה לא נכונה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "המשתמש לא נמצא"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "החשבון בוטל"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "השרת לא יכל לגשת לספרייה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "מנהל המערכת שלך ביטל שימוש בפעולה זו"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "השרת לא זמין; יש לנסות מאוחר יותר"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "לא ניתן להוסיף איש קשר לאותה תיקייה פעמיים"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "לא ניתן להוסיף את עצמך"
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "הארכיון הראשי מוגדר בצורה לא נכונה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "שם משתמש או סיסמה שגויים"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "לא מזהה את השרת עבור המשתמש שהוזן"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "חשבונך הושעה  עקב ריבוי הזנת סיסמאות שגויות"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "לא ניתן להוסיף פעמיים את אותו אדם לשיחה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "מילאת את מיכסת אנשי-הקשר שניתנה לך"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "הזנת שם משתמש שגוי"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "שגיאה בעת עידכון הספרייה"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "גירסת לא תואמת של הפרוטוקול"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "משתמש זה חסם אותך"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "גירסת הניסוי הזו אינה מאפשרת ליותר מ-10 משתמשים להתחבר בו זמנית"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "משתמש זה לא מחובר או שאתה חסום"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "שגיאה לא מוכרת: 0x%X"
@@ -6085,7 +6078,7 @@
 msgstr "לא ניתן להסיר את %s מרשימת הפרטיות (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "לא ניתן לשנות את הגדרות הפרטיות בשרת (%s)."
@@ -6096,7 +6089,7 @@
 msgstr "אין אפשרות ליצור ועידה (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "שגיאה בתקשורת עם השרת. סוגר את החיבור."
 
@@ -6112,8 +6105,8 @@
 msgid "Mailstop"
 msgstr "תחנת דואר"
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "שם משתמש"
 
@@ -6123,41 +6116,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "שם מלא"
 
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "ועידת GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "לא ניתן לבצע חיבור SSL לשרת."
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "מאמת..."
 
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "לא ניתן להתחבר לשרת"
+
 #: ../libpurple/protocols/novell/novell.c:1735
-msgid "Unable to connect to server."
-msgstr "לא ניתן להתחבר לשרת"
-
-#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "ממתין לתשובה..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s הוזמן לשיחה זו."
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "הזמנה לשיחה"
 
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6168,16 +6161,16 @@
 "\n"
 "נשלחה: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "האם ברצונך להצטרף לשיחה?"
 
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "נותקת כיוון שהתחברת ממחשב אחר."
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6187,17 +6180,17 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת שברצונך להתחבר אליו."
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "שגיאה. לא מותקנת תמיכה ב-SSL."
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ועידה זו נסגרה. לא ניתן לשלוח עוד הודעות."
 
@@ -6211,22 +6204,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "תוסף תקשורת ב-Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "כתובת שרת"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "פורט השרת"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
 #: ../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
@@ -6234,8 +6227,8 @@
 msgstr "השרת סגר את החיבור."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6272,8 +6265,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "תוסף פרוטוקולים AIM"
 
@@ -6287,14 +6280,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "תוסף פרוטוקול ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "קידוד"
 
@@ -6424,7 +6417,7 @@
 msgid "Not while on AOL"
 msgstr "לא בזמן שהות ב-AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 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 "
@@ -6435,7 +6428,7 @@
 "מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות "
 "המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6445,144 +6438,144 @@
 "יש תוכנה עם באגים.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "סמל איש הקשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "קול"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "הודעות ישירות של AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "שיחה"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "קבל קובץ"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "משחקים"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "תוספות"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "שלח רשימת אנשי הקשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "חיבור ישיר של ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "AP משתמש"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "כופר במוסכמות"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ניתוב שרת ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 ישן"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "הצפנת טריליאן"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "הטופ שבפופ"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "אבטחה מופעלת"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "שיחת וידאו"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat אור-קולי"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "שידור חי"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "מצלמה"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "פנוי לשיחה"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "לא זמין"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "עסוק"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "מודע רשת"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "בלתי נראה"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "מחובר"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "כתובת IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "רמת אזהרה"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "הערת איש קשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6591,7 +6584,7 @@
 "לא ניתן להתחבר לשרת האימות:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6600,20 +6593,20 @@
 "לא ניתן להתחבר לשרת ה-BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "נשלח שם המשתמש"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "חיבור הושלם, נשלח cookie."
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "מבצע גימור לחיבור"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6624,28 +6617,29 @@
 "משתמשים חייבים אחת להתחיל באות ולהכיל רק אותיות מספרים ורווחים, או לחילופין, "
 "להכיל אך ורק מספרים."
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "שם לתצוגה לא תקין."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "סיסמה לא נכונה."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "חשבונך מושעה כרגע."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "שירות ההודעות של AOL לא זמין כרגע."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 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."
@@ -6653,99 +6647,99 @@
 "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
 "תיאלץ להמתין אפילו יותר."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "גירסת תוכנת הלקוח בה את/ה משתמש/ת ישנה מדי. אנא שדרג/י ב-%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "לא ניתן להתחבר"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "התקבלה הרשאה"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "המפתח עבור SecurID אינו תקף."
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "יש להזין SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "יש להזין את קוד 6 הספרות מהתצוגה הדיגיטלית."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "אישור"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"ייתכן ותנותק/י בקרוב. אולי תרצ/י להיעזר ב-TOC עד אשר זה יתוקן.אפשר לבדוק ב-%"
+"ייתכן ותנותק/י בקרוב. אולי תרצ/י להיעזר ב-TOC עד אשר זה יתוקן. אפשר לבדוק ב-%"
 "s לעידכונים."
 
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "לא מצליח להשיג קוד התחברות תקף של AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעידכונים."
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "לא מצליח להשיג קוד התחברות תקף."
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "הסיסמא נשלחה"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "לא ניתן לאתחל חיבור"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "בבקשה, תנ/י לי אישור כדי להוסיף אותך לרשימת אנשי הקשר שלי."
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "הודעת בקשה להרשאה:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "בבקשה, אני רוצה הרשאה!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "לא ניתנה סיבה."
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "הודעת סירוב הרשאה"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6755,17 +6749,17 @@
 "המשתמש %u דחה את בקשתך להוסיף אותם לרשימת אנשי הקשר שלהם מהסיבה להלן:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "נדחית הרשאת ICQ."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "המשתמש %u אישר את בקשתך להוסיף אותם לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6778,7 +6772,7 @@
 "מאת: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6791,7 +6785,7 @@
 "מאת: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6804,38 +6798,38 @@
 "ההודעה היא:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "משתמש %u הפנה אותך לאיש קשר %s - פרטים: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "האם ברצונך להוסיף את המשתמש הזה לרשימת אנשי הקשר שלך?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "הוסף"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "דחה"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שהיא היתה לא תקנית."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שהן היו לא תקניות."
 
-#: ../libpurple/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שהיא היתה גדולה מדי."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שהן היו גדולות מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6844,21 +6838,21 @@
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שמהירות השליחה מופרזת."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שמהירות השליחה מופרזת."
 
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שהוא רע מדי."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שהוא רע מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שאת/ה רע מדי."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שאת/ה רע מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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."
@@ -6866,71 +6860,67 @@
 msgstr[1] "פספסת %hu הודעות מאת %s מסיבה לא ידועה."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "לא ניתן לשלוח הודעה: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "סיבה לא ידועה."
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "לא ניתן לשלוח הודעה ל %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "מידע על המשתמש אינו זמין: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "מידע על המשתמש %s אינו זמין:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "מחובר מאז"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "חבר מאז"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "יכולות"
 
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "הודעת זמינות"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "פרופיל"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "החיבור AIM שלך אולי יתנתק."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[לא ניתן להציג הודעה ממשתמש זה כיוון שהיא מכילה תווים לא חוקיים.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr "שגיאה בהגבלת מהירות."
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6938,85 +6928,85 @@
 "הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת במהירות שליחת ההודעת "
 "יש לחכות 10 שניות ולנסות שנית."
 
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "נותקת מסיבה לא ידועה."
 
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "נותקת מחדר הצ'אט %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "פלאפון"
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "דף אינטרנט אישי"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "מידע נוסף"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "מיקוד"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "מחלקה"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "משרה"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "דף אינטרנט"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "פרטי עבודה"
 
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "הודעה קופצת"
 
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "שם המשתמש שלהלן מקושר עם %s"
 msgstr[1] "שמות המשתמשים שלהלן מקושרים עם %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "שם לתצוגה"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "לא נמצאו תוצאות עבור כתובת הדוא\"ל %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "ישלח דוא\"ל לאשר את %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "התקבלה בקשה לאישור החשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "שגיאה בשינוי המידע של החשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7024,19 +7014,19 @@
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש שונה מהשם המקורי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש לא תקני."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש ארוך מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7045,7 +7035,7 @@
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור "
 "משתמש זה."
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7054,7 +7044,7 @@
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת "
 "ליותר מדי שמות משתמשים."
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7062,30 +7052,30 @@
 msgstr ""
 "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "שגיאה 0x%04x: שגיאה לא מוכרת."
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "כתובת הדוא\"ל של %s היא %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "מידע על החשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "הודעת-התמונה לא נשלחה. עליך להיות מחובר/ת בתקשורת ישירה לשלוח תמונות."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "אין אפשרות לקבוע את פרופיל ה-AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4440
 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 "
@@ -7094,24 +7084,22 @@
 "ככל הנראה ניסית לקבוע את פרופיל המשתמש שלך לפני סיום תהליך האימות. הפרופיל "
 "לא השתנה; יש לנסות שנית לאחר סיום תהליך האימות."
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
+#: ../libpurple/protocols/oscar/oscar.c:4454
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
-msgstr[0] ""
-"עברת את אורך הפרופיל המקסימלי של %d בייט. הפרופיל קוצר עבורך."
-msgstr[1] ""
-"עברת את אורך הפרופיל המקסימלי של %d בייטים. הפרופיל קוצר עבורך."
-
-#: ../libpurple/protocols/oscar/oscar.c:4482
+"truncated for you."
+msgstr[0] "עברת את אורך הפרופיל המקסימלי של %d בייט. הפרופיל קוצר עבורך."
+msgstr[1] "עברת את אורך הפרופיל המקסימלי של %d בייטים. הפרופיל קוצר עבורך."
+
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "הפרופיל ארוך מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7119,16 +7107,14 @@
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] ""
-"עברת את אורך הודעת הריחוק המקסימלי של %d בייט. הוא קוצר עבורך."
-msgstr[1] ""
-"עברת את אורך הודעת הריחוק המקסימלי של %d בייטים. הוא קוצר עבורך."
-
-#: ../libpurple/protocols/oscar/oscar.c:4532
+msgstr[0] "עברת את אורך הודעת הריחוק המקסימלי של %d בייט. הוא קוצר עבורך."
+msgstr[1] "עברת את אורך הודעת הריחוק המקסימלי של %d בייטים. הוא קוצר עבורך."
+
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "הודעת הריחוק מהמחשב ארוכה מדי."
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4578
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7138,34 +7124,34 @@
 "לא ניתן להוסיף את איש הקשר %s מכיוון ששם המשתמש שלו לא חוקי. שמות משתמשים "
 "חייבים להתחיל באות ולהכיל רק אותיות, מספרים ורווחים, או רק להכיל מספרים."
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "לא ניתן להוסיף"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "כשלון בשליפת רשימת אנשי הקשר"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4685
 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
+"זמנית לא ניתן לקבל את רשימת אנשי-הקשר שלך משרתי ה-AIM. הרשימה לא אבדה, וככל "
+"הנראה תהייה זמינה בשעות הקרובות."
+
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "יתומים"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5001
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7174,12 +7160,12 @@
 "לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך, כיוון שיש יותר מדי אנשי קשר "
 "ברשימה. יש להסיר אחד ולנסות שנית."
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(ללא שם)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7189,7 +7175,7 @@
 "לא ניתן להוסיף את %s מסיבה לא ידועה. הסיבה הכי נפוצה היא שהגעת למספר המירבי "
 "המותר של אנשי קשר ברשימתך."
 
-#: ../libpurple/protocols/oscar/oscar.c:5133
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7197,22 +7183,22 @@
 msgstr ""
 "המשתמש %s התיר לך להוסיף אותו לרשימת אנשי הקשר שלך. האם ברצונך להוסיף אותם?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "ההרשאה ניתנה"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "המשתמש %s התיר לך להוסיף אותו לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/oscar/oscar.c:5218
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "ההרשאה ניתנה"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7222,51 +7208,51 @@
 "המשתמש %s דחה את בקשתך להוסיף אותו לרשימת אנשי הקשר שלך מהסיבה להלן:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5222
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "ההרשאה נדחית"
 
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "החלפה:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "שם הצ'אט שצויין אינו תקף."
 
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "הודעת התמונה לא נשלחה. לא ניתן לשלוח תמונות לצ'אטים ב-AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "הודעת ריחוק מהמחשב"
 
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(שולף)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "לינק לחנות המוזיקה iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "הערת איש קשר עבור %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "הערת איש קשר:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "בחרת לפתוח בתקשורת ישירה להודעות עם %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5844
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7274,63 +7260,63 @@
 "משום שפעולה זו חושפת את כתובת ה-IP שלך, יתכן והיא מהווה סיכון לביטחונך.  "
 "להמשיך בכל זאת?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "התחבר"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "הצג פרטי AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "ערוך הערת איש קשר"
 
+#: ../libpurple/protocols/oscar/oscar.c:5899
+msgid "Get Status Msg"
+msgstr "הורד הודעת מצב"
+
+#: ../libpurple/protocols/oscar/oscar.c:5912
+msgid "Direct IM"
+msgstr "תקשורת ישירה להודעות"
+
 #: ../libpurple/protocols/oscar/oscar.c:5934
-msgid "Get Status Msg"
-msgstr "הורד הודעת מצב"
-
-#: ../libpurple/protocols/oscar/oscar.c:5947
-msgid "Direct IM"
-msgstr "תקשורת ישירה להודעות"
-
-#: ../libpurple/protocols/oscar/oscar.c:5969
 msgid "Re-request Authorization"
 msgstr "בקש הרשאה שוב"
 
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "דרוש הרשאה"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "מכיר-אינטרנט (הפעלה של זה תביא לדואר שלך SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "אפשרויות פרטיות של ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "The new formatting is invalid."
 msgstr "הפורמט החדש אינו תקני."
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "פירמוט של שם משתמש רק יכולה לשנות אותיות גדולות/קטנות ורווחים."
 
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "שנה כתובת ל:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>אינך מחכה להרשאה</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6155
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
 msgstr "אתה מחכה להרשאה מאנשי הקשר להלן"
 
-#: ../libpurple/protocols/oscar/oscar.c:6156
+#: ../libpurple/protocols/oscar/oscar.c:6124
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7338,73 +7324,73 @@
 "יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם "
 "ולבחור \"בקש הרשאה שוב\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "מצא איש קשר לפי דוא\"ל"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
 msgstr "חפש איש קשר לפי כתובת בדואר האלרקטרוני שלו"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "הקלד את כתובת הדוא\"ל של איש הקשר אותו אתה מחפש."
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "חיפוש"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "קבע את המידע על המשתמש (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "שנה סיסמא (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "הגדרות עקוב-אחרי להודעות (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "קבע אפשרויות פרטיות..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "אשר חשבון"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "הצג את הכתובת הרשומה כרגע"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "שנה את הכתובת הרשומה כרגע..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "הצג את אנשי הקשר שמחכים לאישור"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "חפש איש-קשר עפ\"י כתובת דוא\"ל..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "חפש איש-קשר עפ\"י מידע"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "השתמש בקבוצת אנשי קשר אחרונה"
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "הצג כמה זמן את/ה ללא פעילות"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7440,7 +7426,7 @@
 "זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת "
 "ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "התחבר"
 
@@ -7605,92 +7591,98 @@
 msgid "Update my information"
 msgstr "עדכן את המידע שלי"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "המידע שלך עודכן"
 
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr ""
-"אין כרגע תמיכה בהתאמה אישית של פרצופים. יש לבחור בתמונה מתוך "
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr "אין כרגע תמיכה בהתאמה אישית של פרצופים. יש לבחור בתמונה מתוך %s."
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "פרצוף QQ לא תקף"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "דחית את בקשת %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "הזנ/י את סיבתך:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "דחה בקשה"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "סליחה, את/ה לא הטיפוס שלי..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "דחה"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "הוסף איש-קשר עם כשל בקשות אימות"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "הסרת איש-קשר בהצלחה"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "הסרת את עצמך מאיש קשר בהצלחה"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "משתמש %d דורש אימות"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "יש להזין את הבקשה כאו"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "התרצ/י להיות ידיד/ה שלי?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "שלח"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "הוספת את %d לרשימת אנשי-הקשר שלך"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "שגיאת QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "QQid לא תקף"
 
@@ -7726,59 +7718,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "ניתן לחפש רק קבוצות QQ קבועות\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "המשתמש %d ביקש להצטרף לקבוצה %d"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "סיבה: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "פעולת QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "אשר"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "בקשתך להצטרף לקבוצה %d נדחתה על ידי המנהל %d"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "בקשתך להצטרף לקבוצה %d אושרה על ידי המנהל %d"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "את/ה [%d] יצאת מקבוצה \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "את/ה [%d] נוספת על ידי קבוצה \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "קבוצה זו נוספה לרשימת אנשי הקשר שלך"
 
@@ -7806,27 +7798,27 @@
 msgid "This group does not allow others to join"
 msgstr "קבוצה זו לא מאשרת לאחרים להצטרף"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "יצאת מן הקבוצה בהצלחה"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "אימות לקבוצת QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "פעולה האימות שלך התקבלה על ידי שרת ה-QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "הזנת מזהה-קבוצה מחוץ לטווח המקובל"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "האם את/ה בטוח/ה שברצונך לצאת מ-Qun זה?"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -7834,7 +7826,7 @@
 "יש לשים לב, כי אם את/ה היוצר/ת, \n"
 "פעולה זו תביא בסופו של דבר להסרת ה-Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "המשך"
 
@@ -7847,40 +7839,41 @@
 msgid "Group Operation Error"
 msgstr "שגיאה בפעולת-קבוצה"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "האם ברצונך לאשר את הבקשה?"
 
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "שינית בהצלחה את החבר-Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "שינית בהצלחה את המידע של ה-Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "יצרת בהצלחה Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "האם ברצונך לקבוע את פרטי ה-Qun כעת?"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "הגדרות"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "הודעת מערכת"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "ACK שרת"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "שליחת הודעת נכשלת\n"
 
@@ -7899,11 +7892,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -7944,47 +7937,47 @@
 msgid "Invalid name"
 msgstr "שם משתמש שגוי"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>כרגע מחוברים</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>עידכון אחרון</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>סוג החיבור</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>כתובת השרת</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>כתובתי המפורסמת</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>זמן כניסה</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>כתובת חיבור אחרונה</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>זמן חיבור אחרון</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "מידע על הכניסה"
 
@@ -8004,6 +7997,10 @@
 msgid "Exit this QQ Qun"
 msgstr "צא מתוך QQ Qun זה"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "חסום משתמש זה"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8014,15 +8011,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "פרוטוקול QQ\tתוסף"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "התחבר ב-TCP"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "התחבר מוסתר"
 
@@ -8066,51 +8063,53 @@
 msgid "Login failed, no reply"
 msgstr "לא ניתן להתחבר, אין תשובה"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "האם ברצונך להוסיף את המשתמש הזה לרשימת אנשי הקשר שלך?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "הוספת ע\"י %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "האם ברצונך להוסיף אותו?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s הוסיף אותך [%s]"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "המשתמש %s סרב לבקשתך"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "המשתמש %s אישר את בקשתך"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s רוצה להוסיף אותך [%s] כחברים"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "הודעה: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s אינו ברשימת אנשי-הקשר שלך"
 
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "האם ברצונך להוסיף אותו?"
 
@@ -8202,7 +8201,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "לא ניתן להתחבר לשרת"
 
@@ -8219,52 +8218,52 @@
 msgid "Unable to send message: "
 msgstr "לא ניתן לשלוח הודעה: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "המקום נסגר"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "מיקרופון"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "רמקולים"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "מצלמת וידאו"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "משלוח קבצים"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "תומכים"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "משתמש חיצוני"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "צור שיחת ועידה עם המשתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "יש להזין נושא עבוד שיחת הועידה, והודעת הזמנה שתישלח אל %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "ועידה חדשה"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "צור"
 
@@ -8294,23 +8293,23 @@
 msgid "Invite to Conference"
 msgstr "הזמן לועידה"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "הזמן לועידה..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "שלח הודעת ניסיון"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "כותרת:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "לא ניתן שרת קהילה של Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8319,38 +8318,38 @@
 "לא הוגדר שם או כתובת IP עבור חשבון ה-Meanwhile %s. יש להזין אחת להלן כדי "
 "להמשיך בכניסה למערכת."
 
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "הגדרות תקשורת Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "לא הוגדר שרת קהילת Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "לא ידוע (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "תוכנת-לקוח אחרונה"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "שם משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "מזהה Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "שם משתמש דו-משמעי הוזן"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8359,15 +8358,15 @@
 "המזהה '%s' יכול להתכוון אל כל אחד מן המשתמשים להלן. אנא בחר/י את המשתמשהנכון "
 "מן הרשימה כדי להוסיף אותם לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "בחר משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "אין אפשרות להוסיף משתמש: המשתמש לא נמצא"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8376,11 +8375,11 @@
 "המזהה '%s' לא תואם לאף משתמש בקהילה ה-Sametime שלך.והוא הוסר מרשימת אנשי "
 "הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "לא ניתן להוסיף משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8389,63 +8388,63 @@
 "שגיאה בקריאת הקובץ %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "רשימת אנשי הקשר המאוחסנת בריחוק"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "צורת איכסון רשימת אנשי הקשר"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "רשימת אנשי קשר מקומית בלבד"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "מזג רשימה מן השרת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "מזג ושמור רשימה בתוך השרת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "מסנכרן רשימה עם השרת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "ייבא רשימת Sametime עבור חשבון %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "ייצא רשימת Sametime עבור חשבון %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "לא ניתן להוסיף קבוצה: הקבוצה קיימת"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "קבוצה בשם '%s' כבר קיימת ברשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "אין אפשרות להוסיף את הקבוצה"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "התאמות אפשריות"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "תוצאות מתוך רשימת הכתובות של Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8455,26 +8454,26 @@
 "המזהה '%s' יכול להתכוון לכל אחד מקבוצות ספרי הכתובות של Notes שלהלן.אנא בחר/"
 "י את הקבוצה הנכונה מתוך הרשימה כדי להוסיף אותה לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "בחר ספר כתובות של Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "לא ניתן להוסיף קבוצה: הקבוצה לא נמצאה"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "המזהה '%s' לא תואם לאף קבוצת ספרי הכתובות של Notes בקהילה שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "קבוצה מספר כתובות של Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5481
 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."
@@ -8482,12 +8481,12 @@
 "יש להזין שם שלקבוצה בספר כתובות של Notes בשדה להלן על-מנת להוסיף את הקבוצה "
 "וחבריה לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "תוצאות חיפוש עבור %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8497,28 +8496,28 @@
 "המזהה '%s' יכול להתכוון לכל אחר מן המשתמשים שלהלן. יש באפשרותך להוסיף אותם "
 "אל רשימת אנשי הקשר שלך או לשלוח להם הודעות בעזרת כפתורי הפעולה שלמטה."
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "תוצאות חיפוש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "לא נמצאו מתאימים"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "המזהה '%s' לא תואם לאף משתמש בקהילת ה-Sametime שלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "לא נמצאו מתאימים"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "חיפוש משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8526,39 +8525,39 @@
 "יש להזין שם או מזהה חלקי בשדה להלן כדי לחפש משתמשים תואמים בקהילת ב-"
 "Sametimeשלך."
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "חיפוש משתמש"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "ייבא רשימת Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "ייצא רשימת Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "הוסף קבוצה מתוך ספר כתובות של Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "חיפוש משתמש..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "אלץ כניסה (מתעלם מהפניות-שרת)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "הסתר זהות לקוח"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8604,12 +8603,12 @@
 msgstr "לא ניתן להתחיל הסכמה על מפתחות עם עצמך"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "המשתמש המרוחק כבר לא נוכח ברשת"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8617,7 +8616,7 @@
 msgstr ""
 "בקשה להסכמה על מפתחות התקבלה מאת %s. האם ברצונך לבצע את ההסכמה על מפתחות?"
 
-#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8628,49 +8627,49 @@
 "כתובת מחשב: %s\n"
 "יציאה: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "בקשה להסכמה על מפתחות"
 
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "הודעה מיידית עם סיסמא"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "לא יכול לקבוע מפתח להודעה"
 
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "קבע סיסמאת הודעות"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "השג מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "לא ניתן להשיג את המפתח הציבורי"
 
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "הצג מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "לא ניתן להטעין את המפתח הציבורי"
 
-#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -8679,18 +8678,18 @@
 msgid "User Information"
 msgstr "מידע על המשתמש"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "לא יכול להשיג את המידע על המשתמש"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "איש הקשר %s אינו נבטח"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8699,16 +8698,16 @@
 "ניתן להשתמש בפקודת השג מפתח ציבורי על-מנת להשיג את המפתח הציבורי."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "פתח..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "המשתמש %s לא נוכח ברשת"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8716,15 +8715,15 @@
 "להוסיף את איש הקשר, עליך לייבא את המפתח הציבורי שלו.ניתן ללחוץ על \"ייבא\" "
 "לייבא מפתח ציבורי."
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "ייבא..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "בחר/י משתמש נכון"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8732,7 +8731,7 @@
 "יותר ממשתמש אחד נמצא עם אותו מפתח ציבורי. יש לבחור מהרשימה את המשתמש הנכון "
 "להוסיף לרשימת אנשי הקשר."
 
-#: ../libpurple/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8740,154 +8739,154 @@
 "יותר ממשתמש אחד נמצא עם אותו שם. יש לבחור מהרשימה את המשתמש הנכון להוסיף "
 "לרשימת אנשי הקשר."
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "מנותק"
 
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "חולה"
 
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "להעיר אותי"
 
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "היפראקטיבי"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "רובוט"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "שמח"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "עצוב"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "כועס"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "מקנא"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "מבוייש"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "בלתי מנוצח"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "מאוהב"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "ישנוני"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "משועמם"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "נלהב"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "לחוץ"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "מצבי משתמש"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "מצב רוח"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "איש קשר מועדף"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "שפה מועדפת"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "מכשיר"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "איזור זמן"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "מיקום"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "אתחל מפתח הודעות"
 
-#: ../libpurple/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "הודעה עם החלפת מפתחות"
 
-#: ../libpurple/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "הודעה עם סיסמא"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "השג מפתח ציבורי..."
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "הרוג משתמש"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "צייר על הלוח-הלבן"
 
@@ -8963,15 +8962,15 @@
 msgid "Open Public Key..."
 msgstr "פתח מפתח ציבורי..."
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "סיסמת הערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "רשימת המפתחות הציבוריים של הערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8984,130 +8983,130 @@
 "נקבעו מפתחות ציבוריים לערוץ, אז רק משתמשים שהמפתח הציבורי שלהם ברשימה יוכלו "
 "להצטרף."
 
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "אימות בערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "הוסף / הסר"
 
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "שם קבוצה"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "סיסמא"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "יש להזין את שם הקבוצה הפרטית והסיסמא עבור הערוץ %s."
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "הוסף קבוצה פרטית לערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "הגבלת משתמשים"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "לקביעת הגבלת מספר משתמשים. אפס מציין שאין הגבלה."
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "רשימת הזמנות"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "רשימת חסומים"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "הוסף קבוצה פרטית"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "אתחל קבוע"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "הגדרת קבוע"
 
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "קביעת הגבלת מספר משתמשים"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "אתחל הגבלת נושא"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "קביעת הגבלת נושא"
 
-#: ../libpurple/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "אתחל פרטיות ערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "קביעת פרטיות ערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "אתחל סודיות ערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "קביעת סודיות ערוץ"
 
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "הינך מייסד/ת הערוץ ב-<I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "מייסד/ת הערוץ ב<I>%s</I> זה <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "חובה להצטרף לערוץ %s לפני הצטרפות לקבוצה הפרטית"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "הצטרף לקבוצה הפרטית"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "לא ניתן להצטרף לקבוצה הפרטית"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "בצע פקודה"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "לא יכול לבצע פקודה"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "פקודה לא מוכרת"
 
@@ -9217,7 +9216,7 @@
 msgstr "תפקיד"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "אירגון"
 
@@ -9258,7 +9257,7 @@
 msgstr "עוד..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "הנתק מן השרת"
 
@@ -9395,51 +9394,51 @@
 msgid "Verifying server public key"
 msgstr "מוודא מפתח ציבורי של השרת"
 
-#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "נדרשת סיסמא"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "שגיאה: אי-תאימות גירסאות, יש לשדרג את תוכנה הלקוח שלך"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "שגיאה: הצד המרוחק לא בוטח/תומך במפתח הציבורי שלך"
 
-#: ../libpurple/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "שגיאה: בצד המרוחק לא תומך בקבוצת ה-KE שהוצעה"
 
-#: ../libpurple/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "שגיאה: הצד המרוחק לא תומך בהצפנה שהוצעה"
 
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "שגיאה: הצד המרוחק לא תומך ב-PKCS שהוצע"
 
-#: ../libpurple/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "שגיאה: הצד המרוחק לא תומך בפונקציית ההאש שהוצעה"
 
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "שגיאה: הצד המרוחק לא תומך ב-HMAC שהוצע"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "שגיאה: חתימה שגוייה"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "שגיאה: cookie שגוי"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "שגיאה: האימות נכשל"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9448,12 +9447,12 @@
 "המפתח הציבורי של %s התקבל. ההעתק המקומי אינו תואם למפתח זה. האם ברצונך "
 "להמשיך ולקבל את המפתח הציבורי?"
 
-#: ../libpurple/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "המפתח הציבורי של %s התקבל. האם ברצונך לקבל מפתח זה?"
 
-#: ../libpurple/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9466,15 +9465,15 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "וודא מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "צפייה..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "סוג מפתח ציבורי שאינו נתמך"
 
@@ -9524,7 +9523,7 @@
 msgid "Your Current Mood"
 msgstr "מצב הרוח הנוכחי שלך"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "רגיל"
 
@@ -9588,190 +9587,190 @@
 "ניתן לאפשר למשתמשים אחרים לראות את מצב החיבור שלך ומידע אישי. יש למלא את "
 "המידע שברצונך לאפשר למשתמשים אחרים לראות עליך."
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "ההודעה להיום"
 
-#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "לא קיימת הודעה להיום"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "אין הודעה להיום המשוייכת לחיבור זה"
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "צור זוג מפתחות SILC חדש"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "הסיסמאות אינן תואמות."
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "כשל בעת יצירה של זוג מפתחות"
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "אורך מפתח"
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "קובץ מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "קובץ מפתח פרטי"
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "סיסמא (שוב)"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "צור זוג מפתחות"
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "זמינות"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "הצג את הודעת היום"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "צור זוג מפתחות SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1104
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "המתשמש <I>%s</I> אינו נוכח ברשת"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "הנושא ארוך מדי"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "חובה לציין כינוי משתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "הערוץ %s לא נמצא"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "מצבי ערוץ %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "אין מצבים שנקבעו על הערוץ %s"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "כשל בקביעת מצבי ערוץ עבור %s"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "פקודה לא מוכרת: %s, )ייתכן וזהו באג בתוכנה("
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
-msgstr "part [ערוץ]: עזוב את הערוץ "
-
-#: ../libpurple/protocols/silc/silc.c:1595
+msgstr "part [ערוץ]: עזוב את הערוץ"
+
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [ערוץ]: עזוב את הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;נושא חדש&gt;]: הצג או שנה את הנושא "
-
-#: ../libpurple/protocols/silc/silc.c:1604
+msgstr "topic [&lt;נושא חדש&gt;]: הצג או שנה את הנושא"
+
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;ערוץ&gt; [&lt;סיסמא&gt;]:  הצטרף לערוץ ברשת זו"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:  הצג את רשימת הערוצים ברשת זו"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;כינוי משתמש&gt;:  צפה במידע אודות המשתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1616
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;כינוי משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;כינוי משתמש&gt; [&lt;הודעה&gt;]:  שלח הודעה פרטית למשתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  צפה בהודעת היום של השרת"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:  נתק תהליך פעולות זה מהשרת"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [הודעה]:  ניתוק מן השרת, עם אפשרות להודעה"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;פקודה&gt;:  קרא לפקודת לקוח כלשהי של silc"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;שם כינוי&gt; [-pubkey|&lt;סיבה&gt;]:  הרוג משתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;שם כינוי חדש&gt;:  שינוי הכינוי שלך"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;שם כינוי&gt;:  הצג מידע על משתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 "cmode &lt;ערוץ&gt; [+|-&lt;מצבים&gt;] [פרמטרים]: שנה או הצג את מצבי הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;ערוץ&gt; +|-&lt;מצבים&gt; &lt;שם כינוי&gt;:  שנה מצבי משתמש בערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;מצבי משתמש&gt;:  קביעת מצבי המשתמש שלך ברשת"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;שם כינוי&gt; [-pubkey]:  השג הרשאות מפעיל שרת"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9779,35 +9778,35 @@
 "invite &lt;ערוץ&gt; [-|+]&lt;שם כינוי&gt;:  הזמן משתמש או הוסף/הסר מרשימת "
 "ההזמנות של הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;ערוץ&gt; &lt;שם כינוי&gt; [הערה]:  בעט משתמש מן הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [שרת]:  הצג מידע תפעולי על השרת"
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;ערוץ&gt; +|-&lt;שם כינוי&gt;]:  חסום משתמש מן הערוץ"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;שמם כינוי|שרת&gt;:  השג מפתח ציבורי של שרת או משתמש"
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  הצג מידע סטטיסטי על השרת והרשת"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  שלח PING לשרת המחובר"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;ערוץ&gt;:  הצג את רשימת הערוצים"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9824,66 +9823,66 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "תוסף פרוטוקול IRC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "פרוטוקול תקשורת בזמן-אמת מאובטחת(SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "רשת"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "קובץ מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "קובץ מפתח פרטי"
 
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "צופן"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "אימות עפ\"י מפתח ציבורי"
 
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "סרב צפייה ע\"י משתמשים אחרים"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "חסום הזמנות"
 
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "חסום הודעות מידיות ללא החלפת מפתחות"
 
-#: ../libpurple/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "סרב לבקשות מצב חיבור"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "חסום הודעות ללוח-הלבן"
 
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "פתח לוח-לבן אוטומטית"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
-msgstr "חתום דיגיטלית וודא את כל ההודעות המיידיות "
+msgstr "חתום דיגיטלית וודא את כל ההודעות המיידיות"
 
 #: ../libpurple/protocols/silc/util.c:207
 #: ../libpurple/protocols/silc/util.c:247
@@ -10000,26 +9999,26 @@
 msgstr "לא ניתן לכתוב"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "לא ניתן להתחבר"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "אין אפשרות ליצור שקע-קשב"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "לא ניתן למצוא כתובת שרת"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "לא ניתן למצוא כתובת שרת"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "אסור לשמות משתמשים של SIP להכיל רווחים או סמלי @"
 
@@ -10031,36 +10030,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "תוסף פרוטוקול SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "תוסף הפרוטוקול SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "ייצא סטטוס (הערה: כולם יוכלו לצפות בך)"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "השתמש ב-UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use proxy"
 msgstr "השתמש במתווך"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Proxy"
 msgstr "מתווך"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "משתמש לאימות"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "דומיין לאימות"
 
@@ -10279,11 +10278,11 @@
 msgid "TOC Protocol Plugin"
 msgstr "תוסף פרוטוקול TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "הודעת ה Yahoo שלך לא נשלחה."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:878
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s שלח לך הרגע זמזום!"
@@ -10293,16 +10292,16 @@
 msgid "Yahoo! system message for %s:"
 msgstr "הודעת מערכת עבור %s מ-Yahoo!:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "הודעת סירוב הרשאה:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10311,25 +10310,25 @@
 "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך. מהסיבה הבאה: "
 "%s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "הוספת איש קשר נדחתה"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"ביקש תצורת אימות לא מוכרת. קרוב לוודאי שלא תוכל "
-"להתחבר בהצלחה לשרת ה-Yahoo. בדוק ב-%s לעידכונים."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+"ביקש תצורת אימות לא מוכרת. קרוב לוודאי שלא תוכל להתחבר בהצלחה לשרת ה-Yahoo. "
+"בדוק ב-%s לעידכונים."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "כישלון באימות מול Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10338,148 +10337,149 @@
 "ניסית להתעלם מ-%s, אך משתמש זה נמצא ברשימת אנשי הקשר שלך. לחיצה על \"כן\" "
 "תסיר ותתעלם מן המשתמש."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "התעלם ממשתמש?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "חשבונך נעול, יש לגשת לאתר של Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "שגיאה לא מוכרת מספר %d. התחברות באתר Yahoo! אולי יתקן את זה."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "לא ניתן להוסיף את איש הקשר %s לקבוצה %s ברשימה על השרת בחשבון %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "לא ניתן להוסיף את איש הקשר לרשימה בשרת"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ בר-שמיעה %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "התקבלה תגובת HTTP לא-צפויה מן השרת."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "תקלת תקשורת"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "לא נמצא בבית"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
-msgid "Not at Desk"
-msgstr "לא ליד השולחן"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+msgid "Not at Desk"
+msgstr "לא ליד השולחן"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
 msgid "Not in Office"
 msgstr "לא נמצא במשרד"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "On Vacation"
 msgstr "בחופשה"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "יצא לרגע"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "לא ברשימת השרתים"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "נראה מחובר"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "נראה מנותק לעד"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "נוכחות"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "ככל הנראה מנותק"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "אל תיראה מנותק לעד"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "הצטרף לשיחה"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "יזום ועידה"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "אפשרויות נוכחות"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "התחל לקשקש"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "איזה ID להפעיל?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "להצטרף למי בצ'אט?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Activate ID..."
 msgstr "הפעל ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Join User in Chat..."
 msgstr "הצטרף למשתמש בצ'אט..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "כרגע שלחת זמזום!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;חדר&gt;:  הצטרף לחדר צ'אט ברשת Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: הצג את רשימת החדרים ברשת Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: שלח זימזום למשתמש כדי להשיג את תשומת ליבם"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: לבקש מהמשתמש להתחיל ב- Doodle"
 
@@ -10493,56 +10493,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "תוסף פרוטוקול Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo יפן"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "שרת ה-Pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "שרת ה-Pager ביפן"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "יציאת Pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "שרת העברת קבצים"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "שרת יפני להעברת קבצים"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "יציאה להעברת קבצים"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "הגדרה איזורית לחדר צ'אט"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "מיקום של רשימת חדרי הצ'אט"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "שרת צ'אט של Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "כניסת שרת Yahoo"
 
@@ -10641,7 +10641,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
-msgstr "פרופיל Yahoo! "
+msgstr "פרופיל Yahoo!"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:814
 msgid ""
@@ -10693,7 +10693,7 @@
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
-msgstr "פרטי המשתמש %sאינם זמינים "
+msgstr "פרטי המשתמש %s אינם זמינים"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
@@ -10748,80 +10748,80 @@
 msgstr "לא ניתן לשלוח לצ'אט %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "משתמש"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "חבוי או לא מחובר"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>ב-%s מאז %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "כל אחד"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_מחלקה:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_ישות:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_נמען:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "ניסיון לעשות מנוי על %s,%s,%s נכשל"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;שם כינוי&gt;: איתור משתמש"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;שם כינוי&gt;: איתור משתמש"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;ישות&gt;: קבע את הישות לשימוש במחלקה זו"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;ישות&gt;: קבע את הישות לשימוש במחלקה זו"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;ישות&gt;: קבע את הישות לשימוש במחלקה זו"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: הצטרף לצ'אט חדש"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ישות&gt;: שלח הודעה ל-&lt;הודעה, <i>ישות</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 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;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 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;"
@@ -10829,7 +10829,7 @@
 "zcir &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,"
 "<i>ישות</i>,<i>נמען</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10837,15 +10837,15 @@
 "zir &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;הודעה,<i>ישות</i>,<i>נמען</"
 "i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;מחלקה&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,אישי,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "הרשם מחדש למנוי"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "שלוף את המנויים מהשרת"
 
@@ -10859,40 +10859,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "תוסף פרוטוקול Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "השתמש ב-tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "פקודת tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "ייצא ל-.anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "ייצא ל-.zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "ייבא מ-.anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "ייבא מ-.zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "איזור"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "חשיפה"
 
@@ -10934,18 +10934,18 @@
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "כ_ן"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "ל_א"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "א_שר"
 
@@ -10956,16 +10956,16 @@
 msgid "I'm not here right now"
 msgstr "אני לא כאן כרגע"
 
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "סטטוסים שמורים"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ידוע כעת בשם %s.\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10974,58 +10974,58 @@
 "%s הזמין את %s לחדר הצ'אט %s:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s הזמין את %s לחדר הצ'אט %s\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "לקבל הזמנה לצ'אט?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "בטל"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "לא זמין"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "נייד"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s שינה את הנושא מ-%s ל-%s"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s כעת %s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s כבר לא %s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s חסר פעילות"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s החל בפעילות"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s חסר פעילות"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s החל בפעילות"
@@ -11035,12 +11035,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "שגיאה בקריאת %s"
 
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11048,62 +11048,62 @@
 msgstr ""
 "חלה שגיאה בעת קריאת ה-%s שלך.  הם לא נטענו, ושם הקובץ הישן הוחלף ל-%s~."
 
-#: ../libpurple/util.c:2906
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "מחשב..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "לא ידוע"
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d שנייה"
 msgstr[1] "%d שניות"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d יום"
 msgstr[1] "%d ימים"
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d שעה"
 msgstr[1] "%s, %d שעות"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d שעה"
 msgstr[1] "%d שעות"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d דקה"
 msgstr[1] "%s, %d דקות"
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d דקה"
 msgstr[1] "%d דקות"
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "לא ניתן להתחבר אל %s"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3488
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11112,17 +11112,17 @@
 "לא ניתן להקצות מספיק זיכרון להחזיק את התוכן מ-%s.  שרת האתר אולי מנסה לעשות "
 "משהו מזיק."
 
-#: ../libpurple/util.c:3403
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "שגיאה בקריאה מתוך %s: %s"
 
-#: ../libpurple/util.c:3434
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "שגיאה בכתיבה לתוך %s: %s"
 
-#: ../libpurple/util.c:3459
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "לא ניתן להתחבר אל %s: %s"
@@ -11148,55 +11148,55 @@
 msgstr "כיוון מגש המערכת"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "מאפייני כניסה למערכת"
 
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "שם מקומי:"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "אפשרויות המשתמש"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "השתמש בתמונה זו לחשבון זה:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s אפשרויות"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "השתמש בהגדרות פרוקסי של GNOME"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "השתמש בהגדרות פרוקסי כלליות"
 
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "ללא פרוקסי"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "השתמש בהגדרות הסביבה"
 
@@ -11205,60 +11205,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "אם תביט ממש מקרוב"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "ניתן לראות פרפרים מזדווגים"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "אפשרויות פרוקסי"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "סוג ה_פרוקסי"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_שרת:"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_יציאה:"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "_שם משתמש:"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "סי_סמא"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "הוספת חשבון"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "_בסיסי"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "_מתקדם"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
-msgstr "דלוק"
-
-#: ../pidgin/gtkaccount.c:1961
+msgstr "פעיל"
+
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11280,231 +11280,231 @@
 "ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי "
 "<b>חשבונות->הוסף/ערוך</b> שבחלון רשימת אנשי-הקשר"
 
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "הצטרף לשיחה"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "יש להזין את המידע המתאים על הצ'אט שברצונך להצטרף אליו.\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "חש_בון:"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "חסום"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "הסר חסימה"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "הצג _פרטים"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "הודעה"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "שלח קובץ"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "להוסי_ף תגובה לפעולת איש קשר?"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "הצ_ג רישום"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "שם נוסף..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "_שם נוסף..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "_הסר"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "הוספת _איש קשר"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "הוסף _שיחה"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "הסר _קבוצה"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "_שנה שם"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "הצ_טרף"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "הצטרף אוטומטית"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "_קפל"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "ה_רחב"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/כלים/השתק צלילים"
 
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "אינך מחובר/ת כרגע עם החשבון שמסוגל להוסיף איש קשר זה."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/_אנשי קשר"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/אנשי קשר/הו_דעה חדשה..."
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/אנשי קשר/הצטרף ל_שיחה..."
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/אנשי קשר/הצג _פרטי משתמש..."
 
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/אנשי קשר/הצג יומ_ן שיחות עם משתמש..."
 
-#: ../pidgin/gtkblist.c:2763
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/אנשי קשר/הצג אנשי קשר ש_אינם מחוברים"
 
-#: ../pidgin/gtkblist.c:2764
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/אנשי קשר/הצג _קבוצות ריקות"
 
-#: ../pidgin/gtkblist.c:2765
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/אנשי קשר/הצג פר_טי אנשי-קשר"
 
-#: ../pidgin/gtkblist.c:2766
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/אנשי קשר/הצג _זמני חוסר-פעילות"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/אנשי קשר/_מיין אנשי-קשר"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/אנשי קשר/_הוסף איש קשר..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/אנשי קשר/הוסף צ'אט..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/אנשי קשר/ הוסף קבוצה חדשה..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/אנשי קשר/_יציאה"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/_חשבונות"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/_חשבונות/הוסף/\\ערוך"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "/_כלים"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/כלים/ת_גובות פעילות אנשי קשר"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/כלים/תו_ספים"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/כלים/_העדפות"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/כלים/_פרטיות"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/כלים/העברת _קבצים..."
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/כלים/_רשימת החלונות"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/כלים/דו\"ח המערכת"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/כלים/ה_שתק צלילים"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "/_עזרה"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "/עזרה/עזרה מקוונת"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/עזרה/_חלון ניפוי באגים"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/עזרה/_אודות"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11513,131 +11513,127 @@
 "\n"
 "<b>חשבון:</b> %s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "כינוי לאיש-הקשר"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "מחובר"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "נראה לאחרונה"
 
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "מפחיד"
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "מדהים"
 
-#: ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "מגניב"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "לא פעיל %dש %02dד"
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "לא פעיל %dד"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/אנשי קשר/הו_דעה חדשה..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/אנשי קשר/הצטרף ל_שיחה..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/אנשי קשר/הצג _פרטי משתמש..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/אנשי קשר/_הוסף איש קשר..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/אנשי קשר/הוסף צ'אט..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/אנשי קשר/ הוסף קבוצה חדשה..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/כלים/תגובות לפעילות אנשי קשר"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/כלים/_פרטיות"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/כלים/_רשימת חדרי הצ'אט"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "הודעה %d שלא נקראה מאת %s\n"
 msgstr[1] "%d הודעות שלא נקראו מאת %s\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "ידנית"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "אלפבתית"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "לפי מצב"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "לפי גודל יומן השיחות"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s מנותק"
 
-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "הפעל מחדש חשבון"
 
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s נותק: %s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>שם משתמש:</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>סיסמא:</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "התחברות"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/חשבונות"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11655,23 +11651,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "הצג גם _משתמשים מנותקים ברשימה"
 
-#: ../pidgin/gtkblist.c:4428
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/אנשי קשר/הצג קבוצות ריקות"
 
-#: ../pidgin/gtkblist.c:4434
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/אנשי קשר/הצג פרטי אנשי-קשר"
 
-#: ../pidgin/gtkblist.c:4437
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/אנשי קשר/הצג זמני חוסר פעילות"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:5367
 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. "
@@ -11680,62 +11676,62 @@
 "יש להזין את שם המשתמש של אותו אתם רוצים להוסיף לרשימת הקשר..ישנה גם אפשרות "
 "לתת כינוי אשר יוצג במקום שם המשתמש\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "קבוצה:"
 
-#: ../pidgin/gtkblist.c:5590
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "פרוטוקול זה אינו תומך בחדרי צ'אט"
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "אינך מחובר/ת בפרוטוקול כלשהו המאפשר שימוש בצ'אט."
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:5743
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "יש להזין שם נוסף, ומידע מתאים על הצ'אט שברצונך להוסיף לרשימת אנשי הקשר שלך.\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "יש להזין את שם הקבוצה החדשה."
 
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/חשבונות/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "_ערוך חשבון"
 
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "לא ניתן לבצע פעולות"
 
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "_בטל"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "הפעל חשבון"
 
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/חשבונות/הפעל חשבון"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/_כלים"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/אנשי קשר/מיין אנשי-קשר"
 
@@ -11751,62 +11747,62 @@
 "\n"
 "%s לא ינסה לחבר מחדש חשבון זה שתתקנ/י את השגיאה ותפעיל/י את החשבון מחדש."
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "איש קשר זה אינו באותו פרוטוקול של צ'אט זה"
 
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "אינך מחובר/ת בחשבון שיכול להזמין את איש הקשר הזה."
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "הזמן איש קשר לתוך חדר צ'אט"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "יש להזין את שם המשתמש שברצונך להזמין, יחד עם הודעת הזמנה אופציונלית."
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "_איש הקשר:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "ה_ודעה:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "אין אפשרות לפתוח את הקובץ."
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>שיחה עם %s>/h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "שמור שיחה"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "חפש"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
-msgstr "_חפש בעבור: "
-
-#: ../pidgin/gtkconv.c:1338
+msgstr "_חיפוש עבור:"
+
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "רישום הוחל. הודעות בשיחה זו יירשמו מעתה."
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "רישום הופסק. הודעות בשיחה זו לא יירשמו מעתה."
@@ -11827,129 +11823,129 @@
 msgid "Last said"
 msgstr "נאמר לאחרונה"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "לא ניתן לשמור את הסמל לדיסק."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "שמירת סמל"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "הנפש"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "הסתר סמל"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "שמירת סמל בשם..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "קבע תמונה..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "הסר תמונה שנקבעה"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/_שיחה"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/שיחה/הוד_עה חדשה..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/שיחה/_חפש..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/שיחה/ה_צג יומן שיחות"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/שיחה/_שמור בשם..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/שיחה/נ_קה גלילה לאחור"
 
-#: ../pidgin/gtkconv.c:2790
-msgid "/Conversation/Se_nd File..."
-msgstr "/שיחה/ש_לח קובץ..."
-
-#: ../pidgin/gtkconv.c:2791
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/שיחה/הוסף פ_עולת תגובה..."
-
 #: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/Se_nd File..."
+msgstr "/שיחה/ש_לח קובץ..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/שיחה/הוסף פ_עולת תגובה..."
+
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/שיחה/הצג מידע"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/שיחה/הז_מן..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/שיחה/_עוד"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/שיחה/כ_ינוי..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/שיחה/חסו_ם..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/שיחה/הסר חסי_מה..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/שיחה/הוס_ף"
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/שיחה/הס_ר..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/שיחה/_סגור"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/_אפשרויות"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/אפשרויות/אפשר _צלילים"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/אפשרויות/הצ_ג סמל של איש הקשר"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/אפשרויות/_הצג סרגלים של כלי הפירמוט"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/שיחה/עוד"
 
@@ -11958,228 +11954,228 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/שיחה"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/שיחה/הצג יומן שיחות"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/שיחה/שלח קובץ..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/שיחה/הוסף פעולת תגובה לאירועי איש קשר..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/שיחה/הצג מידע"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/שיחה/הזמן..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/שיחה/כינוי..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/שיחה/חסום..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/שיחה/הסר חסימה..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/שיחה/הוסף..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/שיחה/הסר..."
 
-#: ../pidgin/gtkconv.c:3030
+#: ../pidgin/gtkconv.c:3033
 msgid "/Options/Enable Logging"
 msgstr "/אפשרויות/אפשר רישום"
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/אפשרויות/אפשר צלילים"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/אפשרויות/_הצג סרגלים של כלי הפירמוט"
 
-#: ../pidgin/gtkconv.c:3049
-msgid "/Options/Show Timestamps"
-msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
-
 #: ../pidgin/gtkconv.c:3052
+msgid "/Options/Show Timestamps"
+msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
+
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/אפשרויות/הצ_ג סמל של איש הקשר"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
 msgstr "המשתמש כותב כרגע..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
 msgstr "המשתמש כתב משהו ועצר"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "שלח _אל"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "ש_לח"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "0 אנשים בחדר זה"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "איש %d בחדר זה"
 msgstr[1] "%d אנשים בחדר זה"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "מקליד/ה"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "הפסיק/ה להקליד"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "שם נאמר"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "הודעות שלא נקראו"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "אירוע חדש"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "אשר סגירה"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "יש לך הודעות שלא נקראו. האם ברצונך לסגור את החלון?"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "סגור את שאר הטאבים"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr "סגור את כל הטאבים"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "נתק טאב זה"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr "סגור טאב זה"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "סגור חלון"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "חלון אחרון שנוצר"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "הפרד בין חלונות של הודעות וצ'אטים"
 
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "חלון חדש"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "לפי קבוצות"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "לפי חשבון"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "שמור רישומת ניפוי באגים"
 
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr "הפוך"
 
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "סמן תוצאות"
 
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "_תמונה בלבד"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "טקס_ט בלבד"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "_גם תמונה וגם טקסט"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "נפה"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "לחיצה ימנית לעוד אפשרויות."
 
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "רמה "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "יש לבחור את רמת ניפוי הבאגים."
 
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "הכל"
 
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "אחר"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
-msgstr "שגיאה"
-
-#: ../pidgin/gtkdebug.c:865
+msgstr "שגיאה "
+
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "שגיאה קטלנית"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "מפתח ראשי"
 
@@ -12188,8 +12184,9 @@
 #: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "מפתח"
 
@@ -12197,405 +12194,419 @@
 msgid "developer & webmaster"
 msgstr "מפתח ומנהל אתר"
 
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
 msgid "support"
 msgstr "תמיכה"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support/QA"
 msgstr "תמיכה/QA"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "גירסה לחלונות"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "מתחזק"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "מתחזק libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "מתכנת ונהג פיכח - עצלן"
 
-#: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "מפתח Jabber"
-
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
+msgid "XMPP developer"
+msgstr "מפתח XMPP"
+
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "מתכנת מקורי"
 
-#: ../pidgin/gtkdialogs.c:121
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "אפריקאנס"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "ערבית"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
-msgid "Bulgarian"
-msgstr "בולגרית"
-
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "בולגרית"
+
 #: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "בנגאלית"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
 msgstr "בוסנית"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "קטלנית"
 
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "קטלנית-ואלנסית"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "צ'כית"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "דנית"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
-msgid "German"
-msgstr "גרמנית"
-
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:213
+msgid "German"
+msgstr "גרמנית"
+
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "צדונקא"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "יוונית"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "אנגלית בריטית"
 
-#: ../pidgin/gtkdialogs.c:144
-msgid "Canadian English"
-msgstr "אנגלית קנדית"
-
-#: ../pidgin/gtkdialogs.c:145
-msgid "British English"
-msgstr "אנגלית בריטית"
-
 #: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "אנגלית קנדית"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "אנגלית בריטית"
+
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "אספרנט"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "ספרדית"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "אאוסקרה(בסקית)"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "פרסית"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "פינית"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "צרפתית"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "גליסיאנית"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "גוג'ראטית"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "קבוצת השפה גוג'ראטית"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "עברית"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
 msgstr "הינדית"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
 msgstr "הונגרית"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "אינדונזית"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "איטלקית"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "יפנית"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
-msgstr "גרמנית"
-
-#: ../pidgin/gtkdialogs.c:165
+msgstr "גאורגנית (גרוזינית)"
+
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "מתרגמי הגרוזינית של אובונטו"
+
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "קאנאדית"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "קבוצת התרגום לקאנאדית"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "קוריאנית"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
 msgstr "כורדית"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "ליטואנית"
 
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:173
 msgid "Macedonian"
 msgstr "מקדונית"
 
-#: ../pidgin/gtkdialogs.c:172
-msgid "Bokmål Norwegian"
-msgstr "נורבגית ספרותית"
-
-#: ../pidgin/gtkdialogs.c:173
-msgid "Nepali"
-msgstr "נפאלית"
-
 #: ../pidgin/gtkdialogs.c:174
+msgid "Bokmål Norwegian"
+msgstr "נורבגית ספרותית"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Nepali"
+msgstr "נפאלית"
+
+#: ../pidgin/gtkdialogs.c:176
 msgid "Dutch, Flemish"
 msgstr "הולנדית, פלמית"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
 msgstr "נורבגית"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "פולנית"
 
-#: ../pidgin/gtkdialogs.c:179
-msgid "Portuguese"
-msgstr "פורטוגזית"
-
-#: ../pidgin/gtkdialogs.c:180
-msgid "Portuguese-Brazil"
-msgstr "פורטוגזית ברזילאית"
-
 #: ../pidgin/gtkdialogs.c:181
-msgid "Pashto"
-msgstr "פאשטוזית (אירנית)"
+msgid "Portuguese"
+msgstr "פורטוגזית"
 
 #: ../pidgin/gtkdialogs.c:182
+msgid "Portuguese-Brazil"
+msgstr "פורטוגזית ברזילאית"
+
+#: ../pidgin/gtkdialogs.c:183
+msgid "Pashto"
+msgstr "פאשטוזית (אירנית)"
+
+#: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
 msgstr "רומנית"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "רוסית"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "סלובקית"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "סלובקית"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
 msgstr "סלובנית"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:189
 msgid "Albanian"
 msgstr "אלבנית"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "סרבית"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "שוודית"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
 msgstr "תמיל"
 
-#: ../pidgin/gtkdialogs.c:192
-msgid "Telugu"
-msgstr "טלוגו"
-
-#: ../pidgin/gtkdialogs.c:193
-msgid "Thai"
-msgstr "תאלנדית"
-
 #: ../pidgin/gtkdialogs.c:194
-msgid "Turkish"
-msgstr "תורכית"
+msgid "Telugu"
+msgstr "טלוגו"
 
 #: ../pidgin/gtkdialogs.c:195
+msgid "Thai"
+msgstr "תאלנדית"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "תורכית"
+
+#: ../pidgin/gtkdialogs.c:197
 msgid "Vietnamese"
 msgstr "ויאטנמית"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "צוות VI של גנום"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "סינית פשוטה"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "סינית של הונג-קונג"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "סינית מסורתית"
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "אמהרית"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:327
 #, c-format
 msgid "About %s"
 msgstr "אודות %s"
 
-#: ../pidgin/gtkdialogs.c:359
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s הינה תוכנת שליחת הודעות מיידיות מודולרית המאפשרת שימוש ב AIM, MSN,  "
-"Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novel GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, QQ ובכולם בו-זמנית. התוכנה נכתבה בעזרת GTK+."
-"<BR><BR>מותר לערוך שינויים ולהפיץ את התוכנה תחת הנחיות רישיון הGPL (גרסא 2 "
-"והלאה). יותר). העתק של ה-GPL מוכל בתוך הקובץ 'COPYING' המופץ עם %s. %s "
-"היא תחת זכויות המפתחים והתורמים לפיתוח. ראה את הקובץ 'COPYRIGHT' לרשימה מלאה "
-"של התורמים. איננו מספקים שום אחריות לתוכנה זו.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:374
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to 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 ""
+"%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר לבצע "
+"חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, QQ ובכולם בו- זמנית. "
+"התוכנה נכתבה בעזרת GTK+.<BR><BR>מותר לערוך שינויים ולהפיץ את התוכנה תחת "
+"הנחיות רישיון הGPL (גרסא 2 והלאה). יותר). העתק של ה-GPL מוכל בתוך הקובץ "
+"'COPYING' המופץ עם %s. %s היא תחת זכויות המפתחים והתורמים לפיתוח. ראה את "
+"הקובץ 'COPYRIGHT' לרשימה מלאה של התורמים. איננו מספקים שום אחריות לתוכנה זו."
+"<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 ב- irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin ב- irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "מפתחים"
 
-#: ../pidgin/gtkdialogs.c:398
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "מחברי תיקונים מטורפים"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "מפתחים שתרמו בעבר"
 
-#: ../pidgin/gtkdialogs.c:428
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
 msgstr "אמנים"
 
-#: ../pidgin/gtkdialogs.c:443
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "מתרגמים פעילים"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "מתרגמים לשעבר"
 
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "מידע לניפוי באגים"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "מידע כללי על המשתמש"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "יש להזין את שם המשתמש או הכינוי של האדם שברצונכם לקרוא את פרטיו."
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "הצג יומן שיחות עם המשתמש"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "יש להזין את שם המשתמש או הכינוי של האדם שברצונכם לקרוא יומן השיחות איתו."
 
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "שם נוסף לאיש קשר"
 
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "הזן שם נוסף עבור איש קשר זה."
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ".%s הזן כינוי חדש עבור"
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "שם נוסף לאיש הקשר"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "שם נוסף לשיחה"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "הזן שם נוסף לשיחה זו."
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12610,70 +12621,70 @@
 "האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d אנשי קשר אחרים "
 "בתוכו מתוך רשימת אנשי הקשר שלך?"
 
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "הסר איש קשר"
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "ה_סר איש קשר"
 
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "האם הנך בטוח/ה שברצונך לאחד את הקבוצה %s לתוך הקבוצה %s?"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "מזג קבוצות"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "מזג קבוצות"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1159
 #, 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
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "הסר קבוצה"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "הסר _קבוצה"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את %s מרשימת אנשי הקשר שלך?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "הסר איש קשר"
 
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "הסר איש קשר"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1225
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הצ'אט %s מרשימת אנשי הקשר שלך?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "הסר שיחה"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "הס_ר שיחה"
 
@@ -12681,30 +12692,27 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "לחיצה ימנית לעוד הודעות שלא נקראו...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "שנה מצב"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "הצג את רשימת אנשי קשר"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "הודעה חדשה..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "השתק צלילים"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "הבהב בעת קבלת הודעה חדשה"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "יציאה"
 
@@ -12785,7 +12793,7 @@
 msgstr "פרטי העברות קבצים"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "השהייה"
 
@@ -12794,11 +12802,11 @@
 msgid "_Resume"
 msgstr "ה_משך"
 
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:792
 msgid "Paste as Plain _Text"
 msgstr "הדבק בתור _טקסט רגיל"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:809
 msgid "_Reset formatting"
 msgstr "נקה פירמוט טקסט"
 
@@ -12830,7 +12838,7 @@
 msgid "_Copy Link Location"
 msgstr "ה_עתק מיקום הקישור"
 
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12840,7 +12848,7 @@
 "\n"
 "מניח שזה מסוג PNG."
 
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12850,7 +12858,7 @@
 "\n"
 "מניח שזה מסוג PNG."
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12861,7 +12869,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12872,11 +12880,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "שמור תמונה"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "שמור _תמונה..."
 
@@ -12984,91 +12992,91 @@
 msgid "Insert smiley"
 msgstr "הכנס חיוך"
 
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה עם %s שהתחלת ב- %s?"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה ב- %s שהתחיל ב- %s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "האם ברצונך למחוק את רישום יומן המערכת שהחל ב- %s?"
 
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>השיחה בתוך %s ב-%s</span>"
 
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:430
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>שיחה עם %s ב-%s</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr "אירועי מערכת רק יירשמו אם סומן \"רשום כל שינויי סטטוס ליומן המערכת\"."
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "הודעות רק יירשמו אם סומן \"רשום את כל ההודעות\"."
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "צ'אטים רק יירשמו אם סומן \"רשום את כל הצ'אטים\"."
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:535
 msgid "No logs were found"
 msgstr "לא נמצאו יומני רישום"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "עיין בספריית יומני-הרישום"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "גודל יומן סה\"כ:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr "שיחות בתוך %s"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s שיחות עם"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "דו\"ח מערכת"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. יש לנסות את '%s –h' למידע נוסף.\n"
 
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13093,41 +13101,41 @@
 "                      ובין כל שם צריך להיות פסיק)\n"
 "  -v, --version       הצג את הגירסאשל התוכנה וצא\n"
 
-#: ../pidgin/gtkmain.c:550
+#: ../pidgin/gtkmain.c:493
 #, 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"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\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"
+"%swiki/GetABacktrace\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"
+"%swiki/DeveloperPages\n"
 msgstr ""
 "%s נפל וניסה לכתוב קובץ של הזיכרון לקובץ.\n"
 "זהו באג בתוכנה, שקרה ללא שום אשמה מצידך.\n"
 "\n"
-"אם באפשרותך לגרום לנפילה לקרות שוב, אנא הודע על כך למפתחי פידג'ין דרך:\n"
-"%sbug.php\n"
+"אם באפשרותך לגרום לנפילה לקרות שוב, אנא הודע על כך למפתחים דרך:\n"
+"%snewticket/\n"
 "\n"
 "יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ "
 "core.\n"
 "אם אינך יודע/ת להוציא את ה-backtrace, אנא קרא את ההוראות ב:\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "אם יש צורך בעזרה נוספת, אנא פנה בהודעה אל SeanEgn או LSchiere דרך AIM.\n"
 "מידע ליצור קשר עם שון ולוק בפרוטוקולים אחרים נמצא ב:\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 
 #: ../pidgin/gtknotify.c:337
 msgid "Open All Messages"
@@ -13155,22 +13163,22 @@
 msgstr[0] "<b>יש לך הודעה חדשה %d.</b>"
 msgstr[1] "<b>יש לך %d הודעות חדשות.</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, 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
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "URLלא ניתן לפתוח את ה-"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "שגיאה בהפעלת הפקודה \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "נבחרה לביצוע הפקודה 'הידנית' של הדפדפן, אבל לא נקבעה הוראה לביצוע."
@@ -13183,11 +13191,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "תוספים מרובים ייפרקו מן הזיכרון."
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "פרוק תוספים"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13198,7 +13206,7 @@
 "<span weight=\"bold\">אתר:</span>\t\t%s\n"
 "<span weight=\"bold\">שם קובץ:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13209,11 +13217,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">שגיאה: %s\n"
 "בדוק את אתר התוסף לעידכון.</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "הגדר את התוסף"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>פרטי התוסף</b>"
 
@@ -13222,95 +13230,95 @@
 msgstr "בחר קובץ"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "למי להגיב"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "שם איש הקשר:"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "מתחבר"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "מתנתק"
 
-#: ../pidgin/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "התרחק/ה מהמחשב"
-
 #: ../pidgin/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "חוזר למחשב"
+msgid "Goes a_way"
+msgstr "התרחק/ה מהמחשב"
 
 #: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "חוזר למחשב"
+
+#: ../pidgin/gtkpounce.c:593
 msgid "Becomes _idle"
 msgstr "חסר _פעילות"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:595
 msgid "Is no longer i_dle"
 msgstr "כבר לא חסר/ת פעילות"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "מתחיל/ה להקליד הודעה"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
 msgstr "_עוצר בעת הקלדה"
 
-#: ../pidgin/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "מפסיק/ה להקליד הודעה"
-
 #: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "מפסיק/ה להקליד הודעה"
+
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "שו_לח הודעה"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
 msgstr "פתח חלון הודעות"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "תן התרעה"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "ש_לח הודעה"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "הפעל הפקודה"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "נגן _צליל"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "עיו_ן..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "עי_ון..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "_תצוגה מקדימה"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "הגב רק כאשר אני לא זמין"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "חוזר"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "מטרת התגובה"
 
@@ -13338,7 +13346,7 @@
 msgid "_Show system tray icon:"
 msgstr "הצג את סמל מגש המערכת:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13357,7 +13365,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "ה_סתר שיחות חדשות"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "כאשר מרוחק"
 
@@ -13583,59 +13591,64 @@
 msgid "Log all _status changes to system log"
 msgstr "רשום את כל שינויי הסטטוס ליומן המערכת"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "ברירת המחדל))"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "בחירת הצליל"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "הכי שקט"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "יותר שקט"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "שקט"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "רועש"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "יותר רועש"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "הכי רועש"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "שיטת הצליל"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "שי_טה:"
 
-#: ../pidgin/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "&צפצף"
-
 #: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "&צפצף"
+
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1606
 msgid "Command"
 msgstr "פקודה"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1607
 msgid "No sounds"
 msgstr "ללא צלילים"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1615
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13644,117 +13657,117 @@
 "צליל לפקו_דה:\n"
 "(%s עבור קובץ)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 msgid "Sound Options"
 msgstr "הגדרות הצליל"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sounds when conversation has _focus"
 msgstr "צלילים כאשר יש לחלון השיחה מי_קוד"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Enable sounds:"
 msgstr "הפעל צלילים:"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Only when available"
 msgstr "רק כאשר זמין"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when not available"
 msgstr "רק כאשר לא-זמין"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1655
 msgid "Volume:"
 msgstr "עוצמת-שמע:"
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1683
 msgid "Sound Events"
 msgstr "ארועי צליל"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1734
 msgid "Play"
 msgstr "נגן"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1741
 msgid "Event"
 msgstr "אירוע"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 msgid "Test"
 msgstr "בדיקה"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1764
 msgid "Reset"
 msgstr "אפס"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1768
 msgid "Choose..."
 msgstr "בחר..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1811
 msgid "_Report idle time:"
 msgstr "_דווח זמן חוסר פעילות:"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1816
 msgid "Based on keyboard or mouse use"
 msgstr "על-פי פעילות עכבר או מקלדת"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1825
 msgid "_Auto-reply:"
 msgstr "מענה אוטומ_טי:"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1829
 msgid "When both away and idle"
 msgstr "כאשר מרוחק וגם חסר פעילות"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1835
 msgid "Auto-away"
 msgstr "ריחוק אוטומטי"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1837
 msgid "Change status when _idle"
 msgstr "קבע ריחוק בעת חוסר פעילות"
 
-#: ../pidgin/gtkprefs.c:1839
+#: ../pidgin/gtkprefs.c:1841
 msgid "_Minutes before changing status:"
 msgstr "_דקות לפני קביעת ריחוק:"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1849
 msgid "Change _status to:"
 msgstr "שנה ריחוק ל:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1870
 msgid "Status at Startup"
 msgstr "סטטוס בעת איתחול"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1872
 msgid "Use status from last _exit at startup"
 msgstr "השתמש בסטטוס מיציאה אחרונה בעת איתחול"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1878
 msgid "Status to a_pply at startup:"
 msgstr "סטטוס להחיל בעת איתחול:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1916
 msgid "Interface"
 msgstr "ממשק המשתמש"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1918
 msgid "Smiley Themes"
 msgstr "ערכות החיוכים"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1919
 msgid "Sounds"
 msgstr "צלילים"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "Browser"
 msgstr "דפדפן"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Status / Idle"
 msgstr "מצב / חוסר פעילות"
 
@@ -13791,7 +13804,7 @@
 msgid "Set privacy for:"
 msgstr "קבע פרטיות עבור:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "אפשר למשתמש"
 
@@ -13803,38 +13816,38 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "יש להזין את שם המשתמש שברצונך לאפשר ליצור קשר איתך."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "הרשה"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "לאפשר ל %s ליצור איתך קשר?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "האם את/ה בטוח/ה שברצונך לאפשר ל-%s ליצור איתך קשר?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "חסום משתמש"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "יש להזין את שם המשתמש שברצונך לחסום."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr "יש להזין את שם המשתמש שברצונך לחסום."
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "לחסום את %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "האם את/ה בטוח/ה שברצונך לחסום את %s?"
@@ -13843,23 +13856,23 @@
 msgid "Apply"
 msgstr "החל"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "הקובץ כבר קיים"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "לשכתב?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "כתוב מעל"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "בחר שם חדש"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "בחירת תיקיה..."
 
@@ -13882,37 +13895,37 @@
 msgstr "האם אתה בטוח שברצונך למחוק את המצבים השמורים שסומנו?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "הש_תמש"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 msgid "Title already in use.  You must choose a unique title."
 msgstr "תואר כבר בשימוש, עליך לבחור תואר יחודי."
 
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "שונה"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "_תואר:"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "_מצב:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "השתמש בסטטוס שונה עבור חשבונות מסויימים"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "שמור והשתמש"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "מצב עבור %s"
@@ -13965,37 +13978,41 @@
 msgid "GStreamer failed to initialize."
 msgstr "כישלון בעת איתחול GStreamer"
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "ממתין לחיבור לרשת"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "צ'אט של גוגל"
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "ארעה השגיאה להלן בעת ניסיון טעינת %s: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "כישלון בעת טעינת תמונה"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "לא ניתן לשלוח את הספריה %s."
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1472
 #, 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
+"individually."
+msgstr "%s לא יכול להעביר ספריה. תיאלצ/י לשלוח את הקבצים בתוך הספריה אחד-אחד."
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "גררת תמונה"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1505
 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."
@@ -14003,23 +14020,23 @@
 "ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל "
 "עבור איש הקשר הזה."
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "קבע להיות סמל איש הקשר"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "שלח קובץ תמונה"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "הכנס לתוך ההודעה"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "האם ברצונך לקבוע את זה להיות הסמל של איש קשר זה?"
 
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1524
 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."
@@ -14027,7 +14044,7 @@
 "ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל "
 "עבור איש הקשר הזה."
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1526
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14038,11 +14055,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "לא ניתן לשלוח את קובץ המפעיל"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14050,7 +14067,7 @@
 "גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל "
 "מצביעעליו, ולא את המפעיל עצמו."
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14061,59 +14078,65 @@
 "<b>גודל הקובץ:</b> %s\n"
 "<b>גודל התמונה:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "הקובץ '%s' גדול מדי עבור %s.  יש לנסות תמונה יותר קטנה.\n"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "שגיאת תמונה"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "לא ניתן לקבוע תמונה"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "כישלון בעת פתיחת הקובץ '%s': %s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "כישלון בעת טעינת התמונה '%s': סיבה לא ידועה, כנראה קובץ תמונה פגום"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "שמור קובץ"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "בחר צבע"
 
-#: ../pidgin/pidginstock.c:88
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "פידג'ין"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "תיאו_ר"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "סגור טאבים"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "הצג פרטים"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "הזמן"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_ערוך"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "_פתח דואר"
 
@@ -14135,7 +14158,7 @@
 msgstr "זמן מירבי לחכות לתגובה:"
 
 #: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "דקות"
 
@@ -14219,20 +14242,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "שנה עדיפות"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "מאפשר שליטה על הערכים המיוחסים למצבים השונים של אנשי הקשר."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14294,11 +14317,19 @@
 msgid "Conversation Placement"
 msgstr "מיקום חלון שיחה"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"הערה: ההעדפה עבור \"שיחות חדשות\" חייבת להקבע להיות \"על פי מספר השיחות\"."
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "מספר שיחות בכל חלון"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "הפרד בין הודעות לציאטים כאשר ממקמים עפ\"י מספר"
 
@@ -14308,54 +14339,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "על-מיקום"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "אפשרויות נוספות למיקום שיחות"
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 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 "תוסף הדגמה של פידג'ין"
-
-#. *< 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"
@@ -14380,19 +14381,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "פעולות עכבר"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "מוסיף תמיכה לפעולות עכבר"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14484,7 +14485,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "שילוב עם Evolution"
 
@@ -14492,8 +14493,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "מאפשר שילוב עם Evolution."
 
@@ -14619,7 +14620,7 @@
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
 msgid "Error Running Editor"
-msgstr "שגיאה בהרצת העורך "
+msgstr "שגיאה בהרצת העורך"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
 msgid "The following error has occurred:"
@@ -14646,12 +14647,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "תוסף להודעות מוזיקה להלחנה משותפת."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -14736,7 +14737,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "התרעה על הודעה"
 
@@ -14744,10 +14745,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "מאפשר מבחר דרכים להודיע לך על הודעות חדשות."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "תוסף הדגמה של פידג'ין"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "תוסף הדגמא שעושה דברים - ראה תיאור."
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"זה תוסף ממש מגניב שעושה המון דברים:\n"
+"- זה אומר לך מי כתב את התוכנה כשמתחברים\n"
+"- זה הופך את כל הטקסט הנכנס\n"
+"- זה שולי הודעה לאנשי הקשר ברגע שהם מתחברים"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "צבע הסמן"
@@ -14760,38 +14791,30 @@
 msgid "Hyperlink Color"
 msgstr "צבע קישורים"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "גודל המרחיב"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "מפריד אופקי"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "הזנת שיחות"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "יומן שיחות"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "הצופה ביומנים"
 
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "חלון בקשה"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "חלון התרעות"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "מרחיבי גודל כניסה"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "בחירת צבע"
@@ -14813,36 +14836,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "מוטיב קיצור הדרך הטקסטואלי של GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "צבעי ממשק"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "גדלי פריטי ממשק"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "גופנים"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "כלים"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "שמור הגדרות לתוך %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "קרא-מחדש קבצי gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "בקרת מוטיבים של GTK+ בפידג'ין"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "יש לאפשר גישה להגדרות נפוצות של gtkrc"
 
@@ -14856,11 +14899,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט כגון Jabber, MSN, IRC, "
-"TOC.לחץ 'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
+"מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט (XMPP, MSN, IRC, TOC).לחץ "
+"'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
@@ -14882,8 +14925,8 @@
 "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
 "im</a>."
 msgstr ""
-"ניתן להשיג את גירסא %s מ:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
+"ניתן להשיג את גירסא %s מ:<br><a href=\"http://pidgin.im/\">http://pidgin.im</"
+"a>."
 
 #: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
 msgid "New Version Available"
@@ -14971,11 +15014,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "אפשר החלפה של המילה האחרונה בעת שליחה"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "החלפת הטקסט"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "מחליף טקסט בהודעות יוצאות עפ\"י חוקים שנקבעים ע\"י המשתמש."
 
@@ -14997,7 +15040,7 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "גירסא מאוזנת (במקום מאונכת) של אנשי הקשר, שמעבירה את כולם בסך."
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "הצג חותמת-זמן כל"
 
@@ -15007,19 +15050,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "חותמת זמן"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "הצג חותמות זמן מסוג iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "הצג חותמות זמן מסוג iChat כל N דקות."
 
@@ -15028,9 +15071,8 @@
 msgstr "אפשרויות חותמת-זמן"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "_אלץ (מסורתיות %s) שימוש בחותמת-זמן על בסיס 24-שעות"
+msgid "_Force 24-hour time format"
+msgstr " אלץ שימוש בחותמת-זמן על בסיס 24-שעות"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15060,19 +15102,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "הגדרות חותמת-זמן בהודעות"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "מגדיר את פורמט חותמות-הזמן בהודעות."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15117,7 +15159,7 @@
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
 msgid "Remove Buddy List window transparency on focus"
-msgstr " בטל שקיפות חלון רשימת אנשי הקשר בעת הפיכתו לפעיל "
+msgstr "בטל שקיפות חלון רשימת אנשי הקשר בעת הפיכתו לפעיל"
 
 #. *< type
 #. *< ui_requirement
@@ -15125,19 +15167,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "שקיפות"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "שקיפות משתנה עבור רשימת אנשי הקשר וחלונות השיחה."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15180,15 +15222,15 @@
 msgid "_Flash window when chat messages are received"
 msgstr "_הבהב את חלון השיחה בעת קבלת הודעות צ'אט"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
 msgstr "הגדרות פידג'ין לחלונות"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
 msgstr "אפשרויות לפידג'ין היחודיות לחלונות."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
@@ -15241,1690 +15283,3 @@
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."
-
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/שיחה/הכנס קיש_ור..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/שיחה/הכנס ת_מונה..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/שיחה/הכנס קישור..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/שיחה/הכנס תמונה..."
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim ב- irc.freenode.net<BR><BR>"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because it belongs to an account "
-#~ "which is disabled or offline.  This buddy and the group were not "
-#~ "removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because they belong to accounts "
-#~ "which are currently disabled or offline.  These buddies and the group "
-#~ "were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d איש קשר מהקבוצה %s לא הוסר מכיוון שהחשבון אליו הוא שייך.אנשי לא מחובר. "
-#~ "איש קשר זה והקבוצה לא הוסר.\n"
-#~ msgstr[1] ""
-#~ "%d אנשי קשר מהקבוצה %s לא הוסרו מכיוון שהחשבונות אליהם הם שייכים.אנשי לא "
-#~ "מחוברים. אנשי קשר אלו והקבוצה לא הוסרו.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "הקבוצה לא הוסרה"
-
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "תמיד השתמש בשרת התיווך של AIM/ICQ להעברות קבצים\n"
-#~ "(יותר איטי, אבל לא חושף את כתובתך)"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "הודעת שגיאה מ-SNAC %s\n"
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "שם המשתמש שלך מפורמט כרגע כך:\n"
-#~ "%s"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "פורמט חדש לשם המשתמש:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "פרמט את שם המשתמש..."
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC שלח פקודת PAUSE."
-
-#~ msgid "Buzz!!"
-#~ msgstr "באזז!!"
-
-#~ msgid "Normal authentication failed!"
-#~ msgstr "אימות רגיל נכשל!"
-
-#~ msgid "Crazychat"
-#~ msgstr "קרייזי-צ'אט"
-
-#~ msgid "Plugin to establish a Crazychat session."
-#~ msgstr "תוסף המאפשר תקשורת קרייזי-צ'אט."
-
-#~ msgid "Network Configuration"
-#~ msgstr "הגדרות רשת"
-
-#~ msgid "TCP port"
-#~ msgstr "יציאת TCP"
-
-#~ msgid "UDP port"
-#~ msgstr "יציאת UDP"
-
-#~ msgid "Feature Calibration"
-#~ msgstr "כיוונון אפשרויות"
-
-#~ msgid "Disabled"
-#~ msgstr "כבוי"
-
-#~ msgid "DBus"
-#~ msgstr "DBus"
-
-#~ msgid "Blink tray icon for unread..."
-#~ msgstr "הבהב את הסמל במגש-המערכת עבור הודעות חדשות..."
-
-#~ msgid "_Instant Messages:"
-#~ msgstr ":מס_רים מיידים"
-
-#~ msgid "C_hat Messages:"
-#~ msgstr "הודעות _צ'אט:"
-
-#~ msgid ""
-#~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
-#~ "show the current status of Gaim, allow fast access to commonly used "
-#~ "functions, and to toggle display of the buddy list. Also provides options "
-#~ "to blink for unread messages."
-#~ msgstr ""
-#~ "מציג סמל באזור ההתרעה )לדוגמא: של GNOME, KDE או Windows( שמראה את המצב "
-#~ "הנוכחי, מאפשר גישה מהירה לפעולות הנפוצות ביותר, הצגה/הסתרה של חלון "
-#~ "\"רשימת אנשי קשר\". כמו כן נותן אפשרות לגרום להודעות נכנסות להמתין בתור "
-#~ "עד לחיצה על הסמל באזור ההתרעה."
-
-#~ msgid "The specified buddy was not found in the Evolution Contacts."
-#~ msgstr "איש הקשר המסומן לא נמצא ברשימת אנשי הקשר של Evolution."
-
-#~ msgid "Delay"
-#~ msgstr "השהייה"
-
-#~ msgid "Buddy icon:"
-#~ msgstr "סמל איש הקשר:"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Buddy Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>שם נוסף:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>כינוי:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מחובר:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>לא פעיל:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> מנותק"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>תיאור:</b> מפחיד"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> מדהים"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> מקפיץ"
-
-#~ msgid "IM the user"
-#~ msgstr "שלח הודעה מיידית למשתמש זה"
-
-#~ msgid "Ignore the user"
-#~ msgstr "התעלם מהמשתמש"
-
-#~ msgid "Get the user's information"
-#~ msgstr "הצג מידע על המשתמש"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span size=\"larger\" weight=\"bold\">דואר חדש נכנס!</span>\n"
-#~ "%s"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "שלח פקודות \"קו-נטוי\" לא מוכרות כהודעות"
-
-#~ msgid "Tab Options"
-#~ msgstr "הגדרות כרטיסיה"
-
-#~ msgid "_Sounds while away"
-#~ msgstr "השמע צלילים במצב \"לא נמצא\""
-
-#~ msgid "Away / Idle"
-#~ msgstr "ריחוק מהמחשב / חוסר פעילות"
-
-#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
-#~ msgstr "לא ניתן להשמיע צליל, מכוון שקובץ \"%s\" לא קיים."
-
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
-#~ msgstr ""
-#~ "לא ניתן להשמיע צליל מכוון שנבחרה אופציה \"פקודה\", אך הפקודה לא הוכנסה."
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr ""
-#~ "לא ניתן להשמיע את הצליל כיוון שלא ניתן להריץ את פקודת ההשמעה שנקבעה: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>הודעה:</b> %s"
-
-#~ msgid "Unable to initiate a new search"
-#~ msgstr "לא ניתן לאתחל חיפוש חדש"
-
-#~ msgid "You have a pending search. Please wait for it to finish."
-#~ msgstr "יש לך חיפוש בפעולה. יש לחכות לסיומו."
-
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
-#~ msgid "<b>%s:</b> %s<br>"
-#~ msgstr "<b>%s:</b> %s<br>"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "השרת דורש TLS/SSLלהתחברות.  יש לבחור ב-\"השתמש ב-TLS אם זמין\" בהגדרות "
-#~ "החשבון"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "השתמש ב-TLS במידה וזמין"
-
-#~ msgid "Require TLS"
-#~ msgstr "דרוש TLS"
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "המשתמש %s רוצה להוסיף %s לרשימת אנשי הקשר שלו."
-
-#~ msgid "_Authorize"
-#~ msgstr "אשר"
-
-#~ msgid "_Deny"
-#~ msgstr "דחה"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#~ msgid "<b>%s:</b> "
-#~ msgstr "<b>%s:</b> "
-
-#~ msgid "MSN Profile"
-#~ msgstr "פרופיל MSN"
-
-#~ msgid "%s<b>General</b><br>%s"
-#~ msgstr "%s<b>כללי</b><br>%s "
-
-#~ msgid "%s<b>Social</b><br>%s"
-#~ msgstr "%s<b>חברתי</b><br>%s "
-
-#~ msgid "<br><b>Personal</b><br>%s"
-#~ msgstr "<br><b>אישי</b><br>%s"
-
-#~ msgid "<br><b>Business</b><br>%s"
-#~ msgstr "<br><b>עסקי</b><br>%s"
-
-#~ msgid "<hr><b>Contact Info</b>%s%s"
-#~ msgstr "<hr><b>מידע ליצירת קשר</b>%s%s"
-
-#~ msgid "<hr><b>%s:</b> "
-#~ msgstr "<hr><b>%s:</b> "
-
-#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
-#~ msgstr "המשתמש %s (%s) רוצה להוסיף %s לרשימת אנשי הקשר שלו."
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "לא ניתן לקרוא כותר מידע מהשרת"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr "לא ניתן לקרוא הודעה מהשרת: %s.  פקודה היא %hd, אורך הוא %hd."
-
-#~ msgid "Unknown server error."
-#~ msgstr "שגיאת שרת לא מוכרת."
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "משתמשים: %s, קבצים: %s, גודל: %sGB"
-
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "אין אפשרות להוסיף \"%s\" לרשימת החמים שלך בנאפסטר"
-
-#~ msgid "%s requested your information"
-#~ msgstr "%s ביקש/ה את המידע שלך"
-
-#~ msgid "%s requested a PING"
-#~ msgstr "%s ביקש PING"
-
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "תוסף פרוטוקול Napster"
-
-#~ msgid "Invalid password"
-#~ msgstr "סיסמא לא תקפה"
-
-#~ msgid "Invalid username or password"
-#~ msgstr "שם המשתמש או הסיסמא שגויים"
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "התחברות ישירה עם %s נסגרה"
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "שגיאה בהתחברות ישירה עם %s"
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "לא ניתן לפתוח תקשורת ישירה להודעות"
-
-#~ msgid "You have lost your connection to chat room %s."
-#~ msgstr "איבדת את הקשר שלך לחדר הצ'אט %s."
-
-#~ msgid "Chat is currently unavailable"
-#~ msgstr "השיחה אינה זמינה כעת"
-
-#~ msgid ""
-#~ "Transfer of file %s timed out.\n"
-#~ " Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
-#~ "Account -> Advanced."
-#~ msgstr ""
-#~ "הזמן המוקצב להעברת הקובץ %s אזל.\n"
-#~ " יש לנסות להפעיל שימוש בשרתי תיווך עבור העברת קבצים תחת חשבונות -> %s -> "
-#~ "ערוך חשבון -> מתקדם."
-
-#~ msgid "Unable to create new connection."
-#~ msgstr "לא ניתן ליצור חיבור חדש."
-
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "לא ניתן להתחבר לאמת מול שרת תיווך להעברת קבצים."
-
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr "לא ניתן לקבע שקע קשב, או שאין תקשורת עם מתווך ה-AOL."
-
-#~ msgid ""
-#~ "The user %s requires authorization before being added to a buddy list.  "
-#~ "Do you want to send an authorization request?"
-#~ msgstr ""
-#~ "המשתמש %s דורש הרשאה לפני שאפשר להוסיפו לרשימת אנשי הקשר. האם ברצונך "
-#~ "לשלוח בקשה לקבלת הרשאה?"
-
-#~ msgid "Request Authorization"
-#~ msgstr "בקש הרשאה"
-
-#~ msgid "_Request Authorization"
-#~ msgstr "בקש הרשאה"
-
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "המשתמש %u רוצה להוסיף את %s לרשימת אנשי הקשר שלו מהסיבה להלן:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "בקשת הרשאה"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>מספר זיהוי:</B> %s<BR><B>מצב:</B> %s<HR>%s "
-
-#~ msgid "Auth host"
-#~ msgstr "שרת הרשאה"
-
-#~ msgid "Auth port"
-#~ msgstr "יציאת הרשאה"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>תומך ב:</b> %s"
-
-#~ msgid "<b>External User</b><br>"
-#~ msgstr "<b>משתמש חיצוני</b><br>"
-
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "<b>שם מלא:</b> %s<br>"
-
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>תומך ב:</b> %s<br>"
-
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b>מצב:</b> %s"
-
-#~ msgid "Wrong Password"
-#~ msgstr "סיסמא שגויה"
-
-#~ msgid "TOC host"
-#~ msgstr "שרת TOC"
-
-#~ msgid "TOC port"
-#~ msgstr "יציאת TOC"
-
-#~ msgid "Message (optional) :"
-#~ msgstr "הודעה (לא חובה) :"
-
-#~ msgid "Invalid username."
-#~ msgstr "שם המשתמש שגוי."
-
-#~ msgid "Unable to read"
-#~ msgstr "לא ניתן לקרוא"
-
-#~ msgid "Pager host"
-#~ msgstr "שרת ה-Pager"
-
-#~ msgid "YCHT host"
-#~ msgstr "שרת YCHT"
-
-#~ msgid "YCHT port"
-#~ msgstr "יציאה ל-YCHT"
-
-#~ msgid "<b>IP Address:</b> %s<br>"
-#~ msgstr "<b>כתובת IP:</b> %s<br>"
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: שגיאה בעת פתיחת חיבור תקשורת.\n"
-
-#~ msgid "Screen Name:"
-#~ msgstr "שם לתצוגה:"
-
-#~ msgid "Error launching <b>%s</b>: %s"
-#~ msgstr "שגיאה בהפעלת הפקודה <b>%s</b>: %s"
-
-#~ msgid "Realname"
-#~ msgstr "שם אמיתי"
-
-#~ msgid "Email Address"
-#~ msgstr "כתובת דוא\"ל"
-
-#~ msgid "EMail"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Public Key File"
-#~ msgstr "קובץ מפתח ציבורי"
-
-#~ msgid "Private Key File"
-#~ msgstr "קובץ מפתח פרטי"
-
-#~ msgid "Re-type Passphrase"
-#~ msgstr "רשום סיסמא בשנית"
-
-#~ msgid "%s came back"
-#~ msgstr "%s חזר"
-
-#~ msgid "%s went away"
-#~ msgstr "%s התרחק מהמחשב"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s התנתק."
-
-#~ msgid "Start _Voice Chat"
-#~ msgstr "יזום שיחה _קולית"
-
-#~ msgid "Background color name"
-#~ msgstr "שם צבע הרקע"
-
-#~ msgid "Background color as a string"
-#~ msgstr "צבע הרקע כמחרוזת"
-
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "צבע הרקע כצבע GdkColor"
-
-#~ msgid "Background set"
-#~ msgstr "קביעת רקע"
-
-#~ msgid "Whether this tag affects the background color"
-#~ msgstr "האם תגית זו משפיעה על צבע הרקע"
-
-#~ msgid "ComboBox model"
-#~ msgstr "מודל התיבה המשולבת"
-
-#~ msgid "The model for the combo box"
-#~ msgstr "המודל לתיבה המשולבת"
-
-#~ msgid "Wrap width"
-#~ msgstr "רוחב גלילה"
-
-#~ msgid "Wrap width for layouting the items in a grid"
-#~ msgstr "רוחב גלילה במיקום הפריטים על רשת"
-
-#~ msgid "Row span column"
-#~ msgstr "פריסה על מספר שורות"
-
-#~ msgid "TreeModel column containing the row span values"
-#~ msgstr "עמודת מודל-העץ המכיל את ערכי הפריסה על השורות"
-
-#~ msgid "Column span column"
-#~ msgstr "עמודת הפריסה על עמודות"
-
-#~ msgid "TreeModel column containing the column span values"
-#~ msgstr "עמודת מודל-העץ המכיל את ערכי הפריסה על העמודות"
-
-#~ msgid "Active item"
-#~ msgstr "פריט פעיל"
-
-#~ msgid "The item which is currently active"
-#~ msgstr "הפריט הפעיל"
-
-#~ msgid "Appears as list"
-#~ msgstr "נראה כרשימה"
-
-#~ msgid "Whether combobox dropdowns should look like lists rather than menus"
-#~ msgstr "האם תיבות-משולבות צריכות להיראות כמו רשימות ולא תפריטים"
-
-#~ msgid "Call ended."
-#~ msgstr "השיחה נסתיימה."
-
-#~ msgid "Calling %s"
-#~ msgstr "מתקשר אל %s"
-
-#~ msgid "End Call"
-#~ msgstr "סיים שיחה"
-
-#~ msgid "Receiving call from %s"
-#~ msgstr "מתקבלת שיחה מאת %s"
-
-#~ msgid "Reject Call"
-#~ msgstr "סרב לשיחה"
-
-#~ msgid "Connected to %s"
-#~ msgstr "מחובר אל %s"
-
-#~ msgid "_Mute"
-#~ msgstr "ה_שתק"
-
-#~ msgid "e-Mail"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Use AIM/ICQ proxy server (slower, but usually works)"
-#~ msgstr "השתמש בשרת התיווך של AIM/ICQ )יותר איטי, אבל בד\"כ עובד("
-
-#~ msgid "Join A Chat..."
-#~ msgstr "הצטרף לשיחה..."
-
-#~ msgid "Screenname:"
-#~ msgstr "שם לתצוגה:"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation.\n"
-#~ "\n"
-#~ "The history plugin requires logging be enabled. Logging can be enabled "
-#~ "from Tools -> Preferences -> Logging. Enabling logs for instant messages "
-#~ "and/or chats will activate history for the same conversation type(s)."
-#~ msgstr ""
-#~ "תוסף ההיסטוריה דורש שיומני רישום יהיו פעילים. ניתן לאפשר רישום מתוך כלים -"
-#~ "> העדפות -> רישום.\n"
-#~ "\n"
-#~ "איפשור יומנים להודעות ו/או צ'אטים יפעיל היסטוריה עבור אותם סוגי שיחות."
-
-#~ msgid "Set account idle time"
-#~ msgstr "קבע את זמן חוסר הפעילות של החשבון"
-
-#~ msgid "Unset account idle time"
-#~ msgstr "בטל את זמן חוסר הפעילות של החשבון"
-
-#~ msgid "(+%d more)"
-#~ msgstr "(+%d נוספים)"
-
-#~ msgid " left the room (%s)."
-#~ msgstr ".(%s) עזב את החדר"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "להוסים לרשימת אנשי הקשר שלך?"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "שם נוסף לאיש הקשר..."
-
-#~ msgid "Alias Contact..."
-#~ msgstr "שם נוסף לאיש הקשר..."
-
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/כלים/פעולות חשבו_ן"
-
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/כלים/_חשבונות"
-
-#~ msgid "Idle "
-#~ msgstr "חוסר פעילות "
-
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/כלים/פעולות חשבו_ן"
-
-#~ msgid "Active Developers"
-#~ msgstr "מפתחים פעילים"
-
-#~ msgid "Conversation in %s on %s"
-#~ msgstr "שיחה ב-%s על %s"
-
-#~ msgid "<span weight=\"bold\">From:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">מאת:</span> %s\n"
-
-#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">הנדון:</span> %s\n"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-#~ msgstr ""
-#~ "<span size=\"larger\" weight=\"bold\">דואר חדש נכנס!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-
-#~ msgid "Pounce Action"
-#~ msgstr "בחר פעולת תגובה"
-
-#~ msgid "_Warn"
-#~ msgstr "ה_זהר"
-
-#~ msgid "Host name"
-#~ msgstr "שם שרת"
-
-#~ msgid "Change password"
-#~ msgstr "שנה סיסמא"
-
-#~ msgid "Jabber ID"
-#~ msgstr "זיהוי Jabber"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "שגיאה בעיבוד אירוע או משוב (%s)."
-
-#~ msgid "Hide IP address"
-#~ msgstr "הסתר כתובת IP"
-
-#~ msgid "Web aware"
-#~ msgstr "מודע רשת"
-
-#~ msgid "Connected to Sametime Community Server"
-#~ msgstr "מחובר לשרת קהילה של Sametime"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status</b>: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>מצב:</b> %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message</b>: %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>הודעה</b>: %s"
-
-#~ msgid "Add User"
-#~ msgstr "הוסף משתמש"
-
-#~ msgid "Busy Message"
-#~ msgstr "הודעת ריחוק מהמחשב"
-
-#~ msgid "Set Status Messages..."
-#~ msgstr "קבע הודעות מצב..."
-
-#~ msgid "NotesBuddy Encoding"
-#~ msgstr "קידוד NotesBuddy"
-
-#~ msgid "Thomas Butter <butter@uni-mannheim.de>"
-#~ msgstr "Thomas Butter <butter@uni-mannheim.de>"
-
-#~ msgid "Hello!"
-#~ msgstr "שלום!"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "הסתר הודעות ניתוק"
-
-#~ msgid "Hide Login Errors"
-#~ msgstr "הסתר שגיאות התחברות"
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "הסתר חלון החיבור מחדש"
-
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "כאשר מנתקים אותך, מתחבר מחדש עצמאית"
-
-#~ msgid "Use last matching buddy"
-#~ msgstr "השתמש באיש בקשר האחרון התואם"
-
-#~ msgid ""
-#~ "The buddy with the lowest score is the buddy who will have priority in "
-#~ "the contact.\n"
-#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
-#~ msgstr ""
-#~ "איש הקשר עם הניקוד הכי נמוך יהיה בעל העדיפות הראשונה באדם. \n"
-#~ "ערכי ברירת המחדל (מנותק = 4, מרוחק = 2, וחסר פעילות = 1)\n"
-#~ "ישתמשו במה שהיה פעם הסדר המובנה של: פעיל, לא פעיל, מרוחק, מרוחק + לא "
-#~ "פעיל,-מנותק."
-
-#~ msgid "Back"
-#~ msgstr "חזר"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "_הסתר הודעות חדשות עד הלחיצה על סמל מגש המערכת"
-
-#~ msgid "Show user details"
-#~ msgstr "הצג פרטי המשתמש"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/כלים/פעולות ת_וספים"
-
-#~ msgid "/Tools/_Statuses"
-#~ msgstr "/כלים/_מצבי פעילות"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "השאר את החלון פתוח"
-
-#~ msgid "Show transfer details"
-#~ msgstr "הצג את פרטי ההעברות"
-
-#~ msgid "Expander Size"
-#~ msgstr "גודל המרחיב"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "גודלו של חץ ההרחבה"
-
-#~ msgid "A_way"
-#~ msgstr "_מרוחק מהמחשב"
-
-#~ msgid "_Idle"
-#~ msgstr "לא פעיל"
-
-#~ msgid "Retur_n from idle"
-#~ msgstr "חזר לפעילות"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "_עיון..."
-
-#~ msgid "Sav_e this pounce after activation"
-#~ msgstr "שמור תגובת-פעילות זו לאחר הפעלתה"
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "הסר תגובת פעילות"
-
-#~ msgid "_Sorting:"
-#~ msgstr "ס_דר:"
-
-#~ msgid "Buddy Display"
-#~ msgstr "תצוגת אנשי הקשר"
-
-#~ msgid "Show more buddy details"
-#~ msgstr "הצג עוד פרטים על איש הקשר"
-
-#~ msgid "Gnome Default"
-#~ msgstr "ברירת מחדל של GNOME"
-
-#~ msgid "_Enable system log"
-#~ msgstr "אפשר _כתיבה לקובץ רישום המערכת"
-
-#~ msgid "Log when buddies log in/log _out"
-#~ msgstr "רשום _כניסה/יציאה של אנשי קשר"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "רשום מעבר מ_פעילות לחוסר פעילות ולהיפך של אנשי קשר"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "רשום ריחוק וחזרה למחשב של אנשי קשר"
-
-#~ msgid "Log your own _signons/idleness/awayness"
-#~ msgstr "רשום שינויים ב_סטטוס שלך לריחוק/פעילות/ניתוק"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "שים הודעות חדשות ב_תור כאשר מרוחק מהמחשב"
-
-#~ msgid "Idle _Tracking:"
-#~ msgstr "דיווח _זמן חוסר פעילות"
-
-#~ msgid "X usage"
-#~ msgstr "בשימוש של X"
-
-#~ msgid "Windows usage"
-#~ msgstr "בשימוש החלונות"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "הודעת _ריחוק:"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">נכתב ע\"י:</span>  %s\n"
-#~ "<span weight=\"bold\">אתר:</span>  %s\n"
-#~ "<span weight=\"bold\">שם קובץ:</span>  %s"
-
-#~ msgid "Summary"
-#~ msgstr "סיכום"
-
-#~ msgid "Details"
-#~ msgstr "פרטים"
-
-#~ msgid "Out of the office"
-#~ msgstr "מחוץ למשרד"
-
-#~ msgid "Could't open file"
-#~ msgstr "לא ניתן לפתוח את הקובץ"
-
-#~ msgid "Token Error: Unable to fetch the token.\n"
-#~ msgstr "שגיאת ערך: לא ניתן להשיג את הערך.\n"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "הודעת יציאה"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "לא ניתן לקבוע את הודעת הריחוק מהמחשב של AIM."
-
-#~ msgid ""
-#~ "You have probably requested to set your away message before the login "
-#~ "procedure completed.  You remain in a \"present\" state; try setting it "
-#~ "again when you are fully connected."
-#~ msgstr ""
-#~ "כנראה ניסית לקבוע הודעת ריחוק מהמחשב לפני שהסתיים תהליך ההתחברות.מצבך "
-#~ "נותר \"נמצא\"; אפשר לנסות שוב אחרי שתהליך ההחברות יסתייים."
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "וודא חתימות על כל ההודעות המיידיות"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "חתום דיגיטלית על כל ההודעות לחדר"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "וודא חתימות על כל ההודעות בחדר"
-
-#~ msgid "Basic Profile"
-#~ msgstr "פרופיל בסיסי"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "מספר ICQ"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "אני מ"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "קביעת מידע הפרופיל שלך ב- Trepia"
-
-#~ msgid "Set Profile"
-#~ msgstr "קבע פרופיל"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "בקר באתר הבית"
-
-#~ msgid "Local Users"
-#~ msgstr "משתמשים מקומיים"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "תוסף פרוטוקול Trepia"
-
-#~ msgid "Stealth"
-#~ msgstr "הסתר"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "(%d הודעה)"
-#~ msgstr[1] "(%d הודעות)"
-
-#~ msgid "(1 message)"
-#~ msgstr "(הודעה 1)"
-
-#~ msgid "Default auto-away"
-#~ msgstr "ברירת מחדל לריחוק אוטומטי"
-
-#~ msgid "Complete words"
-#~ msgstr "השלם מילים"
-
-#~ msgid "Reconnect"
-#~ msgstr "הת_חבר מחדש"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "הסיבה אינה ידועה."
-
-#~ msgid "_Reconnect"
-#~ msgstr "הת_חבר מחדש"
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "ברירת מחדל קצת פחות משעממת"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "מידע על איש הקשר %s"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "פרופיל Jabber"
-
-#~ msgid "User Properties"
-#~ msgstr "מאפייני המשתמש"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "פרטי ICQ עבור %s"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "לאחר חיבור מחדש, החזר את מצב הריחוק מהמחשב למצבו לפני הניתוק"
-
-#~ msgid "Mail Server"
-#~ msgstr "שרת הדואר"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d חדש/%d סה\"כ)"
-
-#~ msgid "Check Mail"
-#~ msgstr "בדוק דואר"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "בדוק דואר כל מספר שניות. \n"
-
-#~ msgid "Auto-login"
-#~ msgstr "כניסה אוטומטית"
-
-#~ msgid "Signoff"
-#~ msgstr "נתק"
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "לא מחובר ל AIM"
-
-#~ msgid "No screenname given."
-#~ msgstr "אין ניתן שם תצוגה."
-
-#~ msgid "No roomname given."
-#~ msgstr "לא ניתן שם החדר."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "כתובת AIM לא חוקית"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "כישלון בעת השמת %s לשקע:\n"
-#~ "%s"
-
-#~ msgid "Remote Control"
-#~ msgstr "שליטה מרוחקת"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "חלון רשימת אנשי הקשר מתיד עליון אף בהיותו עגון"
-
-#~ msgid "Away!"
-#~ msgstr "רחוק מהמחשב!"
-
-#~ msgid "I'm Back!"
-#~ msgstr "חזרתי"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "ההודעה האם אתה בטוח שברצונך למחוק את \"%s\"?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "הסר הודעת ריחוק מהמחשב"
-
-#~ msgid "Set All Away"
-#~ msgstr "קבע מצב התרחקות כללי"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "אין אפשרות לשמור הודעת ריחוק מהמחשב ללא כותרת"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr "יש להזין כותרת להודעה, או לבחור ב-'השתמש' להשתמש ללא שמירה."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "אין אפשרות ליצור הודעת ריחוק מהמחשב ריקה"
-
-#~ msgid "New away message"
-#~ msgstr "הודעת התרחקות מהמחשב חדשה"
-
-#~ msgid "Away title: "
-#~ msgstr "כותרת להתרחקות:"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "שגיעה ברשימת אנשי הקשר"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "שימוש בכתובות AIM:\n"
-#~ "לשלוח הודעה לשם משתמש:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "במקרה זה, 'Penguin' הוא שם המשתמש אליו שולחים, וההודעה היא 'hello world'\n"
-#~ "'+' חייב להחליף רווחים.\n"
-#~ "יש לשים לב לשימוש נכון של גרשיים – הסמל '&' במערכות מסויימות \n"
-#~ "לעיתים דורש טיפול מיוחד, אחרת הפקודה תעצר שם.\n"
-#~ "בנוסף, הפקודה שלהלן תפתח חלון שיחה עם אותו משתמש, בלא לשלוח הודעה:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "הצטרפות לצ'אט:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...מצטרף לצא'ט בחדר בשם 'PenguinLounge'.\n"
-#~ "\n"
-#~ "להוסיף איש קשר לרשימת אנשי הקשר:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...שואל אותך האם להוסיף את המשתמש בשם 'Penguin' לרשימה.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "מסמן את כל החשבונות בתור \"מרוחק מהמחשב\" עם הודעת ברירת המחדל.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "קובע את כל החשבונות למצב של לא-מרוחק.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "פחות"
-
-#~ msgid "Information"
-#~ msgstr "מידע"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/אנשי קשר/_התנתקות"
-
-#~ msgid "New group name"
-#~ msgstr "תן שם לקבוצה החדשה"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>חשבון:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "הוזהר (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "כלים/מרוחק מהמחשב/"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "שלח הודעה אל איש הקשר שנבחר"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "הצג פרטים עבור איש הקשר שנבחר"
-
-#~ msgid "_Chat"
-#~ msgstr "_שיחה"
-
-#~ msgid "Join a chat room"
-#~ msgstr "הצטרף לחדר השיחה:"
-
-#~ msgid "_Away"
-#~ msgstr "_רחוק מהמחשב"
-
-#~ msgid "Set an away message"
-#~ msgstr "קבע הסבר לריחוק מהמחשב"
-
-#~ msgid "Done."
-#~ msgstr "מוכן."
-
-#~ msgid "Signon: "
-#~ msgstr "מתחבר: "
-
-#~ msgid "Signon"
-#~ msgstr "מתחבר"
-
-#~ msgid "Cancel All"
-#~ msgstr "בטל הכל"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "הורד הודעת ריחוק מהמחשב"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/שיחה/ה_זהר..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/שיחה/הזהר..."
-
-#~ msgid "Warn the user"
-#~ msgstr "הזהר את המשתמש"
-
-#~ msgid "Block the user"
-#~ msgstr "חסום משתמש"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "שלח קובץ אל המשתמש"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "הסר את המשתמש מרשימת אנשי הקשר שלך"
-
-#~ msgid "Invite a user"
-#~ msgstr "הזמן משתמש"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/שיחה/_סגור חלון"
-
-#~ msgid "former lead developer"
-#~ msgstr "מפתח מרכזי לשעבר"
-
-#~ msgid "former maintainer"
-#~ msgstr "מתחזק נוכחי"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "אזרביג'נית"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "ולדימירה גיריגינובה וולדמיר (קלאדן) פטרוב"
-
-#~ msgid "Burmese"
-#~ msgstr "בורמית"
-
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "נורבגית"
-
-#~ msgid "Punjabi"
-#~ msgstr "פאנג'בית"
-
-#~ msgid "Ukrainian"
-#~ msgstr "אוקראינית"
-
-#~ msgid "Xhosa"
-#~ msgstr "קוזה"
-
-#~ msgid "Chinese"
-#~ msgstr "סינית"
-
-#~ msgid "_Screen name"
-#~ msgstr "שם _משתמש"
-
-#~ msgid "Warn User"
-#~ msgstr "הזהר את המשתמש"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">להזהיר את %s?</span>\n"
-#~ "\n"
-#~ "זה יעלה את רמת האזהרה של %s, ויינקטו מולו הגבלת מהירות חמורה יותר.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "?הזהר בעילום שם"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>אזהרות בעילום שם הן פחות חמורות.</b>"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "הצג שמות כינוי שקיימים בשרתים אם לא נקבע כינוי"
-
-#~ msgid "Display"
-#~ msgstr "תצוגה"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "הצג חותמות-זמן בצד הודעות"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "התעלם מ_גודל הגופן"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_שלח את פורמט ברירת המחדל שלך עם הודעות יוצאות"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "_שלח הודעה בלחיצת \"Enter\""
-
-#~ msgid "Window Closing"
-#~ msgstr "סגירת החלונות"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_סגור חלון בלחיצת \"ESC\""
-
-#~ msgid "Insertions"
-#~ msgstr "הכנסות"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Ctrl-(B/I/U) משנה פירמוט"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr " הוספת חיוך ב \"Ctrl+מספר\" "
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "הצג לחצים בתור:"
-
-#~ msgid "Text"
-#~ msgstr "טקסט"
-
-#~ msgid "Pictures and text"
-#~ msgstr "טקסט עם תמונות"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "הפ_על את החלון בעת אירועים"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "הצג את רמות א_זהרה"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "אפשר פקודות \"קו-נטוי\""
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "הצג _כינויים בטאבים וכותרות"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "הצג ו_מקד חלון שיחה בעת אירוע"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "הצג ו_מקד חלון צ'אט בעת אירוע"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "השתמש בשמות מרובי-_צבעים בצ'אט"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "מי_קום הלשוניות:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "מיקום חלון שיחה חד_ש:"
-
-#~ msgid "Message Text"
-#~ msgstr "טקסט ההודעות"
-
-#~ msgid "Shortcuts"
-#~ msgstr "קיצורי מקשים"
-
-#~ msgid "Please create an account."
-#~ msgstr "אנא צור חשבון חדש"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>חשבון_:</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "חש_בונות"
-
-#~ msgid "P_references"
-#~ msgstr "ה_עדפות"
-
-#~ msgid "_Sign on"
-#~ msgstr "ה_תחבר"
-
-#~ msgid "Available for friends only"
-#~ msgstr "זמין רק לחברים"
-
-#~ msgid "Away for friends only"
-#~ msgstr "מרוחק מהמחשב רק לחברים"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "בלתי נראה רק לחברים"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "אין אפשרות להסיק את שם המארח"
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "שגיאה בכתיבת ההודעה אל השקע."
-
-#~ msgid "Authentication failed."
-#~ msgstr "האימות נכשל."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "קוד שגיאה לא מוכר"
-
-#~ msgid "Reading data"
-#~ msgstr "קורא נתונים"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "לחיצת יד המאזן"
-
-#~ msgid "Reading server key"
-#~ msgstr "קורא מפתח של השרת"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "מחליף קוד מפתחות"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "שגיאה קריטית בספריית GG\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "לא ניתן להתחבר לשרת"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "מחפש את שרת ה GG"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "מספר-הזיהוי אינו מזהה חוקי ב-Gadu-Gadu"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "את/ה מנסה לשלוח הודעה למספר-זיהוי שאינו מזהה חוקי ב-Gadu-Gadu"
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "לא ניתן לקבל תוצאות החיפוש"
-
-#~ msgid "Sex"
-#~ msgstr "מין:"
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "לא ניתן לייבא את רשימת אנשי הקשר מהשרת."
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "רשימת אנשי הקשר הועברה בהצלחה לשרת ה-Gadu-Gadu"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "לא ניתן לייצא את רשימת אנשי הקשר אל שרת ה-Gadu-Gadu"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "רשימת אנשי הקשר נמחקה בהצלחה משרת ה-Gadu-Gadu"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "לא ניתן למחוק את רשימת אנשי הקשר משרת ה-Gadu-Gadu"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "לא ניתן להחליף סיסמא"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "שגיאה בתקשורת עם שרת ה-Gadu-Gadu"
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "לא ניתן לייבא את רשימת אנשי הקשר של Gadu-Gadu"
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "לא ניתן למחוק את רשימת אנשי הקשר של Gadu-Gadu"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "אין אפשרות להיכנס אל הספריה"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "לא ניתן לגשת לפרופיל המשתמש."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "המשתמש %s (%s%s%s%s%s) רוצה ממך הרשאה."
-
-#~ msgid "Send message through server"
-#~ msgstr "שלח הודעה דרך השרת"
-
-#~ msgid "Connecting..."
-#~ msgstr "מתחבר..."
-
-#~ msgid "Nick:"
-#~ msgstr "כינוי:"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "העברת הקובץ בוטלה"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "שם משתמש לא חוקי '%s'"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "שגיאה ברשימת החדרים"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "המשתמש %s רוצה להוסיף אותך לרשימת אנשי הקשר שלו."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "נותקת מהשרת, כיוון שהתחברת ממיקום נוסף"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr "נותקת כיוון שהתחברת עם משתמש זה במיקום נוסף."
-
-#~ msgid "Not specified"
-#~ msgstr "לא הוגדר"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש מסתיים ברווח."
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "אני עובד ומקווה למשהו להסיח את הדעת -- שלחו הודעות!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "קבע את הודעת הזמינות..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "לא ניתן לעזוב את הערוץ"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "נותקת מהשרת כיוון שהתחברת דרך מחשב נוסף או מכשיר אחר."
-
-#~ msgid "Please enter your password"
-#~ msgstr "הכנס סיסמא:"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s התחבר."
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s הרגע הוזהר ע\"י %s.\n"
-#~ "רמת האזהרה החדשה שלך הינה %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "אדם אלמוני"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s הזמין את %s לחדר הצ'אט %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "סליחה, אבל אני רצתי לשנייה החוצה"
-
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/שיחה/שנוי _כינוי..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/אפשרויות/הטבע _חותמת זמן על שיחות"
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "הצג הודעות על סגירת שיחות"
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "השיחה הפכה ללא-פעילה ונותקה בשל חוסר פעילות לאורך זמן."
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "משלוח הקובץ %s בוטל מפאת חוסר פעילות."
-
-#~ msgid "Local Addressbook"
-#~ msgstr "פנקס כתובות מקומי"
-
-#~ msgid "_Preferences"
-#~ msgstr "העדפות"
-
-#~ msgid "Update Buddy Icon"
-#~ msgstr "עדכן את סמל איש הקשר"
-
-#~ msgid "Error writing to %s server"
-#~ msgstr "שגיאה בכתיבה לשרת %s"
-
-#~ msgid "Error reading from %s server"
-#~ msgstr "שגיאה בקריאה משרת %s"
-
-#~ msgid "Notification"
-#~ msgstr "הודעה"
-
-#~ msgid "That file does not exist."
-#~ msgstr "הקובץ אינו קיים"
-
-#~ msgid "%s was not found.\n"
-#~ msgstr "%s לא נמצא."
-
-#~ msgid "Userid"
-#~ msgstr "משתמש שם"
-
-#~ msgid "Your message to %s did not get sent:"
-#~ msgstr "ההודעה שלך ל-%s לא נשלחה:"
-
-#~ msgid "boring default"
-#~ msgstr "ברירת המחדל משעממת"
-
-#~ msgid "Buddy icon file:"
-#~ msgstr "קובץ סמל איש הקשר:"
-
-#~ msgid "_Browse"
-#~ msgstr "_עיין"
-
-#~ msgid "_Reset"
-#~ msgstr "_קבע מחדש"
-
-#~ msgid "/Tools/P_rotocol Actions"
-#~ msgstr "/כלים/פעולות של _פרוטוקול"
-
-#~ msgid "That file already exists."
-#~ msgstr "הקובץ כבר קיים"
-
-#~ msgid "Style"
-#~ msgstr "סגנון"
-
-#~ msgid "_Bold"
-#~ msgstr "_מודגש"
-
-#~ msgid "_Underline"
-#~ msgstr "_קו תחתון"
-
-#~ msgid "_Strikethrough"
-#~ msgstr "ק_ו חוצה"
-
-#~ msgid "Face"
-#~ msgstr "סוג"
-
-#~ msgid "Use custo_m face"
-#~ msgstr "השתמש בגופן מותאם אישית"
-
-#~ msgid "Use custom si_ze"
-#~ msgstr "השתמש בגודל מותאם אישית"
-
-#~ msgid "Color"
-#~ msgstr "צבע"
-
-#~ msgid "Bac_kground color"
-#~ msgstr "צבע הרקע"
-
-#~ msgid "Show _URLs as links"
-#~ msgstr "הצג את כתובות אינטרנט בתור קישורים"
-
-#~ msgid "Buddy List Toolbar"
-#~ msgstr "סרגל כלים של רשימת אנשי הקשר"
-
-#~ msgid "Group Display"
-#~ msgstr "תצוגת קבוצות"
-
-#~ msgid "Show _numbers in groups"
-#~ msgstr "מי_ספור הקבוצות"
-
-#~ msgid "Send _URLs as links"
-#~ msgstr "שלח _כתובות אינרנט בתור קישורים"
-
-#~ msgid "Show IMs and chats in _same tabbed window"
-#~ msgstr "הצג שיחות והודעות מיידיות באותו חלון לשוניות"
-
-#~ msgid "Show status _icons on tabs"
-#~ msgstr "הצג סמלי מצב על גבי לשוניות הכרטיסיות"
-
-#~ msgid "Window"
-#~ msgstr "חלון"
-
-#~ msgid "New window _width:"
-#~ msgstr "רוחב החלון:"
-
-#~ msgid "New window _height:"
-#~ msgstr "גובה החלון:"
-
-#~ msgid "_Entry field height:"
-#~ msgstr "גובה חלון הטקסט:"
-
-#~ msgid "Hide window on _send"
-#~ msgstr "הסתר חלון לאחר שליחת ההודעה"
-
-#~ msgid "Buddy Icons"
-#~ msgstr "סמלים אנשי הקשר"
-
-#~ msgid "Typing Notification"
-#~ msgstr "התרעה על הקלדה"
-
-#~ msgid "Tab Completion"
-#~ msgstr "השלמות מילים"
-
-#~ msgid "_Tab-complete nicks"
-#~ msgstr "ה_שלם שמות משתמשים בלחיצת TAB"
-
-#~ msgid "_Show people joining in window"
-#~ msgstr "הצג שמות מ_צטרפים בחלון"
-
-#~ msgid "_Show people leaving in window"
-#~ msgstr "הצג שמות ה_עוזבים בחלון"
-
-#~ msgid "Co_lorize screen names"
-#~ msgstr "צבע שמות משתמשים"
-
-#~ msgid "Sounds when you _log in"
-#~ msgstr "צלילים במהלך הה_תחברות"
-
-#~ msgid "Seconds before _resending:"
-#~ msgstr "_שניות לפני שליחה מחודשת:"
-
-#~ msgid "Protocols"
-#~ msgstr "פרוטוקולים"
-
-#~ msgid "Unable to request USR\n"
-#~ msgstr "לא ניתן לבקש USR\n"
-
-#~ msgid "Unable to send USR"
-#~ msgstr "לא ניתן לשלוח USR\n"
-
-#~ msgid "Unable to request CVR\n"
-#~ msgstr "לא ניתן לבקש CVR\n"
-
-#~ msgid "Unable to request INF\n"
-#~ msgstr "לא ניתן לבקש INF\n"
-
-#~ msgid "Got invalid XFR"
-#~ msgstr "התקבל XFR לא תקף"
-
-#~ msgid "Unable to parse message."
-#~ msgstr "לא ניתן לפענח את ההודעה."
-
-#~ msgid "Unable to write to MSN Nexus server."
-#~ msgstr "לא ניתן לכתוב לשרת ה-MSN Nexus"
-
-#~ msgid "Unable to send password"
-#~ msgstr "לא ניתן לשלוח סיסמא"
-
-#~ msgid "Protocol not supported"
-#~ msgstr "הפרוטוקול אינו נתמך"
-
-#~ msgid "Unable to transfer to notification server"
-#~ msgstr "לא ניתן להעביר אל שרת ההתרעות"
-
-#~ msgid "IO Error."
-#~ msgstr "שגיאת קלט/פלט"
-
-#~ msgid "Username: <b>%s</b><br>\n"
-#~ msgstr "שם משתמש: <b>%s</b><br>\n"
-
-#~ msgid "Warning Level: <b>%d%%</b><br>\n"
-#~ msgstr "רמת אזהרה: <b>%d%%</b><br>\n"
-
-#~ msgid "Online Since: <b>%s</b><br>\n"
-#~ msgstr "מחובר מאז: <b>%s</b><br>\n"
-
-#~ msgid "Member Since: <b>%s</b><br>\n"
-#~ msgstr "חבר מאז: <b>%s</b><br>\n"
-
-#~ msgid "Idle: <b>%s</b>"
-#~ msgstr "לא פעיל: <b>%s</b>"
-
-#~ msgid "Idle: <b>Active</b>"
-#~ msgstr "לא פעיל: <b>פעיל</b>"
-
diff -r 6ec8bae7d98a -r cb5bd3c045a9 po/hu.po
--- a/po/hu.po	Wed May 23 23:13:11 2007 +0000
+++ b/po/hu.po	Wed May 23 23:17:50 2007 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: gaim 2.0-beta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-01 21:06+0200\n"
-"PO-Revision-Date: 2007-05-02 15:49+0200\n"
+"POT-Creation-Date: 2007-05-21 00:01-0400\n"
+"PO-Revision-Date: 2007-05-22 13:31+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
@@ -45,25 +45,31 @@
 "  -n, --nologin       ne jelentkezzen be automatikusan\n"
 "  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
 
-#: ../finch/finch.c:304 ../pidgin/gtkmain.c:689
-#, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr "A(z) %s hibákat észlelt a beállításainak átköltöztetése (%s -> %s) során. Az átköltöztetést saját kezűleg kell befejeznie. Jelentse ezt a hibát a http://developer.pidgin.im oldalon."
-
-#: ../finch/finch.c:306
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274
+#: ../finch/finch.c:303
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
-#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1401
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../finch/finch.c:301
+#: ../pidgin/gtkmain.c:685
+#, c-format
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr "A(z) %s hibákat észlelt a beállításainak átköltöztetése (%s -> %s) során. Az átköltöztetést saját kezűleg kell befejeznie. Jelentse ezt a hibát a http://developer.pidgin.im oldalon."
+
+#: ../finch/gntaccount.c:119
+#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426
+#: ../finch/gntplugin.c:181
+#: ../finch/gntplugin.c:225
+#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
 #: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
@@ -77,16 +83,19 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Fiók megjelenő neve nem lehet üres."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
+#: ../finch/gntaccount.c:423
+#: ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "Értesítések új levélre"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+#: ../finch/gntaccount.c:433
+#: ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "Emlékezzen a jelszóra"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
-#: ../pidgin/gtkblist.c:3948
+#: ../finch/gntaccount.c:474
+#: ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "Fiók módosítása"
 
@@ -94,49 +103,71 @@
 msgid "New Account"
 msgstr "Új fiók"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500
+#: ../pidgin/gtkaccount.c:427
+#: ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
-#: ../pidgin/gtkblist.c:5357
+#: ../finch/gntaccount.c:508
+#: ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Felhasználónév:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+#: ../finch/gntaccount.c:521
+#: ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5378
-#: ../pidgin/gtkblist.c:5741
+#: ../finch/gntaccount.c:531
+#: ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "Álnév:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
-#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2137 ../finch/gntplugin.c:336
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
-#: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../finch/gntaccount.c:554
+#: ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838
+#: ../finch/gntblist.c:332
+#: ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:768
+#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061
+#: ../finch/gntblist.c:2155
+#: ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456
+#: ../finch/gntpounce.c:654
+#: ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142
+#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984
+#: ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269
+#: ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661
+#: ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1763
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:874
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
-#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/msn/msn.c:259
+#: ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293
+#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -152,9 +183,9 @@
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5481
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:468
 #: ../libpurple/protocols/silc/buddy.c:1084
 #: ../libpurple/protocols/silc/buddy.c:1189
@@ -163,34 +194,54 @@
 #: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
 #: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:991
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
-#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5797
-#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
-#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
-#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
-#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242
+#: ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485
+#: ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725
+#: ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955
+#: ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999
+#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069
+#: ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166
+#: ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232
+#: ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302
+#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566
+#: ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607
+#: ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270
+#: ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "Mégsem"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../finch/gntaccount.c:558
+#: ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:478
+#: ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Mentés"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
+#: ../finch/gntaccount.c:611
+#: ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -201,16 +252,25 @@
 msgstr "Fiók törlése"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../finch/gntaccount.c:616
+#: ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653
+#: ../finch/gntpounce.c:714
+#: ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204
+#: ../pidgin/gtkaccount.c:1893
+#: ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2043 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:539
+#: ../finch/gntaccount.c:646
+#: ../finch/gntblist.c:2060
+#: ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311
+#: ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Fiókok"
 
@@ -219,50 +279,68 @@
 msgstr "A következő lista fiókjait engedélyezheti/tilthatja le."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:837
+#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436
+#: ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699
+#: ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878
+#: ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
-#: ../pidgin/gtkblist.c:5796 ../pidgin/gtkconv.c:1633
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599
+#: ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828
+#: ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Hozzáadás"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:679
+#: ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "Módosítás"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
+#: ../finch/gntaccount.c:760
+#: ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s felvette %s partnert %s%s"
 
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2469
+#: ../finch/gntaccount.c:833
+#: ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "Felveszi a partnert a partnerlistájára?"
 
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
+#: ../finch/gntaccount.c:887
+#: ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s felhasználó szeretné %s partnert felvenni a partnerlistájára%s%s"
 
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+#: ../finch/gntaccount.c:907
+#: ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2558
+#: ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "Engedélyezi a partnert?"
 
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:911
+#: ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2559
+#: ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "Engedélyezés"
 
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
+#: ../finch/gntaccount.c:912
+#: ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2560
+#: ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "Elutasítás"
 
@@ -278,221 +356,289 @@
 msgid "You must select an account."
 msgstr "Ki kell választania egy fiókot."
 
-#: ../finch/gntblist.c:286
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "A kiválasztott fiók nem online."
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "Hiba a partner hozzáadásakor"
 
-#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2837
-#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:313
+#: ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969
+#: ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Felhasználónév"
 
-#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
-#: ../finch/gntblist.c:1193 ../libpurple/protocols/msn/msn.c:1351
+#: ../finch/gntblist.c:316
+#: ../finch/gntblist.c:393
+#: ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
 #: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../libpurple/protocols/zephyr/zephyr.c:1207
+#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Álnév"
 
-#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+#: ../finch/gntblist.c:319
+#: ../finch/gntblist.c:396
 msgid "Group"
 msgstr "Csoport"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1243
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2946 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:323
+#: ../finch/gntblist.c:384
+#: ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171
+#: ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965
+#: ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269
+#: ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "Fiók"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../finch/gntblist.c:329
+#: ../finch/gntblist.c:817
 #: ../libpurple/protocols/silc/buddy.c:737
 #: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/buddy.c:1080
 #: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5311
+#: ../libpurple/protocols/yahoo/yahoo.c:3144
+#: ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Partner felvétele"
 
-#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "Adja meg a partnerinformációkat."
 
-#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:356
+#: ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Csevegések"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
-#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1616
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../finch/gntblist.c:390
+#: ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532
+#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/qq/buddy_info.c:44
+#: ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Név"
 
-#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5687
+#: ../finch/gntblist.c:399
+#: ../finch/gntblist.c:819
+#: ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "Csevegés hozzáadása"
 
-#: ../finch/gntblist.c:398
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "Később a helyi menüből további információkat is módosíthat."
 
-#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+#: ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "Hiba a csoport hozzáadásakor"
 
-#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "Meg kell adnia a felvenni kívánt csoport nevét."
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "Ilyen nevű csoport már létezik."
 
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
-#: ../libpurple/protocols/sametime/sametime.c:5390
-#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5793
+#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484
+#: ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "Csoport felvétele"
 
-#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "Adja meg a csoport nevét"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "Csevegés szerkesztése"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "Frissítse a szükséges mezőket."
 
-#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:768
+#: ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: ../finch/gntblist.c:778
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "Automatikus csatlakozás"
 
-#: ../finch/gntblist.c:787
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "Beállítások szerkesztése"
 
-#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:831
+#: ../finch/gntconv.c:317
+#: ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "Információk"
+
+#: ../finch/gntblist.c:831
+#: ../finch/gntconv.c:317
+#: ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "Lekérés..."
+
+#: ../finch/gntblist.c:864
+#: ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "Információ lekérése"
 
-#: ../finch/gntblist.c:855
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "Partnerfigyelmeztetés felvétele"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:635
-#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+#: ../finch/gntblist.c:875
+#: ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636
+#: ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "Fájl küldése"
 
-#: ../finch/gntblist.c:866
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "Napló megtekintése"
 
-#: ../finch/gntblist.c:947
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Kérem adja meg új  %snevét"
 
-#: ../finch/gntblist.c:949 ../finch/gntblist.c:1193
+#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: ../finch/gntblist.c:950
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "Álnév beállítása"
+
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "A név visszaállításához üres karakterláncot adjon meg."
 
-#: ../finch/gntblist.c:1026
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "A kapcsolat eltávolítása a kapcsolat partnereit is eltávolítja"
 
-#: ../finch/gntblist.c:1034
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "A csoport eltávolítása a csoportban található partnereket is eltávolítja"
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Biztos, hogy törölni akarja a következőt: %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1042
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "Eltávolítás jóváhagyása"
 
-#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1195 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1060
+#: ../finch/gntblist.c:1211
+#: ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135
+#: ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Eltávolítás"
 
 #. Buddy List
-#: ../finch/gntblist.c:1169 ../finch/gntblist.c:2214 ../finch/gntprefs.c:239
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4190
+#: ../finch/gntblist.c:1185
+#: ../finch/gntblist.c:2232
+#: ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77
+#: ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Partnerlista"
 
-#: ../finch/gntblist.c:1200
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "Hely megcímkézve"
 
-#: ../finch/gntblist.c:1205
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "Címke átváltása"
 
 #. General
-#: ../finch/gntblist.c:1238 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../finch/gntblist.c:1254
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045
+#: ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1564
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/jabber/jabber.c:815
-#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367
+#: ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2970
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042
+#: ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "Becenév"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1258 ../finch/gntprefs.c:242
+#: ../finch/gntblist.c:1274
+#: ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:516
+#: ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2902
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2990
-#: ../pidgin/gtkblist.c:3379 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686
+#: ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399
+#: ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "Inaktív"
 
-#: ../finch/gntblist.c:1347
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -501,12 +647,12 @@
 "Elérhető: %d\n"
 "Összesen: %d"
 
-#: ../finch/gntblist.c:1356
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Fiók: %s (%s)"
 
-#: ../finch/gntblist.c:1368
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -515,48 +661,65 @@
 "\n"
 "Utoljára látszott: %s"
 
-#: ../finch/gntblist.c:1632 ../pidgin/gtkdocklet.c:487
+#: ../finch/gntblist.c:1649
+#: ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "Új..."
 
-#: ../finch/gntblist.c:1639 ../pidgin/gtkdocklet.c:488
+#: ../finch/gntblist.c:1656
+#: ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Mentett..."
 
-#: ../finch/gntblist.c:2011 ../finch/gntplugin.c:224 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:540 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2028
+#: ../finch/gntplugin.c:244
+#: ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523
+#: ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: ../finch/gntblist.c:2118 ../pidgin/gtkdialogs.c:703
-#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136
+#: ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844
+#: ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "_Név"
 
-#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141
+#: ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849
+#: ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "_Fiók"
 
-#: ../finch/gntblist.c:2131 ../pidgin/gtkdialogs.c:716
+#: ../finch/gntblist.c:2149
+#: ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "Új azonnali üzenet"
 
-#: ../finch/gntblist.c:2133 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2151
+#: ../pidgin/gtkdialogs.c:721
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek üzenni szeretne."
 
-#: ../finch/gntblist.c:2136 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../finch/gntblist.c:2154
+#: ../finch/gntconn.c:48
+#: ../finch/gntnotify.c:77
+#: ../libpurple/account.c:983
+#: ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660
 #: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/msn/msn.c:258
+#: ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
 #: ../libpurple/protocols/silc/buddy.c:467
 #: ../libpurple/protocols/silc/buddy.c:1188
 #: ../libpurple/protocols/silc/chat.c:425
@@ -565,36 +728,41 @@
 #: ../libpurple/protocols/silc/ops.c:1297
 #: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:990
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
-#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3947
-#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241
+#: ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724
+#: ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "Rendben"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2156 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2174
+#: ../finch/gntpounce.c:444
+#: ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Beállítások"
 
-#: ../finch/gntblist.c:2162
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "Üzenet küldése..."
 
-#: ../finch/gntblist.c:2166
-msgid "Toggle offline buddies"
-msgstr "Offline partnerek be/ki"
-
-#: ../finch/gntblist.c:2172
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "Kilépett partnerek megjelenítése"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "Állapot szerint"
 
-#: ../finch/gntblist.c:2176
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "ABC sorrend"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "Naplóméret szerint"
 
@@ -617,57 +785,64 @@
 "%s kapcsolata megszakadt a következő hiba miatt:\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3944
+#: ../finch/gntconn.c:45
+#: ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "Kapcsolódási hiba"
 
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3949
+#: ../finch/gntconn.c:49
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "Kapcsolódás"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "Nincs ilyen parancs."
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120
+#: ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"Szintaktikai hiba:  Nem megfelelő számú paramétert adott meg ennek a "
-"parancsnak."
-
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+msgstr "Szintaktikai hiba:  Nem megfelelő számú paramétert adott meg ennek a parancsnak."
+
+#: ../finch/gntconv.c:125
+#: ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "A parancs végrehajtása ismeretlen ok miatt sikertelen."
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130
+#: ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "Ez a parancs csak csevegéskor működik, azonnali üzeneteknél nem."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133
+#: ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "Ez a parancs csak azonnali üzeneteknél működik, csevegéskor nem."
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137
+#: ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "Ez a parancs nem működik ezzel a protokollal."
 
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "A parancsok még nem támogatottak. Az üzenet NEM lett elküldve."
 
-#: ../finch/gntconv.c:217
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:240
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#: ../finch/gntconv.c:258
+#: ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -676,85 +851,115 @@
 "\n"
 "%s gépel..."
 
-#: ../finch/gntconv.c:390
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "Elhagyta ezt a csevegést."
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "Küldés ennek"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "Társalgás"
+
+#: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "Előzmények törlése"
+
+#: ../finch/gntconv.c:407
+#: ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "Időbélyegek"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "Partnerfigyelmeztetés felvétele..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATIKUS VÁLASZ> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "Felhasználólista:\n"
 
-#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847
+#: ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "A támogatott hibakeresési parancsok:  version"
 
-#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882
+#: ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "Nincs ilyen parancs (ebben a kontextusban)."
 
-#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885
+#: ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Használja a \"&lt;help parancs&gt;\" utasítást egy adott parancs súgójának "
-"megtekintéséhez.\n"
+"Használja a \"&lt;help parancs&gt;\" utasítást egy adott parancs súgójának megtekintéséhez.\n"
 "Ebben a kontextusban a következő parancsok állnak rendelkezésre:\n"
 
-#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
+#: ../finch/gntconv.c:943
+#: ../pidgin/gtkconv.c:7085
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;üzenet&gt;: Üzenet küldése, mintha nem használná a parancsot."
 
-#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+#: ../finch/gntconv.c:946
+#: ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy "
-"csevegésnek."
-
-#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;parancs&gt;: Különböző hibakeresési információk küldése a jelenlegi "
-"társalgásba."
-
-#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+msgstr "me &lt;művelet&gt;: IRC stílusú művelet küldése egy partnernak vagy csevegésnek."
+
+#: ../finch/gntconv.c:949
+#: ../pidgin/gtkconv.c:7091
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "debug &lt;parancs&gt;: Különböző hibakeresési információk küldése a jelenlegi társalgásba."
+
+#: ../finch/gntconv.c:952
+#: ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Törli a társalgás előzményeit."
 
-#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+#: ../finch/gntconv.c:955
+#: ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;parancs&gt;: Egy adott parancs súgója."
 
-#: ../finch/gntconv.c:710
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users: A csevegés felhasználólistájának megjelenítése."
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins: A bővítmények ablak megjelenítése."
 
-#: ../finch/gntconv.c:713
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: A partnerlista megjelenítése."
 
-#: ../finch/gntconv.c:716
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts: A fiókok ablak megjelenítése."
 
-#: ../finch/gntconv.c:719
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: A hibakereső ablak megjelenítése."
 
-#: ../finch/gntconv.c:722
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs: A beállítások ablak megjelenítése."
 
-#: ../finch/gntconv.c:725
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: A mentett állapotok ablak megjelenítése."
 
-#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+#: ../finch/gntdebug.c:230
+#: ../finch/gntui.c:79
+#: ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "Hibakereső ablak"
 
@@ -762,37 +967,46 @@
 #. * 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:232 ../pidgin/gtkdebug.c:769
+#: ../finch/gntdebug.c:251
+#: ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "Törlés"
 
-#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "Szűrő:"
+
+#: ../finch/gntdebug.c:261
+#: ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
-msgid "Timestamps"
-msgstr "Időbélyegek"
-
-#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#: ../finch/gntft.c:117
+#: ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Fájlátvitelek - %2$d fájl %1$d százaléka"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#: ../finch/gntft.c:122
+#: ../finch/gntft.c:194
+#: ../finch/gntui.c:80
+#: ../pidgin/gtkft.c:233
+#: ../pidgin/gtkft.c:763
 msgid "File Transfers"
 msgstr "Fájlátvitel"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:197
+#: ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Folyamat"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:197
+#: ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:197
+#: ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Méret"
 
@@ -800,31 +1014,38 @@
 msgid "Speed"
 msgstr "Sebesség"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:197
+#: ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Hátralévő"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../finch/gntft.c:197
+#: ../finch/gntstatus.c:537
+#: ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1034
+#: ../libpurple/protocols/gg/gg.c:1573
 #: ../libpurple/protocols/gg/gg.c:1581
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2650
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3034
-#: ../pidgin/gtkblist.c:3047 ../pidgin/gtkblist.c:3049
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:3049
+#: ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943
+#: ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Állapot"
 
@@ -841,101 +1062,139 @@
 msgstr "Leállítás"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233
+#: ../finch/gntnotify.c:179
+#: ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291
+#: ../finch/gntpounce.c:722
+#: ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375
+#: ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:299
+#: ../pidgin/gtkft.c:168
+#: ../pidgin/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "Várakozás az átvitel indulására"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:366
+#: ../pidgin/gtkft.c:165
+#: ../pidgin/gtkft.c:1056
 msgid "Canceled"
 msgstr "Megszakítva"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:368
+#: ../pidgin/gtkft.c:1058
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:414
+#: ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/mp"
 
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:425
+#: ../finch/gntft.c:426
+#: ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1118
 msgid "Finished"
 msgstr "Befejeződött"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428
+#: ../libpurple/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Átvitel"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "E-mailek"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168
+#: ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "Levele érkezett!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+#: ../finch/gntnotify.c:171
+#: ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "Feladó"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171
+#: ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Tárgy"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) %d új üzenetet kapott."
 msgstr[1] "%s (%s) %d új üzenetet kapott."
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222
+#: ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Új e-mail"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287
+#: ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "%s információi"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288
+#: ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "Partnerinformáció"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "Folytatás"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
+#: ../finch/gntnotify.c:372
+#: ../pidgin/gtkconv.c:1627
+#: ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "Információ"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
+#: ../finch/gntnotify.c:375
+#: ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "Azonnali üzenet"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "Csatlakozás"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381
+#: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Meghívás"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(nincs)"
 
-#: ../finch/gntplugin.c:111
+#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "HIBA"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "a bővítmény betöltése sikertelen"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "a bővítmény eltávolítása meghiúsult"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -952,36 +1211,43 @@
 "Weboldal: %s\n"
 "Fájlnév: %s\n"
 
-#: ../finch/gntplugin.c:164
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "A bővítményt be kell tölteni, mielőtt beállíthatná."
 
-#: ../finch/gntplugin.c:208
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "A bővítménynek nincsenek beállításai."
 
-#: ../finch/gntplugin.c:229
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "A következő lista bővítményeit töltheti be vagy távolíthatja el."
 
-#: ../finch/gntplugin.c:272
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "Bővítmény beállítása"
 
-#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:541 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntplugin.c:352
+#: ../finch/gntplugin.c:359
+#: ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkdocklet.c:524
+#: ../pidgin/gtkprefs.c:1953
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:180
+#: ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "Adjon meg egy figyelendő partnert."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325
+#: ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "Új partnerfigyelmeztetés"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325
+#: ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "Partnerfigyelmeztetés szerkesztése"
 
@@ -991,8 +1257,10 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5405
-#: ../pidgin/gtkblist.c:5721
+#: ../finch/gntpounce.c:333
+#: ../finch/gntstatus.c:446
+#: ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "Fiók:"
 
@@ -1001,7 +1269,8 @@
 msgstr "Partner neve:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:371
+#: ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "Figyelmeztetés, ha a partner..."
 
@@ -1046,7 +1315,8 @@
 msgstr "Üzenetet küld"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:411
+#: ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "Művelet"
 
@@ -1074,135 +1344,160 @@
 msgid "Pounce only when my status is not available"
 msgstr "Csak akkor figyelmeztet, ha az állapotom nem érhető el"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:447
+#: ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "Ismétlődő"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:649
+#: ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Biztos, hogy törölni akarja %s figyelmeztetését a következőnek: %s?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:682
+#: ../finch/gntui.c:78
+#: ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "Partnerfigyelmeztetések"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:794
+#: ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s gépelni kezdett Önnek (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:796
+#: ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s szünetet tart az Önnek gépelés közben (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:798
+#: ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s belépett (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:800
+#: ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s inaktív állapota megszűnt (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:802
+#: ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s visszatért (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:804
+#: ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s abbahagyta a gépelést (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:806
+#: ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s kilépett (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:808
+#: ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s állapota inaktív (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:810
+#: ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s távol van. (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:812
+#: ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s egy üzenetet küldött. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:813
+#: ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ismeretlen figyelmeztetési esemény. Kérjük jelentse ezt!"
 
-#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "Billentyűzet használata alapján"
+
+#: ../finch/gntprefs.c:81
+#: ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "Utolsó elküldött üzenettől"
 
-#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../finch/gntprefs.c:83
+#: ../pidgin/gtkprefs.c:820
+#: ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813
+#: ../pidgin/gtkprefs.c:1827
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Soha"
 
-#: ../finch/gntprefs.c:170
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "Inaktivitási idők megjelenítése"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "Kilépett partnerek megjelenítése"
 
-#: ../finch/gntprefs.c:177
-msgid "Show Timestamps"
-msgstr "Időbélyegek"
-
-#: ../finch/gntprefs.c:178
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "Partnerek figyelmeztetése, ha nekik gépel"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "Naplóformátum"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "Üzenetek naplózása"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "Csevegések naplózása"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "Állapotváltozások naplózása"
 
 #. Conversations
-#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241
+#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Társalgások"
 
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242
+#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "Naplózás"
 
-#: ../finch/gntrequest.c:530
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "Még nincs megvalósítva."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../finch/gntrequest.c:597
+#: ../pidgin/gtkrequest.c:1529
 #: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "Fájl mentése..."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../finch/gntrequest.c:597
+#: ../pidgin/gtkrequest.c:1530
 #: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "Fájl megnyitása..."
@@ -1216,11 +1511,13 @@
 msgid "Delete Status"
 msgstr "Állapot törlése"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:170
+#: ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "Mentett állapotok"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:177
+#: ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
@@ -1228,49 +1525,58 @@
 msgid "Title"
 msgstr "Beosztás"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:177
+#: ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "Típus"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:177
+#: ../finch/gntstatus.c:554
+#: ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/gg/gg.c:1072
+#: ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594
+#: ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610
+#: ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624
+#: ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5463
-#: ../libpurple/protocols/oscar/oscar.c:5681
-#: ../libpurple/protocols/oscar/oscar.c:5695
-#: ../libpurple/protocols/oscar/oscar.c:5711
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:490
+#: ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Üzenet"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:189
+#: ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "Használat"
 
@@ -1294,7 +1600,8 @@
 msgid "Substatus"
 msgstr "Alállapot"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454
+#: ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Állapot:"
 
@@ -1328,108 +1635,106 @@
 msgstr "Vágólap bővítmény"
 
 #: ../finch/plugins/gntclipboard.c:152
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
 msgstr "A gnt vágólap tartalmának megváltozásakor a tartalom elérhetővé válik az X által, ha lehetséges."
 
-#: ../finch/plugins/gntgf.c:223
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s belépett"
 
-#: ../finch/plugins/gntgf.c:230
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s kilépett"
 
-#: ../finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s egy üzenetet küldött"
 
-#: ../finch/plugins/gntgf.c:257
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s kimondta az Ön nevét itt: %s"
 
-#: ../finch/plugins/gntgf.c:259
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s egy üzenetet küldött itt: %s"
 
-#: ../finch/plugins/gntgf.c:297
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Partner be-/kilép"
 
-#: ../finch/plugins/gntgf.c:298
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Üzenetet kap"
 
-#: ../finch/plugins/gntgf.c:299
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Valaki beszél egy csevegésben"
 
-#: ../finch/plugins/gntgf.c:300
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Valaki csevegés közben leírja az Ön nevét"
 
-#: ../finch/plugins/gntgf.c:328
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Értesítsen egy kenyérpirítóval ha:"
 
-#: ../finch/plugins/gntgf.c:343
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Csipogjon is!"
 
-#: ../finch/plugins/gntgf.c:349
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "SÜRGŐS állapot beállítása a terminálablakhoz."
 
-#: ../finch/plugins/gntgf.c:369
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+#: ../finch/plugins/gntgf.c:379
+#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Kenyérpirító bővítmény"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116
+#: ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Társalgás %s partnerrel ekkor: %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138
+#: ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Az előzmények bővítmény megköveteli a naplózást"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/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"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 "A naplózás engedélyezhető az Eszközök -> Beállítások -> Naplózás alatt.\n"
 "\n"
-"Az azonnali üzenetek naplózásának engedélyezése a megfelelő társalgástípusok "
-"előzményeit is aktiválja."
+"Az azonnali üzenetek naplózásának engedélyezése a megfelelő társalgástípusok előzményeit is aktiválja."
 
 #: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "Gnt előzmények"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181
+#: ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Legutóbb naplózott társalgások mutatása új társalgáskor."
 
-#: ../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 ""
-"Ez a bővítmény új társalgás megnyitásakor beszúrja az utolsó társalgást az "
-"aktuális társalgásba."
+#: ../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 "Ez a bővítmény új társalgás megnyitásakor beszúrja az utolsó társalgást az aktuális társalgásba."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -1443,7 +1748,8 @@
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:123
+#: ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
 msgstr "Lastlog bővítmény."
 
@@ -1451,7 +1757,8 @@
 msgid "accounts"
 msgstr "fiókok"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/account.c:937
+#: ../libpurple/protocols/jabber/auth.c:194
 #: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "A bejelentkezéshez jelszó szükséges."
@@ -1469,13 +1776,15 @@
 msgid "Save password"
 msgstr "Jelszó mentése"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010
+#: ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Hiányzó protokollbővítmény a következőhöz: %s"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170
+#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "Az új jelszavak nem egyeznek."
 
@@ -1509,22 +1818,28 @@
 msgid "Change user information for %s"
 msgstr "Felhasználó-információk megváltoztatása %s számára"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264
+#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Felhasználói adatok beállítása"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/account.c:1744
+#: ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1399
-#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:230
+#: ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5201 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523
+#: ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520
+#: ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233
+#: ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Partnerek"
@@ -1547,8 +1862,9 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s kilépett"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/connection.c:440
+#: ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1558,7 +1874,8 @@
 msgid "Unable to send message: The message is too large."
 msgstr "Nem küldhető üzenet: az üzenet túl nagy."
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:168
+#: ../libpurple/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Nem küldhető üzenet a következőnek: %s."
@@ -1571,40 +1888,40 @@
 msgid "Unable to send message."
 msgstr "Az üzenetet nem lehet elküldeni."
 
-#: ../libpurple/conversation.c:1160
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "Üzenet küldése"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "Üzenet kül_dése"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s belépett a szobába."
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] belépett a szobába."
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "Ezentúl %s néven szerepel"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ezentúl %s néven szerepel"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s elhagyta a szobát."
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s elhagyta a szobát (%s)."
@@ -1628,7 +1945,8 @@
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "A Purple D-BUS kiszolgálója nem fut az alábbi okok miatt"
 
-#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+#: ../libpurple/desktopitem.c:286
+#: ../libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "Névtelen"
 
@@ -1640,7 +1958,8 @@
 msgid "Unable to send request to resolver process\n"
 msgstr "Nem küldhető üzenet a feloldó folyamatnak\n"
 
-#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:548
+#: ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -1649,7 +1968,8 @@
 "Hiba %s feloldásakor:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:551
+#: ../libpurple/dnsquery.c:710
 #: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
@@ -1677,7 +1997,7 @@
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1776,31 +2096,31 @@
 msgid "File transfer complete"
 msgstr "A fájlátvitel befejeződött"
 
-#: ../libpurple/ft.c:1090
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Megszakította %s átvitelét"
 
-#: ../libpurple/ft.c:1095
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "Fájlátvitel megszakítva"
 
-#: ../libpurple/ft.c:1153
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s megszakította %s átvitelét"
 
-#: ../libpurple/ft.c:1158
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s megszakította a fájlátvitelt"
 
-#: ../libpurple/ft.c:1215
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "A fájlátvitel %s partnerhez félbeszakadt."
 
-#: ../libpurple/ft.c:1217
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "A fájlátvitel %s partnertől félbeszakadt."
@@ -1874,76 +2194,40 @@
 msgstr "\"ymsgr\" URL címek kezelője"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"aim\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"aim\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a "
-"\"gg\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a \"gg\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"icq\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"icq\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"irc\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"irc\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"msnim\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"msnim\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a "
-"\"sip\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli a \"sip\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"xmpp\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"xmpp\" URL címeket."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
-"Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az "
-"\"ymsgr\" URL címeket."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgstr "Ha igazra van állítva, a \"command\" kulcsban beállított parancs kezeli az \"ymsgr\" URL címeket."
 
 #: ../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 ""
-"Ha igazra van állítva, az ilyen típusú URL címeket kezelő parancsnak "
-"terminálban kell futnia."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgstr "Ha igazra van állítva, az ilyen típusú URL címeket kezelő parancsnak terminálban kell futnia."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2003,27 +2287,21 @@
 
 #: ../libpurple/log.c:1251
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS "
-"VÁLASZ&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS VÁLASZ&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1253
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS "
-"VÁLASZ&gt;:</b></font> %s<br/>\n"
-
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTOMATIKUS VÁLASZ&gt;:</b></font> %s<br/>\n"
+
+#: ../libpurple/log.c:1311
+#: ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>A naplófájl útvonala nem található!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1323
+#: ../libpurple/log.c:1453
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>A fájl olvasása sikertelen: %s</b></font>"
@@ -2058,9 +2336,7 @@
 
 #: ../libpurple/plugin.c:547
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "A szükséges %s bővítmény nem található. Kérem telepítse, majd próbálja újra."
 
 #: ../libpurple/plugin.c:552
@@ -2089,16 +2365,15 @@
 msgid "Autoaccept"
 msgstr "Automatikus elfogadás"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25
+#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Fájlküldési kérések automatikus elfogadása kijelölt felhasználóktól."
 
 #: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr ""
-"\"%s\" automatikusan elfogadott fájlküldési kérés befejeződött a "
-"következőtől: \"%s\"."
+msgstr "\"%s\" automatikusan elfogadott fájlküldési kérés befejeződött a következőtől: \"%s\"."
 
 #: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
@@ -2117,15 +2392,18 @@
 msgid "_Save"
 msgstr "M_entés"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2225
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:5850
-#: ../libpurple/protocols/oscar/oscar.c:6076
-#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/plugins/autoaccept.c:165
+#: ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204
+#: ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147
+#: ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "Mé_gsem"
@@ -2164,12 +2442,12 @@
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Értesítsen felbukkanó ablakkal automatikusan elfogadott fájlátvitel "
-"befejeződésekor\n"
+"Értesítsen felbukkanó ablakkal automatikusan elfogadott fájlátvitel befejeződésekor\n"
 "(csak ha nem társalog a küldővel)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/plugins/buddynote.c:46
+#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "Megjegyzések"
 
@@ -2202,9 +2480,7 @@
 #. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
-"Lehetőséget biztosít jegyzetek tárolására a partnerlistáján szereplő "
-"partnerekhez."
+msgstr "Lehetőséget biztosít jegyzetek tárolására a partnerlistáján szereplő partnerekhez."
 
 #. *< type
 #. *< ui_requirement
@@ -2220,7 +2496,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267
+#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Teszteli a libpurple beépített titkosítóit."
 
@@ -2257,26 +2534,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251
+#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Lehetőséget nyújt fájlban megadott parancsokkal történő irányításra."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158
+#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Perc"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165
+#: ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225
+#: ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Inaktív idő szerkesztése"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166
+#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Fiók inaktivitási idejének beállítása"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169
+#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Beállítás"
 
@@ -2284,7 +2567,8 @@
 msgid "None of your accounts are idle."
 msgstr "Egyik fiókja sem inaktív."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200
+#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Fiók inaktivitási idejének visszaállítása"
 
@@ -2292,7 +2576,8 @@
 msgid "_Unset"
 msgstr "_Visszaállítás"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226
+#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Inaktivitási idő beállítása minden fiókhoz"
 
@@ -2300,7 +2585,8 @@
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Inaktivitási idő törlése az összes inaktív fiókhoz"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320
+#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Saját kezűleg állíthatja be, meddig volt inaktív az állapota"
 
@@ -2323,12 +2609,8 @@
 
 #. *  description
 #: ../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."
-msgstr ""
-"Bővítmények IPC támogatásának tesztelése kliensként. Ez megkeresi a "
-"kiszolgálóbővítményt és meghívja a regisztrált parancsokat."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "Bővítmények IPC támogatásának tesztelése kliensként. Ez megkeresi a kiszolgálóbővítményt és meghívja a regisztrált parancsokat."
 
 #. *< type
 #. *< ui_requirement
@@ -2350,9 +2632,7 @@
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Bővítmények IPC támogatásának tesztelése kiszolgálóként. Ez regisztrálja az "
-"IPC parancsokat."
+msgstr "Bővítmények IPC támogatásának tesztelése kiszolgálóként. Ez regisztrálja az IPC parancsokat."
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
@@ -2385,9 +2665,7 @@
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
 msgstr "Ez a bővítmény elrejti a belépés/kilépés üzeneteket nagy szobákban, a társalgásban aktívan résztvevő felhasználók kivételével."
 
 #. This is used in the place of a timezone abbreviation if the
@@ -2422,9 +2700,7 @@
 msgstr "Megszakadt a kapcsolat a kiszolgálóval."
 
 #: ../libpurple/plugins/log_reader.c:1603
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "Jelenleg nincs csatlakozva. Nem fogadhat üzeneteket, amíg nem jelentkezik be."
 
 #: ../libpurple/plugins/log_reader.c:1618
@@ -2513,17 +2789,13 @@
 #. * description
 #: ../libpurple/plugins/log_reader.c:2140
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
-"Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. "
-"Jelenleg a következők támogatottak: Adium, MSN Messenger és Trillian.\n"
+"Naplók megjelenítésekor ez a bővítmény felveszi más azonnali üzenők naplóit. Jelenleg a következők támogatottak: Adium, MSN Messenger és Trillian.\n"
 "\n"
-"FIGYELMEZTETÉS: Ez a bővítmény még alfa minőségű kód és gyakran "
-"összeomolhat. Csak saját felelősségére használja!"
+"FIGYELMEZTETÉS: Ez a bővítmény még alfa minőségű kód és gyakran összeomolhat. Csak saját felelősségére használja!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
@@ -2555,38 +2827,26 @@
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:71
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-msgstr ""
-"Új sort szúr be az üzenetek elé, így az üzenet további része a "
-"felhasználónév alatt jelenik meg a társalgás ablakában."
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgstr "Új sort szúr be az üzenetek elé, így az üzenet további része a felhasználónév alatt jelenik meg a társalgás ablakában."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Offline üzenetek emulációja"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25
+#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "A kilépett felhasználónak küldött üzenetek mentése figyelmeztetésként."
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a "
-"Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti."
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a Partnerfigyelmeztetés párbeszédablakban szerkesztheti/törölheti."
 
 #: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"\"%s\" jelenleg nem érhető el. Kívánja menteni a további üzeneteket "
-"figyelmeztetésként, majd elküldeni azokat, amikor \"%s\" legközelebb "
-"bejelentkezik?"
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" jelenleg nem érhető el. Kívánja menteni a további üzeneteket figyelmeztetésként, majd elküldeni azokat, amikor \"%s\" legközelebb bejelentkezik?"
 
 #: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
@@ -2594,26 +2854,28 @@
 
 #: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
-"A figyelmeztetést a Partnerfigyelmeztetések párbeszédablakon szerkesztheti/"
-"törölheti"
+msgstr "A figyelmeztetést a Partnerfigyelmeztetések párbeszédablakon szerkesztheti/törölheti"
 
 #: ../libpurple/plugins/offlinemsg.c:161
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522
+#: ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Igen"
 
 #: ../libpurple/plugins/offlinemsg.c:162
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522
+#: ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:120
+#: ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Nem"
@@ -2632,14 +2894,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:596
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl bővítménybetöltő"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:598 ../libpurple/plugins/perl/perl.c:599
+#: ../libpurple/plugins/perl/perl.c:603
+#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Perl bővítmények betöltését támogatja."
 
@@ -2652,13 +2915,8 @@
 msgstr "Szellemmód bejövő kapcsolathoz"
 
 #: ../libpurple/plugins/psychic.c:22
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"Hatására a társalgási ablakok megjelennek, amint más felhasználók elkezdik "
-"üzenetüket írni.  Ez az AIM, ICQ, Jabber, Sametime és Yahoo! protokollokkal "
-"működik."
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Hatására a társalgási ablakok megjelennek, amint más felhasználók elkezdik üzenetüket írni.  Ez az AIM, ICQ, XMPP, Sametime és Yahoo! protokollokkal működik."
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -2713,7 +2971,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40
+#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Tesztek, hogy a legtöbb dolog működik-e."
 
@@ -2731,7 +2990,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97
+#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Burkot biztosít az SSL-t támogató könyvtárakhoz."
 
@@ -2830,28 +3090,21 @@
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Figyelmeztet egy társalgás ablakában amikor a partner távol van, inaktív, "
-"visszaérkezik vagy az inaktív állapota megszűnik."
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "Figyelmeztet egy társalgás ablakában amikor a partner távol van, inaktív, visszaérkezik vagy az inaktív állapota megszűnik."
 
 #: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl bővítménybetöltő"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:423
+#: ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tcl bővítmények betöltését támogatja"
 
 #: ../libpurple/plugins/tcl/tcl.c:495
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"Az ActiveTCL telepítés nem észlelhető. Ha TCL bővítményeket kíván használni, "
-"akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "Az ActiveTCL telepítés nem észlelhető. Ha TCL bővítményeket kíván használni, akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
 
 #. Send a message about the connection error
 #: ../libpurple/protocols/bonjour/bonjour.c:113
@@ -2866,17 +3119,21 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/gg/gg.c:1009
+#: ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4490
-#: ../libpurple/protocols/oscar/oscar.c:5541
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3384
-#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:459 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:180
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453
+#: ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442
+#: ../pidgin/gtkprefs.c:1823
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Távol"
@@ -2891,51 +3148,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokollbővítmény"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "Purple személy"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
+#: ../libpurple/protocols/bonjour/bonjour.c:589
 #: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "Gépnév"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
+#: ../libpurple/protocols/bonjour/bonjour.c:593
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:820
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "Utónév"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
+#: ../libpurple/protocols/bonjour/bonjour.c:596
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:825
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "Vezetéknév"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
+#: ../libpurple/protocols/bonjour/bonjour.c:599
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
 #: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM fiók"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber fiók"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP fiók"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -2966,29 +3223,30 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76
+#: ../libpurple/proxy.c:1800
 msgid "Invalid proxy settings"
 msgstr "Érvénytelen proxybeállítások"
 
-#: ../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 ""
-"A megadott kiszolgálónév vagy portszám érvénytelen a megadott proxy "
-"típusához."
-
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../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 "A megadott kiszolgálónév vagy portszám érvénytelen a megadott proxy típusához."
+
+#: ../libpurple/protocols/gg/gg.c:115
+#: ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Jelsor hiba"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:116
+#: ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Nem tölthető le a jelsor.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269
+#: ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Partnerlista mentése..."
 
@@ -2996,7 +3254,8 @@
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "A partnerlistája üres, semmi nem került a fájlba."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276
+#: ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "A fájl nem nyitható meg"
 
@@ -3004,7 +3263,8 @@
 msgid "Buddylist saved successfully!"
 msgstr "A partnerlista mentése sikeres!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307
+#: ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Nem tölthető be a partnerlista"
 
@@ -3040,25 +3300,30 @@
 msgid "Registration completed successfully!"
 msgstr "A regisztráció sikeresen befejeződött!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:799
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:482
+#: ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Jelszó (megerősítés)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:487
+#: ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Adja meg az aktuális jelsort"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:493
+#: ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Aktuális jelsor"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:497
+#: ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Új Gadu-Gadu fiók regisztrálása"
 
@@ -3066,11 +3331,12 @@
 msgid "Please, fill in the following fields"
 msgstr "Töltse ki az alábbi mezőket"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:835
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Város"
@@ -3079,11 +3345,14 @@
 msgid "Year of birth"
 msgstr "Születési év"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/gg/gg.c:645
+#: ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../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/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:234
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Nem"
@@ -3093,14 +3362,14 @@
 msgstr "Férfi vagy nő"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Férfi"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3110,7 +3379,8 @@
 msgid "Only online"
 msgstr "Csak elérhetők"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:656
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Partnerek keresése"
 
@@ -3146,7 +3416,8 @@
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Adja meg a jelenlegi jelszavát és az új jelszót az UIM-hez: "
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:794
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "A Gadu-Gadu jelszó megváltoztatása"
 
@@ -3155,52 +3426,65 @@
 msgid "Select a chat for buddy: %s"
 msgstr "Válasszon egy csevegést a következő partnerhez: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:874
+#: ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Felvétel csevegéshez..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5513
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3034 ../pidgin/gtkblist.c:3358
-#: ../pidgin/gtkdocklet.c:467 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/qq/qq.c:170
+#: ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2900
+#: ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450
+#: ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Kilépett"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1405
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/msn/state.c:29
+#: ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37
+#: ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:455 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:2902
+#: ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438
+#: ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Elérhető"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2649
-#: ../libpurple/protocols/oscar/oscar.c:3680
+#: ../libpurple/protocols/gg/gg.c:1038
+#: ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1560
-#: ../libpurple/protocols/jabber/buddy.c:1736
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/gg/gg.c:1041
+#: ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Utónév"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "Születési év"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/gg/gg.c:1108
+#: ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "A keresés eredményei nem jeleníthetők meg."
 
@@ -3220,7 +3504,8 @@
 msgid "There are no users matching your search criteria."
 msgstr "Nincsenek a keresési feltételnek megfelelő felhasználók."
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1307
+#: ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "A foglalatot nem lehet olvasni"
 
@@ -3240,11 +3525,13 @@
 msgid "Your buddy list was stored on the server."
 msgstr "A partnerlista tárolva a kiszolgálón."
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1506
+#: ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "A kapcsolódás meghiúsult."
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
+#: ../libpurple/protocols/gg/gg.c:1618
+#: ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Tiltott"
 
@@ -3335,14 +3622,14 @@
 msgstr "Ismeretlen parancs: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "a jelenlegi téma: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "Nincs beállítva téma"
@@ -3377,8 +3664,10 @@
 msgid "MOTD for %s"
 msgstr "MOTD a következőhöz: %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:127
+#: ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:614
+#: ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "A kiszolgáló bontotta a kapcsolatot"
 
@@ -3386,7 +3675,8 @@
 msgid "View MOTD"
 msgstr "MOTD megjelenítése"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261
+#: ../libpurple/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "Cs_atorna:"
 
@@ -3401,57 +3691,59 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1673
-#: ../libpurple/protocols/yahoo/yahoo.c:2749
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621
+#: ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:595
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "Az SSL támogatás nem érhető el"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "Nem sikerült létrehozni a foglalatot"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz"
 
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "A kapcsolódás sikertelen"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "Az SSL kézfogás sikertelen"
 
-#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
+#: ../libpurple/protocols/irc/irc.c:611
+#: ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Olvasási hiba"
 
-#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Felhasználók"
 
-#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
@@ -3467,45 +3759,47 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:901
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC protokollbővítmény"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:902
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Az IRC protokollbővítmény, amely kevésbé rossz"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
-#: ../libpurple/protocols/jabber/libxmpp.c:194
-#: ../libpurple/protocols/msn/msn.c:2122
-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/irc/irc.c:941
+#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Kiszolgáló"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/irc/irc.c:944
+#: ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5717
-#: ../libpurple/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "Kódolások"
 
-#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
-#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/irc/irc.c:950
+#: ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
@@ -3515,7 +3809,8 @@
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
+#: ../libpurple/protocols/irc/irc.c:953
+#: ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "Valódi név"
@@ -3524,499 +3819,413 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "SSL használata"
 
-#: ../libpurple/protocols/irc/msgs.c:178
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Rossz üzemmód"
 
-#: ../libpurple/protocols/irc/msgs.c:189
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "Kitiltották a következőről: %s."
 
-#: ../libpurple/protocols/irc/msgs.c:190
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Kitiltva"
 
-#: ../libpurple/protocols/irc/msgs.c:207
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Nem lehet kitiltani a következőt: %s: a kitiltottak listája tele van"
 
-#: ../libpurple/protocols/irc/msgs.c:292
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:293
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(azonosítva)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:294
-#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Becenév"
 
-#: ../libpurple/protocols/irc/msgs.c:320
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Jelenleg a következőn"
 
-#: ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Inaktív"
 
-#: ../libpurple/protocols/irc/msgs.c:328
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Kapcsolódva ezóta"
 
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Jelző meghatározása:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Ragyogó"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s megváltoztatta a témát a következőre: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:410
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s törölte a témát."
 
-#: ../libpurple/protocols/irc/msgs.c:418
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s témája: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:436
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "\"%s\" üzenet ismeretlen"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "Ismeretlen üzenet"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "Az IRC kiszolgáló olyan üzenetet kapott, amit nem tudott értelmezni."
 
-#: ../libpurple/protocols/irc/msgs.c:458
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Felhasználók a következőn: %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:555
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "Válaszidő"
 
-#: ../libpurple/protocols/irc/msgs.c:556
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "Az IRC kiszolgáló helyi ideje:"
 
-#: ../libpurple/protocols/irc/msgs.c:567
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "Nincs ilyen csatorna"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:578
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "nincs ilyen csatorna"
 
-#: ../libpurple/protocols/irc/msgs.c:581
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "A felhasználó nincs bejelentkezve"
 
-#: ../libpurple/protocols/irc/msgs.c:586
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "Nincs ilyen becenév/csatorna"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "Nem sikerült elküldeni"
 
-#: ../libpurple/protocols/irc/msgs.c:662
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Meghívásra van szükség a következőhöz csatlakozáshoz: %s."
 
-#: ../libpurple/protocols/irc/msgs.c:663
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "Meghívásos"
 
-#: ../libpurple/protocols/irc/msgs.c:775
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s kirúgta Önt: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797
+#: ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s kizárta (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mód (%s %s) %s által"
 
-#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
+#: ../libpurple/protocols/irc/msgs.c:905
+#: ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
 msgstr "Érvénytelen becenév"
 
-#: ../libpurple/protocols/irc/msgs.c:890
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Az Ön által választott becenevet a kiszolgáló visszautasította. Valószínűleg "
-"érvénytelen karaktereket tartalmaz."
-
-#: ../libpurple/protocols/irc/msgs.c:895
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg "
-"érvénytelen karaktereket tartalmaz."
-
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:907
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "Az Ön által választott becenevet a kiszolgáló visszautasította. Valószínűleg érvénytelen karaktereket tartalmaz."
+
+#: ../libpurple/protocols/irc/msgs.c:912
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "Az Ön által választott fióknevet a kiszolgáló visszautasította. Valószínűleg érvénytelen karaktereket tartalmaz."
+
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "A becenév nem változtatható meg"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "Nem sikerült megváltoztatni a becenevet"
 
-#: ../libpurple/protocols/irc/msgs.c:955
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Elhagyta a(z) %s%s csatornát"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "Hiba: érvénytelen PONG a kiszolgálótól"
 
-#: ../libpurple/protocols/irc/msgs.c:999
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING válasz -- Késleltetés %lu másodperc"
 
-#: ../libpurple/protocols/irc/msgs.c:1080
-#, c-format
-msgid "Cannot join %s:"
-msgstr "Nem lehet csatlakozni ehhez: %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1081
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s csatornához nem lehet csatlakozni: Regisztráció szükséges."
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nem lehet csatlakozni a csatornához"
 
-#: ../libpurple/protocols/irc/msgs.c:1115
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "A becenév vagy csatorna átmenetileg nem érhető el."
 
-#: ../libpurple/protocols/irc/msgs.c:1127
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "Ütések a következőtől: %s"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;elvégzendő művelet&gt;:  Egy művelet elvégzése."
 
-#: ../libpurple/protocols/irc/parse.c:122
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [üzenet]:  Beállít egy távollét-üzenetet, vagy üzenet nélkül használva "
-"visszatér a távollétből."
-
 #: ../libpurple/protocols/irc/parse.c:123
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [üzenet]:  Beállít egy távollét-üzenetet, vagy üzenet nélkül használva visszatér a távollétből."
+
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: parancs küldése a chanserv kiszolgálónak."
 
-#: ../libpurple/protocols/irc/parse.c:124
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;becenév1&gt; [becenév2] ...:  A csatorna-operátor állapot elvétele "
-"valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
-
 #: ../libpurple/protocols/irc/parse.c:125
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;becenév1&gt; [becenév2] ...:  A csatorna hang állapot elvétele "
-"valakitől, így nem beszélhet, ha a csatorna moderált (+m). "
-"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;becenév1&gt; [becenév2] ...:  A csatorna-operátor állapot elvétele valakitől. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;becenév&gt; [szoba]:  Meghív valakit, hogy csatlakozzon Önhöz a "
-"megadott vagy a jelenlegi csatornán."
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;becenév1&gt; [becenév2] ...:  A csatorna hang állapot elvétele valakitől, így nem beszélhet, ha a csatorna moderált (+m). Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy "
-"több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;becenév&gt; [szoba]:  Meghív valakit, hogy csatlakozzon Önhöz a megadott vagy a jelenlegi csatornán."
 
 #: ../libpurple/protocols/irc/parse.c:128
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy "
-"vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha "
-"szükséges."
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a csatornáról. "
-"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;szoba1&gt;[,szoba2][,...] [kulcs1[,kulcs2][,...]]:  Belépés egy vagy több csatornára, opcionálisan kulcs megadásával mindegyikhez, ha szükséges."
 
 #: ../libpurple/protocols/irc/parse.c:130
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list:   Megjeleníti az egy hálózaton belül elérhető csevegőszobák listáját. "
-"<i>Figyelmeztetés: néhány kiszolgáló bontja a kapcsolatot, ha Ön kiadja ezt "
-"a parancsot.</i>"
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a csatornáról. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:131
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:   Megjeleníti az egy hálózaton belül elérhető csevegőszobák listáját. <i>Figyelmeztetés: néhány kiszolgáló bontja a kapcsolatot, ha Ön kiadja ezt a parancsot.</i>"
+
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;elvégzendő művelet&gt;:  Végrehajt egy műveletet."
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: parancs küldése a memoserv kiszolgálónak."
 
-#: ../libpurple/protocols/irc/parse.c:133
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;becenév|csatorna|&gt;:  Csatorna- vagy "
-"felhasználómód beállítása vagy visszavonása."
-
 #: ../libpurple/protocols/irc/parse.c:134
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
-"(nem pedig a csatornának)."
+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;becenév|csatorna|&gt;:  Csatorna- vagy felhasználómód beállítása vagy visszavonása."
 
 #: ../libpurple/protocols/irc/parse.c:135
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak (nem pedig a csatornának)."
+
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [csatorna]:  Kilistázza a csatornán jelenlévő felhasználókat."
 
-#: ../libpurple/protocols/irc/parse.c:136
-#: ../libpurple/protocols/jabber/jabber.c:1800
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;új becenév&gt;:  Megváltoztatja a becenevét."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: parancs küldése a nickserv kiszolgálónak."
 
-#: ../libpurple/protocols/irc/parse.c:138
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;becenév1&gt; [becenév2] ...:  Csatornaoperátori jogok adása "
-"valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
-
 #: ../libpurple/protocols/irc/parse.c:139
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
-"tudja."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;becenév1&gt; [becenév2] ...:  Csatornaoperátori jogok adása valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:140
-msgid "operserv: Send a command to operserv"
-msgstr "openserv: parancs küldése az openserv kiszolgálónak."
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem tudja."
 
 #: ../libpurple/protocols/irc/parse.c:141
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [szoba] [üzenet]:  Elhagyja a jelenlegi vagy egy megadott csatornát, "
-"egy opcionális üzenettel."
+msgid "operserv: Send a command to operserv"
+msgstr "openserv: parancs küldése az openserv kiszolgálónak."
 
 #: ../libpurple/protocols/irc/parse.c:142
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [becenév]:  Megkérdezi, mennyi egy felhasználó (vagy a kiszolgáló, ha "
-"nincs megadva) késése."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [szoba] [üzenet]:  Elhagyja a jelenlegi vagy egy megadott csatornát, egy opcionális üzenettel."
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak "
-"(nem pedig a csatornának)."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [becenév]:  Megkérdezi, mennyi egy felhasználó (vagy a kiszolgáló, ha nincs megadva) késése."
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-"quit [üzenet]:  Bontja a kapcsolatot a kiszolgálóval, egy opcionális "
-"üzenettel."
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;becenév&gt; &lt;üzenet&gt;:  Magánüzenetet küld a felhasználónak (nem pedig a csatornának)."
 
 #: ../libpurple/protocols/irc/parse.c:145
-msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Nyers parancs küldése a kiszolgálónak."
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [üzenet]:  Bontja a kapcsolatot a kiszolgálóval, egy opcionális üzenettel."
 
 #: ../libpurple/protocols/irc/parse.c:146
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a szobából. "
-"Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:  Nyers parancs küldése a kiszolgálónak."
 
 #: ../libpurple/protocols/irc/parse.c:147
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;becenév&gt; [üzenet]:  Egy személy eltávolítása a szobából. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Megjeleníti az IRC kiszolgáló jelenlegi helyi idejét."
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [új téma]:  A csatorna témájának megtekintése vagy megváltoztatása."
 
-#: ../libpurple/protocols/irc/parse.c:149
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Felhasználói mód beállítása vagy "
-"visszavonása."
-
 #: ../libpurple/protocols/irc/parse.c:150
-msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [becenév]: CTCP VERSION kérés küldése felhasználónak"
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Felhasználói mód beállítása vagy visszavonása."
 
 #: ../libpurple/protocols/irc/parse.c:151
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;becenév1&gt; [becenév2] ...:  Csatorna hang állapot megadása "
-"valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [becenév]: CTCP VERSION kérés küldése felhasználónak"
 
 #: ../libpurple/protocols/irc/parse.c:152
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem "
-"tudja."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;becenév1&gt; [becenév2] ...:  Csatorna hang állapot megadása valakinek. Csatornaoperátornak kell lennie, hogy ezt megtehesse."
 
 #: ../libpurple/protocols/irc/parse.c:153
-msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [kiszolgáló] &lt;becenév&gt;:  Információk lekérése egy felhasználóról."
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;üzenet&gt;:  Ha nem tudja, mi ez, valószínűleg használni sem tudja."
 
 #: ../libpurple/protocols/irc/parse.c:154
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "whois [kiszolgáló] &lt;becenév&gt;:  Információk lekérése egy felhasználóról."
+
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;becenév&gt;: Információk lekérése egy kijelentkezett felhasználóról."
 
-#: ../libpurple/protocols/irc/parse.c:448
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Válaszidő a következőtől: %s: %lu másodperc"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING válasz"
 
-#: ../libpurple/protocols/irc/parse.c:560
-#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565
+#: ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694
+#: ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Kapcsolat bontva."
 
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek "
-"támogatása nem található."
+msgstr "A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek támogatása nem található."
 
 #: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "A kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán"
 
 #: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:295
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:481
-#: ../libpurple/protocols/jabber/auth.c:564
-#: ../libpurple/protocols/jabber/auth.c:565
-msgid "Plaintext Authentication"
-msgstr "Egyszerű szöveges hitelesítés"
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "%s szöveges hitelesítést követel meg egy nem titkosított csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
 
 #: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:482
-#: ../libpurple/protocols/jabber/auth.c:566
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"Ez a kiszolgáló szöveges hitelesítést követel meg egy nem titkosított "
-"csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
-
-#: ../libpurple/protocols/jabber/auth.c:306
-#: ../libpurple/protocols/jabber/auth.c:492
-#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
+msgid "Plaintext Authentication"
+msgstr "Egyszerű szöveges hitelesítés"
+
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
 msgid "Server does not use any supported authentication method"
 msgstr "A kiszolgáló nem használ egyetlen támogatott hitelesítési eljárást sem"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:434
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:708
-#: ../libpurple/protocols/jabber/auth.c:842
-#: ../libpurple/protocols/jabber/auth.c:867
-#: ../libpurple/protocols/jabber/auth.c:886
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
 #: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Érvénytelen válasz a kiszolgálótól."
 
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:572
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "Ez a kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán. Engedélyezi ezt és folytatja a hitelesítést?"
+
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "Érvénytelen hívás a kiszolgálótól"
 
-#: ../libpurple/protocols/jabber/auth.c:817
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "SASL hiba"
 
@@ -4039,7 +4248,7 @@
 msgstr "Keresztnév"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
@@ -4083,7 +4292,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1566
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4107,30 +4316,27 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/oscar/oscar.c:3730
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "Születésnap"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3045
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Leírás"
 
 #: ../libpurple/protocols/jabber/buddy.c:578
 #: ../libpurple/protocols/jabber/buddy.c:579
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard szerkesztése"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard szerkesztése"
 
 #: ../libpurple/protocols/jabber/buddy.c:580
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr ""
-"Az alábbi elemek opcionálisak. Csak azokat az információkat adja meg, "
-"amelyek nem okoznak kényelmetlenséget."
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgstr "Az alábbi elemek opcionálisak. Csak azokat az információkat adja meg, amelyek nem okoznak kényelmetlenséget."
 
 #: ../libpurple/protocols/jabber/buddy.c:651
 #: ../libpurple/protocols/jabber/buddy.c:692
@@ -4143,16 +4349,16 @@
 msgstr "Operációs rendszer"
 
 #: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:197
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr "Erőforrás"
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "Prioritás"
 
@@ -4162,9 +4368,9 @@
 msgstr "Középső név"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:830
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
@@ -4182,132 +4388,129 @@
 msgid "Logo"
 msgstr "Logó"
 
-#: ../libpurple/protocols/jabber/buddy.c:1346
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "Rejtettség visszavonása"
 
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "Ideiglenesen elrejt"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1358
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "Jelenlét-értesítés törlése"
 
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "Engedélyezés (újra)kérése"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1374
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "Leiratkozás"
 
-#: ../libpurple/protocols/jabber/buddy.c:1407
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "Beszédes"
 
-#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436
+#: ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "Nem vagyok a gépnél"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ne zavarjanak"
 
-#: ../libpurple/protocols/jabber/buddy.c:1558
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1562
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3692
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "Vezetéknév"
 
-#: ../libpurple/protocols/jabber/buddy.c:1594
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "A keresés eredményei a következők"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1669
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"Kapcsolat keresése a keresési feltételek megadásával az adott mezőkben. Ne "
-"feledje, hogy minden mező támogatja a helyettesítő karakteres keresést (%)"
-
-#: ../libpurple/protocols/jabber/buddy.c:1689
+#: ../libpurple/protocols/jabber/buddy.c:1694
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "Kapcsolat keresése a keresési feltételek megadásával az adott mezőkben. Ne feledje, hogy minden mező támogatja a helyettesítő karakteres keresést (%)"
+
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "A címtárlekérdezés sikertelen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1690
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "A címtárkiszolgáló lekérdezése nem sikerült."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1724
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Kiszolgálóutasítások: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1731
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Töltsön ki legalább egy mezőt a megfelelő Jabber felhasználók kereséséhez."
-
-#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Töltsön ki legalább egy mezőt a megfelelő XMPP felhasználók kereséséhez."
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "E-mail cím"
 
-#: ../libpurple/protocols/jabber/buddy.c:1760
-#: ../libpurple/protocols/jabber/buddy.c:1761
-msgid "Search for Jabber users"
-msgstr "Jabber felhasználók keresése"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "XMPP felhasználók keresése"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:145
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "Keresés"
 
-#: ../libpurple/protocols/jabber/buddy.c:1777
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "Érvénytelen címtár"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "Adjon meg egy felhasználói címtárat"
 
-#: ../libpurple/protocols/jabber/buddy.c:1795
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "Válasszon ki egy felhasználói címtárat a kereséshez"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "Keresés a címtárban"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "Sz_oba:"
@@ -4320,80 +4523,80 @@
 msgid "_Handle:"
 msgstr "A_zonosító:"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s érvénytelen szobanév"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Érvénytelen szobanév"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s érvénytelen kiszolgálónév"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Érvénytelen kiszolgálónév"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s érvénytelen szobaazonosító"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Érvénytelen szobaazonosító"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Beállítási hiba"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "A beállítás sikertelen"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Szobabeállítási hiba"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Ezt a szobát nem lehet beállítani"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Regisztrációs hiba"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "A nem-MUC csevegőszobákban nem támogatott a becenév megváltoztatása"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Hiba szobalista letöltése közben"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Érvénytelen kiszolgáló"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Adjon meg egy konferenciakiszolgálót"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Válassza ki a lekérdezendő konferenciakiszolgálót"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Szobák keresése"
 
@@ -4416,450 +4619,443 @@
 msgid "Unable to create socket"
 msgstr "Nem lehet létrehozni foglalatot"
 
-#: ../libpurple/protocols/jabber/jabber.c:565
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Érvénytelen Jabber azonosító"
-
-#: ../libpurple/protocols/jabber/jabber.c:636
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "Érvénytelen XMPP azonosító"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Érvénytelen XMPP azonosító. A tartományt be kell állítani."
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s regisztrációja sikeres"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
-#: ../libpurple/protocols/jabber/jabber.c:639
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "A regisztráció sikeres"
 
-#: ../libpurple/protocols/jabber/jabber.c:645
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Ismeretlen hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:648
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "A regisztráció sikertelen"
 
-#: ../libpurple/protocols/jabber/jabber.c:763
-#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "Már regisztrálva van"
 
-#: ../libpurple/protocols/jabber/jabber.c:840
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "Állam"
 
-#: ../libpurple/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "Irányítószám"
 
-#: ../libpurple/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:860
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "Dátum"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr "Kérem adja meg a következő információkat az új fiók regisztrálásához."
 
-#: ../libpurple/protocols/jabber/jabber.c:871
-#: ../libpurple/protocols/jabber/jabber.c:872
-msgid "Register New Jabber Account"
-msgstr "Új Jabber fiók regisztrálása"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "Új XMPP fiók regisztrálása"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:877
+#: ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "Regisztráció"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "Folyam inicializálása"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Hitelesítés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "A folyam újrainicializálása"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1489
-#: ../libpurple/protocols/jabber/jabber.c:1530
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5511
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "Nem engedélyezett"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "Mindkettő"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "Feladó (Címzett függőben)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "Címzett"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "Senki (Címzett függőben)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nincs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "Feliratkozás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "Jelszó megváltoztatva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "A jelszava meg lett változtatva."
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "Hiba a jelszó megváltoztatásakor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "Jelszó (még egyszer)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Jabber jelszó megváltoztatása"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "XMPP jelszó megváltoztatása"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Kérem adja meg az új jelszavát"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
 #: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "Felhasználói információk beállítása..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1386
-#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
 #: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "Jelszó megváltoztatása..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1391
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Felhasználók keresése..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "Hibás kérés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "Ütközés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "A szolgáltatás nincs megvalósítva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "Tiltva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Elment"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Belső kiszolgálóhiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Az elem nem található"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
-msgid "Malformed Jabber ID"
-msgstr "Rosszul formázott Jabber azonosító"
-
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "Rosszul formázott XMPP azonosító"
+
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Nem fogadható el"
 
-#: ../libpurple/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Nem engedélyezett"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Fizetés szükséges"
 
-#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "A címzett nem érhető el"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Regisztráció szükséges"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "A távoli kiszolgáló nem található"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Időtúllépés a távoli kiszolgálón"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "A kiszolgáló túl van terhelve"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "A szolgáltatás nem érhető el"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Feliratkozás szükséges"
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Váratlan kérés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Hitelesítés megszakítva"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Hibás kódolás a hitelesítésben"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Érvénytelen authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Érvénytelen hitelesítési eljárás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "A hitelesítési eljárás túl gyenge"
 
-#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Átmeneti hitelesítési hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Hitelesítési hiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Rossz formátum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Rossz névtér-előtag"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Erőforrás-ütközés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Időtúllépés miatt a kapcsolat megszakadt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "A gép eltűnt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Ismeretlen gép"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "Hiányos címzés"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "Érvénytelen azonosító"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "Érvénytelen névtér"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Érvénytelen XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Nem illeszkedő gépek"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Szabályok megsértése"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Távoli kapcsolat sikertelen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Erőforrás-megszorítás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Korlátozott XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Lásd a másik gépet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Rendszerleállítás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Meghatározatlan feltétel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Nem támogatott kódolás"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Nem támogatott Stanza típus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Nem támogatott verzió"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "Nem megfelelően formázott XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Folyamhiba"
 
-#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Nem lehet kitiltani %s felhasználót"
 
-#: ../libpurple/protocols/jabber/jabber.c:1677
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ismeretlen kapcsolat: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1682
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "%s felhasználó kapcsolata nem állítható be a következőre: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ismeretlen szerep: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1708
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "A(z) \"%s\" szerep nem állítható be a következő felhasználónak: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1761
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Nem lehet kirúgni %s felhasználót"
 
-#: ../libpurple/protocols/jabber/jabber.c:1792
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:   Csevegőszoba beállítása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1796
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Csevegőszoba beállítása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [szoba]:  A szoba elhagyása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:  Regisztráció csevegőszobánál."
 
-#: ../libpurple/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [új téma]:  A téma megtekintése vagy megváltoztatása."
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;felhasználó&gt; [szoba]:  Felhasználó kitiltása a szobából."
 
-#: ../libpurple/protocols/jabber/jabber.c:1828
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy "
-"felhasználó a szobával fennálló kapcsolatának beállítása."
-
-#: ../libpurple/protocols/jabber/jabber.c:1834
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: "
-"Beállítja a felhasználó szerepét a szobában."
-
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1841
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "affiliate &lt;felhasználó&gt; &lt;owner|admin|member|outcast|none&gt;: Egy felhasználó a szobával fennálló kapcsolatának beállítása."
+
+#: ../libpurple/protocols/jabber/jabber.c:1847
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;felhasználó&gt; &lt;moderator|participant|visitor|none&gt;: Beállítja a felhasználó szerepét a szobában."
+
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;felhasználó&gt; [üzenet]:  Felhasználó meghívása a szobába."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-"join: &lt;szoba&gt; [kiszolgáló]:  Csatlakozás csevegéshez a megadott "
-"kiszolgálón."
-
-#: ../libpurple/protocols/jabber/jabber.c:1852
+msgstr "join: &lt;szoba&gt; [kiszolgáló]:  Csatlakozás csevegéshez a megadott kiszolgálón."
+
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;felhasználó&gt; [szoba]:  Felhasználó kirúgása a szobából."
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-"msg &lt;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik "
-"felhasználónak."
+msgstr "msg &lt;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik felhasználónak."
 
 #. *< type
 #. *< ui_requirement
@@ -4873,53 +5069,63 @@
 #. *  description
 #: ../libpurple/protocols/jabber/libxmpp.c:166
 #: ../libpurple/protocols/jabber/libxmpp.c:168
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber protokollbővítmény"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:200
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP protokollbővítmény"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "Tartomány"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "Régi (5223 port) SSL kényszerítése"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Egyszerű szöveges hitelesítés engedélyezése nem titkosított folyamokon"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Kapcsolódási port"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:214
-#: ../libpurple/protocols/silc/silc.c:1848
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "Kapcsolatkiszolgáló"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s elhagyta a társalgást."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "%s üzenetet küldött"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s a következő témát állította be: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "A téma: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Az üzenet eljuttatása a következőhöz: %s sikertelen: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber üzenethiba"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP üzenethiba"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr " (%s kód)"
@@ -4938,12 +5144,8 @@
 msgstr "Új szoba létrehozása"
 
 #: ../libpurple/protocols/jabber/presence.c:354
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"Új szobát hoz létre. Szeretné beállítani, vagy elfogadja az "
-"alapbeállításokat?"
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "Új szobát hoz létre. Szeretné beállítani, vagy elfogadja az alapbeállításokat?"
 
 #: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
@@ -4966,9 +5168,7 @@
 #: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"Nem lehet fájlt küldeni a következőnek: %s, mert a felhasználó nem támogatja "
-"fájlok átvitelét"
+msgstr "Nem lehet fájlt küldeni a következőnek: %s, mert a felhasználó nem támogatja fájlok átvitelét"
 
 #: ../libpurple/protocols/jabber/si.c:766
 #: ../libpurple/protocols/jabber/si.c:767
@@ -4982,21 +5182,13 @@
 
 #: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s a helyi listán a(z) %s csoport tagja, de a kiszolgáló listáján nem az. "
-"Szeretné ezt a partnert felvenni?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s a helyi listán a(z) %s csoport tagja, de a kiszolgáló listáján nem az. Szeretné ezt a partnert felvenni?"
 
 #: ../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 rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a "
-"partnert felvenni?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s rajta van a helyi listán, de a kiszolgáló listáján nincs. Szeretné ezt a partnert felvenni?"
 
 #: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
@@ -5191,8 +5383,9 @@
 msgstr "A kiszolgáló túl elfoglalt"
 
 #: ../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/protocols/oscar/oscar.c:1363
+#: ../libpurple/protocols/silc/ops.c:1718
+#: ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
 msgstr "Hitelesítés sikertelen"
@@ -5227,371 +5420,371 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN hiba: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "Elküldött egy bökést!"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "Az új MSN beceneve túl hosszú."
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "Becenév beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Ezen a néven fogják látni az MSN partnerei."
 
-#: ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "Otthoni telefonszám beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:281
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "Munkahelyi telefonszám beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "Mobiltelefonszám beállítása."
 
-#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "Engedélyezi az MSN mobil oldalakat?"
 
-#: ../libpurple/protocols/msn/msn.c:314
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"Engedélyezi vagy megtiltja a listán szereplő partnereinek, hogy mobil "
-"oldalakat küldjenek a mobiltelefonjára vagy más mobil eszközre?"
-
-#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:323
+msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
+msgstr "Engedélyezi vagy megtiltja a listán szereplő partnereinek, hogy mobil oldalakat küldjenek a mobiltelefonjára vagy más mobil eszközre?"
+
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "Engedélyezés"
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "Tiltás"
 
-#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "Lehetséges, hogy ez a Hotmail fiók nem aktív."
 
-#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "Mobilüzenet küldése."
 
-#: ../libpurple/protocols/msn/msn.c:365
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "Oldal"
 
-#: ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "Szerepel-e a listáján"
 
-#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3491
+#: ../libpurple/protocols/msn/msn.c:551
+#: ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
 msgstr "Rögtön jövök"
 
-#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:555
+#: ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "Elfoglalt vagyok"
 
-#: ../libpurple/protocols/msn/msn.c:567
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "Telefonálok"
 
-#: ../libpurple/protocols/msn/msn.c:571
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3512
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "Ebédelni mentem"
 
-#: ../libpurple/protocols/msn/msn.c:599
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "Becenév beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "Otthoni telefonszám beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:608
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "Munkahelyi telefonszám beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "Mobiltelefonszám beállítása..."
 
-#: ../libpurple/protocols/msn/msn.c:618
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobileszközök engedélyezése/tiltása..."
 
-#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Mobiloldalak engedélyezése/tiltása..."
 
-#: ../libpurple/protocols/msn/msn.c:633
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail bejövő levelek megnyitása"
 
-#: ../libpurple/protocols/msn/msn.c:657
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "Küldés mobiltelefonra"
 
-#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Csevegés ke_zdeményezése"
 
-#: ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "Az MSN használatához SSL támogatás szükséges. Telepítsen egy támogatott SSL könyvtárat."
 
-#: ../libpurple/protocols/msn/msn.c:730
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni."
 
-#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1458
+#: ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Hiba a profil letöltése közben"
 
-#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529
+#: ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "Általános"
 
-#: ../libpurple/protocols/msn/msn.c:1528
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Kor"
 
-#: ../libpurple/protocols/msn/msn.c:1530
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Foglalkozás"
 
-#: ../libpurple/protocols/msn/msn.c:1531
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../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
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Hely"
 
-#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1544
+#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742
+#: ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "Hobbik és érdeklődési kör"
 
-#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
-#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "Magamról röviden"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "Társadalmi"
 
-#: ../libpurple/protocols/msn/msn.c:1561
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Családi állapot"
 
-#: ../libpurple/protocols/msn/msn.c:1562
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "Érdeklődési kör"
 
-#: ../libpurple/protocols/msn/msn.c:1563
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "Állatok"
 
-#: ../libpurple/protocols/msn/msn.c:1564
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr "Szülőváros"
 
-#: ../libpurple/protocols/msn/msn.c:1565
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "Lakóhelyek"
 
-#: ../libpurple/protocols/msn/msn.c:1566
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "Divat"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "Zene"
 
-#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Kedvenc idézet"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "Kapcsolatinformációk"
 
-#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "Személyes"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "Társ"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "Otthoni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "2. otthoni telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1593
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "Otthoni cím"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
 msgstr "Személyes mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "Saját e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "Saját azonnali üzenő"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "Évforduló"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "Munka"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Beosztás"
 
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "Cég"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Részleg"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "Foglalkozás"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "Munkahelyi telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "2. munkahelyi telefon"
 
-#: ../libpurple/protocols/msn/msn.c:1623
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "Munkahelyi cím"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
 msgstr "Munkahelyi mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
 msgstr "Munkahelyi személyhívó"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "Munkahelyi fax"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "Munkahelyi e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "Munkahelyi azonnali üzenő"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "Kezdés dátuma"
 
-#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1707
+#: ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720
+#: ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "Kedvenc dolgok"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "Utoljára frissítve"
 
-#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Honlap"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "A felhasználó nem hozott létre nyilvános profilt."
 
-#: ../libpurple/protocols/msn/msn.c:1797
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"Az MSN nem találta meg a felhasználó profilját. Ez vagy azt jelenti, hogy a "
-"felhasználó nem létezik, vagy azt, hogy bár létezik, még nem hozott létre "
-"nyilvános profilt."
-
-#: ../libpurple/protocols/msn/msn.c:1801
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
-msgstr "Nem találhatók információk a felhasználó profiljában. A felhasználó valószínűleg nem létezik."
+#: ../libpurple/protocols/msn/msn.c:1805
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "Az MSN nem találta meg a felhasználó profilját. Ez vagy azt jelenti, hogy a felhasználó nem létezik, vagy azt, hogy bár létezik, még nem hozott létre nyilvános profilt."
 
 #: ../libpurple/protocols/msn/msn.c:1809
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Nem találhatók információk a felhasználó profiljában. A felhasználó valószínűleg nem létezik."
+
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profil URL-je"
@@ -5606,19 +5799,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
+#: ../libpurple/protocols/msn/msn.c:2103
+#: ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "MSN protokollbővítmény"
 
-#: ../libpurple/protocols/msn/msn.c:2131
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "HTTP eljárás használata"
 
-#: ../libpurple/protocols/msn/msn.c:2136
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
-msgstr "Egyéni hangulatjelek beállítása"
-
-#: ../libpurple/protocols/msn/msn.c:2144
+msgstr "Egyéni hangulatjelek megjelenítése"
+
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: felhasználó megbökése figyelemfelhívási céllal"
 
@@ -5687,40 +5881,30 @@
 msgid "Service Temporarily Unavailable."
 msgstr "A szolgáltatás átmenetileg nem érhető el."
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "Nem lehet átnevezni a csoportot"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "Nem lehet törölni a csoportot"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor "
-"automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő "
-"társalgásait.\n"
+"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő társalgásait.\n"
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 msgstr[1] ""
-"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor "
-"automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő "
-"társalgásait.\n"
+"Az MSN kiszolgáló karbantartás miatt le fog állni %d percben belül. Ekkor automatikusan ki lesz jelentkeztetve, Kérjük fejezze be a folyamatban lévő társalgásait.\n"
 "\n"
 "A karbantartás befejeződése után sikeresen be tud majd jelentkezni."
 
@@ -5750,16 +5934,14 @@
 msgstr "Hiba a HTTP feldolgozása közben."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3448
+#: ../libpurple/protocols/oscar/oscar.c:3454
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Bejelentkezett egy másik helyről."
 
 #: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"Az MSN kiszolgálók átmenetileg nem érhetőek el. Kérem várjon és próbálja "
-"újra később."
+msgstr "Az MSN kiszolgálók átmenetileg nem érhetőek el. Kérem várjon és próbálja újra később."
 
 #: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
@@ -5772,9 +5954,7 @@
 
 #: ../libpurple/protocols/msn/session.c:324
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja "
-"újra később."
+msgstr "Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja újra később."
 
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/msn/session.c:347
@@ -5861,127 +6041,123 @@
 msgid "The screen name specified is invalid."
 msgstr "A megadott felhasználónév érvénytelen."
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "A szükséges paraméterek átadása sikertelen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Nem lehet a hálózatra írni"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Nem lehet a hálózatról olvasni"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Hiba a kiszolgálóval végzett kommunikációban"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "A konferencia nem található"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "A konferencia nem létezik"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Ilyen nevű mappa már létezik"
 
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Nem támogatott"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "A jelszó lejárt"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Hibás jelszó"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "A felhasználó nem található"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "A fiók le lett tiltva"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "A kiszolgáló nem tudott hozzáférni a címtárhoz"
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "A rendszeradminisztrátora letiltotta ezt a műveletet"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "A kiszolgáló nem érhető el, próbálkozzon később"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "A kapcsolat nem adható kétszer ugyanahhoz a mappához"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Önmagát nem adhatja hozzá"
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "A főarchívum hibásan van beállítva"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Hibás felhasználónév vagy jelszó"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "A megadott felhasználónévhez tartozó kiszolgáló nem ismerhető fel"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
+#: ../libpurple/protocols/novell/nmuser.c:1928
+msgid "Your account has been disabled because too many incorrect passwords were entered"
 msgstr "A fiókja le lett tiltva, mivel túl sok érvénytelen jelszót adott meg"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Ugyanazt a személyt nem adhatja hozzá kétszer egy társalgáshoz"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Elérte az engedélyezett kapcsolatok számát"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "Helytelen felhasználónevet adott meg"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Hiba lépett fel a címtár frissítése közben"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Inkompatibilis protokollverzió"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "A felhasználó letiltotta Önt"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+#: ../libpurple/protocols/novell/nmuser.c:1950
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "Ez a próbaverzió nem engedélyezi tíznél több felhasználó egyidejű belépését"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "A felhasználó kilépett, vagy Ön le van tiltva"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Ismeretlen hiba: 0x%X"
@@ -5994,9 +6170,7 @@
 #: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%"
-"s)."
+msgstr "Az üzenetet nem lehet elküldeni. A felhasználó részletei nem kérhetőek le (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:396
 #, c-format
@@ -6018,9 +6192,7 @@
 #: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr ""
-"Az üzenetet nem lehet elküldeni a következőnek: %s. Nem sikerült létrehozni "
-"a konferenciát (%s)."
+msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s. Nem sikerült létrehozni a konferenciát (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:537
 #, c-format
@@ -6029,21 +6201,13 @@
 
 #: ../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 ""
-"Nem lehet %s felhasználót a(z) %s mappába mozgatni a kiszolgálóoldali "
-"listán. Hiba a mappa létrehozása közben (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "Nem lehet %s felhasználót a(z) %s mappába mozgatni a kiszolgálóoldali listán. Hiba a mappa létrehozása közben (%s)."
 
 #: ../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 ""
-"Nem lehet %s felhasználót felvenni a partnerlistára. Hiba a mappa "
-"létrehozása közben a kiszolgálóoldali listában (%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "Nem lehet %s felhasználót felvenni a partnerlistára. Hiba a mappa létrehozása közben a kiszolgálóoldali listában (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:705
 #, c-format
@@ -6174,12 +6338,8 @@
 #.
 #. ...but for now just error out with a nice message.
 #: ../libpurple/protocols/novell/novell.c:2167
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, "
-"amelyikhez kapcsolódni szeretne."
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+msgstr "Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, amelyikhez kapcsolódni szeretne."
 
 #: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
@@ -6213,19 +6373,25 @@
 msgstr "Kiszolgáló portja"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2294
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
+#: ../libpurple/protocols/yahoo/ycht.c:481
+#: ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1085
+#: ../libpurple/proxy.c:1196
+#: ../libpurple/proxy.c:1296
+#: ../libpurple/proxy.c:1424
 msgid "Server closed the connection."
 msgstr "A kiszolgáló lezárta a kapcsolatot."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2288
-#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443
+#: ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097
+#: ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308
+#: ../libpurple/proxy.c:1436
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6235,8 +6401,10 @@
 "%s"
 
 #: ../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:1114
+#: ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320
+#: ../libpurple/proxy.c:1392
 #: ../libpurple/proxy.c:1449
 msgid "Received invalid data on connection with server."
 msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól."
@@ -6281,8 +6449,8 @@
 msgstr "ICQ protokollbővítmény"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4098
-#: ../libpurple/protocols/zephyr/zephyr.c:2996
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kódolás"
 
@@ -6412,166 +6580,159 @@
 msgid "Not while on AOL"
 msgstr "Nem, amíg az AOL-on tartózkodik"
 
-#: ../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 "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(Hiba történt az üzenet fogadása során. A partner, akivel cseveg "
-"valószínűleg a várttól eltérő kódolást használ. Ha tudja, hogy a partner "
-"milyen kódolást használ, akkor megadhatja azt az AIM/ICQ fiók haladó "
-"fiókbeállításainál.)"
-
-#: ../libpurple/protocols/oscar/oscar.c:438
-#, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(Hiba az üzenet fogadása közben. Lehetséges, hogy Ön és %s különböző "
-"kódolást használnak, vagy %s hibás klienst használ.)"
+#: ../libpurple/protocols/oscar/oscar.c:330
+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 encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(Hiba történt az üzenet fogadása során. A partner, akivel cseveg valószínűleg a várttól eltérő kódolást használ. Ha tudja, hogy a partner milyen kódolást használ, akkor megadhatja azt az AIM/ICQ fiók haladó fiókbeállításainál.)"
+
+#: ../libpurple/protocols/oscar/oscar.c:439
+#, c-format
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(Hiba az üzenet fogadása közben. Lehetséges, hogy Ön és %s különböző kódolást használnak, vagy %s hibás klienst használ.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2346
-#: ../pidgin/gtkutils.c:2368
+#: ../libpurple/protocols/oscar/oscar.c:621
+#: ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Partnerikon"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "Hang"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM közvetlen azonnali üzenetek"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Csevegés"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "Fájl letöltése"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "Játékok"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "Kiegészítők"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "Partnerlista küldése"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ közvetlen kapcsolat"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "AP felhasználó"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ közvetítő kiszolgáló"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "Régi ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian titkosítás"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "Biztonság engedélyezve"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "Videócsevegés"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "Élő videó"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "Fényképezőgép"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5689
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "Ráérek csevegni"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "Nem érhető el"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5710
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "Elfoglalt"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "A weben"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:463 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/oscar/oscar.c:719
+#: ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446
+#: ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "Elérhető"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3688
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697
+#: ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP cím"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2840
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "Figyelmeztetési szint"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "Partnermegjegyzés"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6580,7 +6741,7 @@
 "Nem sikerült kapcsolódni a hitelesítési kiszolgálóhoz:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6589,177 +6750,159 @@
 "Nem sikerült kapcsolódni a BOS kiszolgálóhoz:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "Felhasználónév elküldve"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "Kapcsolat létrejött, süti elküldve"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "Kapcsolódás befejezése"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév "
-"érvénytelen. A felhasználónévnek vagy betűvel kell kezdődnie és betűket, "
-"számokat, szóközöket tartalmazhat, vagy csak számokat tartalmazhat."
-
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1936
+#: ../libpurple/protocols/oscar/oscar.c:1243
+#, c-format
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév érvénytelen. A felhasználónévnek vagy betűvel kell kezdődnie és betűket, számokat, szóközöket tartalmazhat, vagy csak számokat tartalmazhat."
+
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "Érvénytelen felhasználónév."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1954
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "Helytelen jelszó."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "A fiókja jelenleg fel van függesztve."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Az AOL azonnali üzenő szolgáltatás átmenetileg nem érhető el."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha "
-"tovább folytatja, még többet kell majd várnia."
-
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr "Ön túl gyakran jelentkezik ki/be. Várjon tíz percet és próbálja meg újra. Ha tovább folytatja, még többet kell majd várnia."
+
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"A használt kliensprogram verziója túl régi. Kérem töltse le a frissítést a "
-"következő helyről: %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:1388
+msgstr "A használt kliensprogram verziója túl régi. Kérem töltse le a frissítést a következő helyről: %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "Nem sikerült kapcsolódni"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "A hitelesítés fogadva"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "A megadott SecurID kulcs érvénytelen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "Adja meg a SecurID-t"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Írja be a hatjegyű számot a digitális képernyőről."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2224
-#: ../libpurple/protocols/oscar/oscar.c:2271
-#: ../libpurple/protocols/oscar/oscar.c:5794
-#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076
+#: ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1472
-#: ../libpurple/protocols/oscar/oscar.c:1515
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. "
-"Frissítésekért keresse fel a következő címet: %s."
-
-#: ../libpurple/protocols/oscar/oscar.c:1475
-#: ../libpurple/protocols/oscar/oscar.c:1518
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
+#, c-format
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "Hamarosan megszakad a kapcsolat. A helyreállításig használja a TOC-ot. Frissítésekért keresse fel a következő címet: %s."
+
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "Nem kérhető le érvényes AIM belépő hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1604
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Hamarosan megszakad a kapcsolat. Frissítésekért keresse fel a következő "
-"címet: %s."
-
-#: ../libpurple/protocols/oscar/oscar.c:1607
+msgstr "Hamarosan megszakad a kapcsolat. Frissítésekért keresse fel a következő címet: %s."
+
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "Nem kérhető le érvényes belépő hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1633
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "Jelszó elküldve"
 
-#: ../libpurple/protocols/oscar/oscar.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "A kapcsolat nem inicializálható"
 
-#: ../libpurple/protocols/oscar/oscar.c:2194
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Kérem engedélyezze, hogy felvehessem a partnereim közé."
 
-#: ../libpurple/protocols/oscar/oscar.c:2222
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "Engedélyezést kérő üzenet:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2223
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "Kérem engedélyezze, hogy felvegyem!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2263
-#: ../libpurple/protocols/oscar/oscar.c:2270
-#: ../libpurple/protocols/oscar/oscar.c:2397
-#: ../libpurple/protocols/oscar/oscar.c:5192
-#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "Nincs ok megadva."
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "Engedélyezést elutasító üzenet:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2397
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"%u felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a "
-"következő indoklással:\n"
+"%u felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a következő indoklással:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2398
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ engedélyezés elutasítva."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "%u felhasználó elfogadta a kérését, így felveheti őt a partnerlistájára."
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6772,7 +6915,7 @@
 "Feladó: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6785,7 +6928,7 @@
 "Feladó: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6798,31 +6941,32 @@
 "Az üzenet:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2450
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "%u ICQ felhasználó küldött Önnek egy partnert: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Fel kívánja venni ezt a partnert a listájára?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2461 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467
+#: ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "Hozzá_adás"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Elutasítás"
 
-#: ../libpurple/protocols/oscar/oscar.c:2546
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 
-#: ../libpurple/protocols/oscar/oscar.c:2555
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, 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."
@@ -6832,40 +6976,28 @@
 # #: ../src/protocols/oscar/oscar.c:1605
 # #, c-format
 # msgid "You missed %d message from %s because the rate limit has been exceeded."
-#: ../libpurple/protocols/oscar/oscar.c:2564
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
-"gyakoriságának a korlátját."
-msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
-"gyakoriságának a korlátját."
-
-#: ../libpurple/protocols/oscar/oscar.c:2573
+msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés gyakoriságának a korlátját."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés gyakoriságának a korlátját."
+
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, 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] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
-"rosszindulatú volt."
-msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl "
-"rosszindulatú volt."
-
-#: ../libpurple/protocols/oscar/oscar.c:2582
+msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl rosszindulatú volt."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó túl rosszindulatú volt."
+
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, 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] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
-"volt."
-msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú "
-"volt."
-
-#: ../libpurple/protocols/oscar/oscar.c:2591
+msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú volt."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert Ön túl rosszindulatú volt."
+
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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."
@@ -6873,550 +7005,471 @@
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, ismeretlen okból."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2746
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Az üzenetet nem lehet elküldeni: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2746
-#: ../libpurple/protocols/oscar/oscar.c:2751
-#: ../libpurple/protocols/oscar/oscar.c:2813
-#: ../libpurple/protocols/oscar/oscar.c:2817
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "Ismeretlen ok."
 
-#: ../libpurple/protocols/oscar/oscar.c:2749
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2813
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "A felhasználó információi nem érhetőek el: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s felhasználó információi nem érhetőek el:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2845
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "Kapcsolódva ezóta"
 
-#: ../libpurple/protocols/oscar/oscar.c:2850
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Tag ezóta"
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "Képességek"
 
-#: ../libpurple/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "Elérhetőségi üzenet"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "Az AIM kapcsolata megszakadhatott."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3175
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az "
-"érvénytelen karaktereket tartalmazott.]"
-
-#: ../libpurple/protocols/oscar/oscar.c:3378
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. "
-"Kérem várjon 10 másodpercet és próbálja meg újra."
-
-#: ../libpurple/protocols/oscar/oscar.c:3450
+#: ../libpurple/protocols/oscar/oscar.c:3181
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgstr "[Nem lehet megjeleníteni az üzenetet ettől a felhasználótól, mert az érvénytelen karaktereket tartalmazott.]"
+
+#: ../libpurple/protocols/oscar/oscar.c:3384
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "Az utolsó művelet nem hajtható végre, mert a túllépte a sebességkorlátot. Kérem várjon 10 másodpercet és próbálja meg újra."
+
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "Ismeretlen okból ki lett jelentkeztetve."
 
-#: ../libpurple/protocols/oscar/oscar.c:3463
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Kilépett a(z) %s csevegőszobából."
 
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "Saját weboldal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "További információ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "Irányítószám"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "Részleg"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "Pozíció"
 
-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "Weboldal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "Munkahelyi adatok"
 
-#: ../libpurple/protocols/oscar/oscar.c:3858
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "Felbukkanó üzenet"
 
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "A következő felhasználónév a következőhöz van rendelve: %s"
 msgstr[1] "A következő felhasználónevek a következőhöz vannak rendelve: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3903
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "Felhasználónév"
 
-#: ../libpurple/protocols/oscar/oscar.c:3929
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nem található eredmény a(z) %s e-mail címre"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Kapnia kell egy %s jóváhagyását kérő levelet."
 
-#: ../libpurple/protocols/oscar/oscar.c:3952
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "Fiókjóváhagyás megkérve"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "Hiba a fiók információinak megváltoztatása közben"
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért "
-"felhasználónév eltér az eredetitől."
-
-#: ../libpurple/protocols/oscar/oscar.c:3989
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mivel az "
-"érvénytelen."
-
 #: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért "
-"felhasználónév túl hosszú."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért felhasználónév eltér az eredetitől."
 
 #: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert egy kérés már "
-"függőben van erre a felhasználónévre."
+msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mivel az érvénytelen."
 
 #: ../libpurple/protocols/oscar/oscar.c:3998
 #, 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 ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
-"cím túl sok felhasználónévhez van társítva."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
+msgstr "Hiba 0x%04x: Nem sikerült a felhasználónevet megformázni, mert a kért felhasználónév túl hosszú."
 
 #: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-"Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott "
-"cím érvénytelen."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert egy kérés már függőben van erre a felhasználónévre."
 
 #: ../libpurple/protocols/oscar/oscar.c:4004
 #, 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 "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím túl sok felhasználónévhez van társítva."
+
+#: ../libpurple/protocols/oscar/oscar.c:4007
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgstr "Hiba 0x%04x: Nem sikerült megváltoztatni az e-mail címet, mert a megadott cím érvénytelen."
+
+#: ../libpurple/protocols/oscar/oscar.c:4010
+#, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Hiba 0x%04x: Ismeretlen hiba."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s e-mail címe a következő: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "Fiókinformációk"
 
-#: ../libpurple/protocols/oscar/oscar.c:4187
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban "
-"kell lennie."
-
-#: ../libpurple/protocols/oscar/oscar.c:4432
+msgstr "Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban kell lennie."
+
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "Nem lehet beállítani az AIM profilt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4433
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-"Valószínűleg a bejelentkezési folyamat vége előtt előtt próbálta meg "
-"beállítani a profilt. Próbálja újra beállítani, ha a bejelentkezés már "
-"megtörtént."
-
-#: ../libpurple/protocols/oscar/oscar.c:4447
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+#: ../libpurple/protocols/oscar/oscar.c:4440
+msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
+msgstr "Valószínűleg a bejelentkezési folyamat vége előtt előtt próbálta meg beállítani a profilt. Próbálja újra beállítani, ha a bejelentkezés már megtörtént."
+
+#: ../libpurple/protocols/oscar/oscar.c:4454
+#, c-format
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
 msgstr[1] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
 
-#: ../libpurple/protocols/oscar/oscar.c:4452
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "A profil túl hosszú."
 
-#: ../libpurple/protocols/oscar/oscar.c:4497
-#, 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.  It has been "
-"truncated for you."
+#: ../libpurple/protocols/oscar/oscar.c:4504
+#, 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.  It has been truncated for you."
 msgstr[0] "A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra került."
 msgstr[1] "A távollét üzenet hossza túllépte a maximális %d bájtot. Ez csonkításra került."
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "A távollét-üzenet túl hosszú."
 
-#: ../libpurple/protocols/oscar/oscar.c:4571
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-"Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A "
-"felhasználóneveknek vagy betűvel kell kezdődniük, és betűket, számokat és "
-"szóközöket tartalmazhatnak, vagy csak számokból állhatnak."
-
-#: ../libpurple/protocols/oscar/oscar.c:4573
-#: ../libpurple/protocols/oscar/oscar.c:4996
-#: ../libpurple/protocols/oscar/oscar.c:5010
+#: ../libpurple/protocols/oscar/oscar.c:4578
+#, c-format
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Nem sikerült %s partner hozzáadása, mert a felhasználónév érvénytelen. A felhasználóneveknek vagy betűvel kell kezdődniük, és betűket, számokat és szóközöket tartalmazhatnak, vagy csak számokból állhatnak."
+
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "Nem sikerült felvenni"
 
-#: ../libpurple/protocols/oscar/oscar.c:4677
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "Nem lehet lekérni a partnerek listáját"
 
-#: ../libpurple/protocols/oscar/oscar.c:4678
-msgid ""
-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
+#: ../libpurple/protocols/oscar/oscar.c:4685
+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 "Az AIM kiszolgálók ideiglenesen nem tudták elküldeni a partnerlistáját. A partnerlistája nem veszett el és néhány órán belül valószínűleg elérhetővé válik."
 
-#: ../libpurple/protocols/oscar/oscar.c:4882
-#: ../libpurple/protocols/oscar/oscar.c:4883
-#: ../libpurple/protocols/oscar/oscar.c:4888
-#: ../libpurple/protocols/oscar/oscar.c:5064
-#: ../libpurple/protocols/oscar/oscar.c:5065
-#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "Árvák"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. "
-"Kérem töröljön egyet közülük és próbálja meg újra."
-
-#: ../libpurple/protocols/oscar/oscar.c:4994
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#, c-format
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. Kérem töröljön egyet közülük és próbálja meg újra."
+
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(nincs név)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5008
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"Ismeretlen ok miatt nem sikerült %s partnert felvenni. A leggyakoribb ok, "
-"hogy a partnerlistája elérte a maximálisan felvehető partnerek számát."
-
-#: ../libpurple/protocols/oscar/oscar.c:5102
-#, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"%s felhasználó megadta az engedélyt, hogy felvegye őt a partnerei közé. Fel "
-"akarja venni őt?"
+#: ../libpurple/protocols/oscar/oscar.c:5015
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
+msgstr "Ismeretlen ok miatt nem sikerült %s partnert felvenni. A leggyakoribb ok, hogy a partnerlistája elérte a maximálisan felvehető partnerek számát."
 
 #: ../libpurple/protocols/oscar/oscar.c:5108
+#, 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 felhasználó megadta az engedélyt, hogy felvegye őt a partnerei közé. Fel akarja venni őt?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "Engedély megadva"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5188
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "%s felhasználó engedélyezi, hogy felvegye őt a partnerei közé."
 
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "Engedély kiadva"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"%s felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a "
-"következő indoklással:\n"
+"%s felhasználó elutasította a kérését, hogy felvehesse a partnerlistájára, a következő indoklással:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "Engedély elutasítva"
 
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Váltás:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5269
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "A megadott csevegésnév érvénytelen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5339
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Az Ön IM képe nem lett elküldve. Nem küldhet IM képeket AIM csevegésekbe."
 
-#: ../libpurple/protocols/oscar/oscar.c:5478
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "Távol üzenet"
 
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(lekérés)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "iTunes zenebolt hivatkozás"
 
-#: ../libpurple/protocols/oscar/oscar.c:5791
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s partnermegjegyzése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "Partnermegjegyzés:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Közvetlen kapcsolat nyitását választotta %s partnerrel."
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Mivel ezzel láthatóvá válik az IP címe, ez kezelhető biztonsági "
-"kockázatként. Folytatni kívánja?"
-
-#: ../libpurple/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5844
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "Mivel ezzel láthatóvá válik az IP címe, ez kezelhető biztonsági kockázatként. Folytatni kívánja?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "Kapcs_olódás"
 
-#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "AIM információk lekérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "Partnermegjegyzés szerkesztése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5898
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "Állapotüzenet lekérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "Közvetlen IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "Engedélyezés újrakérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5992
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "Engedélyezés kérése"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "A weben ismert (ennek engedélyezése után SPAM-et fog kapni!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "ICQ magánszféra beállításai"
 
-#: ../libpurple/protocols/oscar/oscar.c:6019
-msgid "The new formatting is invalid."
-msgstr "Az új formázás érvénytelen."
-
 #: ../libpurple/protocols/oscar/oscar.c:6020
+msgid "The new formatting is invalid."
+msgstr "Az új formázás érvénytelen."
+
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-"A felhasználónév formázása csak a kis/nagybetűsséget és az üreshely "
-"karaktereket változtathatja meg."
-
-#: ../libpurple/protocols/oscar/oscar.c:6073
+msgstr "A felhasználónév formázása csak a kis/nagybetűsséget és az üreshely karaktereket változtathatja meg."
+
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "Cím megváltoztatása a következőre:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Ön nem vár engedélyezésre</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6122
-msgid "You are awaiting authorization from the following buddies"
-msgstr "A következő partnerektől vár engedélyezésre"
-
 #: ../libpurple/protocols/oscar/oscar.c:6123
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal "
-"kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
-
-#: ../libpurple/protocols/oscar/oscar.c:6140
+msgid "You are awaiting authorization from the following buddies"
+msgstr "A következő partnerektől vár engedélyezésre"
+
+#: ../libpurple/protocols/oscar/oscar.c:6124
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "Újra kérheti engedélyezést ezektől a partnerektől a jobb egérgombbal kattintva a nevükön, és az \"Engedélyezés újra kérése\" választásával"
+
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "Partnerek keresése e-mail cím szerint"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
-msgid "Search for a buddy by e-mail address"
-msgstr "Partner keresése e-mail cím alapján"
-
 #: ../libpurple/protocols/oscar/oscar.c:6142
+msgid "Search for a buddy by e-mail address"
+msgstr "Partner keresése e-mail cím alapján"
+
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Adja meg annak a partnernek az e-mail címét, akit keres."
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "_Keresés"
 
-#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "Felhasználói információk beállítása (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "Jelszó megváltoztatása (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "Üzenettovábbítás beállítása (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6328
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "Magánszféra-beállítások..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6335
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "Fiók jóváhagyása"
 
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "A jelenleg regisztrált e-mail cím megjelenítése"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "A jelenleg regisztrált e-mail cím megváltoztatása..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6350
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Engedélyezésre váró partnerek megjelenítése"
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Partner keresése e-mail cím szerint..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "Partner keresése információ alapján"
 
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "A legutóbbi partnerek csoport használata"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "Megjeleníti, meddig volt inaktív"
 
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7444,14 +7497,8 @@
 msgstr "%s felkérte a közvetlen kapcsolatra a következőhöz: %s"
 
 #: ../libpurple/protocols/oscar/peer.c:1014
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"Ez közvetlen kapcsolatot igényel a két számítógép között és szükséges az IM "
-"képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a "
-"magánszférája biztonságát."
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "Ez közvetlen kapcsolatot igényel a két számítógép között és szükséges az IM képekhez. Ezzel láthatóvá válik az IP címe, ami veszélyeztetheti a magánszférája biztonságát."
 
 #: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
@@ -7624,9 +7671,7 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
 msgstr "Az egyéni arcképek beállítása jelenleg nem támogatott. Válasszon egy képet innen: %s."
 
 #: ../libpurple/protocols/qq/buddy_info.c:577
@@ -7918,12 +7963,13 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:2410
-#: ../libpurple/protocols/yahoo/yahoo.c:2517
-#: ../libpurple/protocols/yahoo/yahoo.c:2538
-#: ../libpurple/protocols/yahoo/yahoo.c:2622
+#: ../libpurple/protocols/qq/qq.c:139
+#: ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8012,7 +8058,8 @@
 msgid "Modify My Information"
 msgstr "Információim módosítása"
 
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:534
+#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Jelszó megváltoztatása"
 
@@ -8038,7 +8085,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:723
+#: ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ protokoll\tbővítmény"
 
@@ -8210,9 +8258,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-"Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s "
-"kiszolgálón"
+msgstr "Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s kiszolgálón"
 
 #: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
@@ -8282,12 +8328,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
-msgstr ""
-"Adja meg az új konferencia témáját és a(z) %s számára elküldendő "
-"meghívóüzenetet."
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "Adja meg az új konferencia témáját és a(z) %s számára elküldendő meghívóüzenetet."
 
 #: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
@@ -8311,14 +8353,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"Válasszon egy konferenciát az alábbi listából, amelyre meghívót küld %s "
-"felhasználónak. Válassza az \"Új konferencia létrehozása\" gombot, ha új "
-"konferenciát kíván létrehozni, amelyre meghívja a felhasználót."
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "Válasszon egy konferenciát az alábbi listából, amelyre meghívót küld %s felhasználónak. Válassza az \"Új konferencia létrehozása\" gombot, ha új konferenciát kíván létrehozni, amelyre meghívja a felhasználót."
 
 #: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
@@ -8332,7 +8368,8 @@
 msgid "Send TEST Announcement"
 msgstr "TESZT bejelentés küldése"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3586
+#: ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "Téma:"
 
@@ -8342,12 +8379,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:3636
 #, 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 ""
-"Nincs gép vagy IP cím megadva a(z) %s Meanwhile fiókhoz. A bejelentkezés "
-"folytatásához adjon meg egyet alább."
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "Nincs gép vagy IP cím megadva a(z) %s Meanwhile fiókhoz. A bejelentkezés folytatásához adjon meg egyet alább."
 
 #: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
@@ -8367,12 +8400,12 @@
 msgstr "Utolsó ismert kliens"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5500
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Felhasználónév"
 
 #: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime azonosító"
 
@@ -8382,12 +8415,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Válassza "
-"ki a partnerlistához adandó megfelelő felhasználót az alábbi listából."
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Válassza ki a partnerlistához adandó megfelelő felhasználót az alábbi listából."
 
 #: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
@@ -8399,12 +8428,8 @@
 
 #: ../libpurple/protocols/sametime/sametime.c:4420
 #, 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 ""
-"A(z) \"%s\" azonosító nem található meg a Sametime közösségben. Ez a "
-"bejegyzés eltávolításra került a partnerlistájából."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "A(z) \"%s\" azonosító nem található meg a Sametime közösségben. Ez a bejegyzés eltávolításra került a partnerlistájából."
 
 #: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
@@ -8443,151 +8468,126 @@
 msgid "Synchronize List with Server"
 msgstr "Lista szinkronizálása a kiszolgálóval"
 
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "A(z) %s fiók Sametime listájának importálása"
 
-#: ../libpurple/protocols/sametime/sametime.c:5249
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "A(z) %s fiók Sametime listájának exportálása"
 
-#: ../libpurple/protocols/sametime/sametime.c:5303
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "A csoport nem vehető fel: a csoport már létezik"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Már létezik \"%s\" nevű csoport a partnerlistán."
 
-#: ../libpurple/protocols/sametime/sametime.c:5307
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Nem vehető fel a csoport"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Lehetséges találatok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes címjegyzék csoporteredmények"
 
-#: ../libpurple/protocols/sametime/sametime.c:5383
-#, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"A(z) \"%s\" azonosító az alábbi Notes címjegyzék-csoportok bármelyikére "
-"hivatkozhat. Válassza ki a partnerlistához adandó megfelelő csoportot az "
-"alábbi listából."
-
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5389
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "A(z) \"%s\" azonosító az alábbi Notes címjegyzék-csoportok bármelyikére hivatkozhat. Válassza ki a partnerlistához adandó megfelelő csoportot az alábbi listából."
+
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Válasszon Notes címjegyzéket"
 
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Nem vehető fel a csoport: a csoport nem található"
 
-#: ../libpurple/protocols/sametime/sametime.c:5433
-#, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
-msgstr ""
-"A(z) \"%s\" azonosító a Sametime közösség egyetlen Notes "
-"címjegyzékcsoportjának sem felelt meg."
-
-#: ../libpurple/protocols/sametime/sametime.c:5474
+#: ../libpurple/protocols/sametime/sametime.c:5439
+#, c-format
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr "A(z) \"%s\" azonosító a Sametime közösség egyetlen Notes címjegyzékcsoportjának sem felelt meg."
+
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes címjegyzékcsoport"
 
-#: ../libpurple/protocols/sametime/sametime.c:5475
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"Az alábbi mezőben adja meg a Notes címjegyzékcsoport nevét, amelyet "
-"tagjaival együtt fel kíván venni a partnerlistájára."
-
-#: ../libpurple/protocols/sametime/sametime.c:5524
+#: ../libpurple/protocols/sametime/sametime.c:5481
+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 "Az alábbi mezőben adja meg a Notes címjegyzékcsoport nevét, amelyet tagjaival együtt fel kíván venni a partnerlistájára."
+
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "\"%s\" keresésének eredménye"
 
-#: ../libpurple/protocols/sametime/sametime.c:5525
-#, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Felveheti "
-"partnerlistájára ezeket felhasználókat, vagy üzeneteket küldhet nekik az "
-"alábbi műveletgombokkal."
-
-#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5531
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "A(z) %s azonosító az alábbi felhasználók bármelyikére hivatkozhat. Felveheti partnerlistájára ezeket felhasználókat, vagy üzeneteket küldhet nekik az alábbi műveletgombokkal."
+
+#: ../libpurple/protocols/sametime/sametime.c:5538
+#: ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "A keresés eredménye"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Nincs találat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5558
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
-"Nem található a(z) \"%s\" azonosítónak megfelelő felhasználó a Sametime "
-"közösségben."
-
-#: ../libpurple/protocols/sametime/sametime.c:5562
+msgstr "Nem található a(z) \"%s\" azonosítónak megfelelő felhasználó a Sametime közösségben."
+
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Nincs találat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5599
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Felhasználó keresése"
 
-#: ../libpurple/protocols/sametime/sametime.c:5600
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"Az alábbi mezőben adjon meg egy nevet vagy részleges azonosítót, amelyhez "
-"felhasználókat keres a Sametime közösségben."
-
-#: ../libpurple/protocols/sametime/sametime.c:5603
+#: ../libpurple/protocols/sametime/sametime.c:5606
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "Az alábbi mezőben adjon meg egy nevet vagy részleges azonosítót, amelyhez felhasználókat keres a Sametime közösségben."
+
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Felhasználó keresése"
 
-#: ../libpurple/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Sametime lista importálása..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Sametime lista exportálása..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Notes címjegyzékcsoport hozzáadása..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Felhasználó keresése..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Bejelentkezés kényszerítése (kiszolgáló átirányítások mellőzése)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5735
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Kliens azonosságának elrejtése"
 
@@ -8647,12 +8647,8 @@
 
 #: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"Kulcscsere-kérés érkezett a következőtől: %s. El szeretné végezni a "
-"kulcscserét?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "Kulcscsere-kérés érkezett a következőtől: %s. El szeretné végezni a kulcscserét?"
 
 #: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
@@ -8728,13 +8724,8 @@
 msgstr "%s partner nem megbízható"
 
 #: ../libpurple/protocols/silc/buddy.c:738
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"Nem fogadhat partnerértesítéseket, amíg nem importálja a partner nyilvános "
-"kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" paranccsal "
-"töltheti le."
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "Nem fogadhat partnerértesítéseket, amíg nem importálja a partner nyilvános kulcsát. A nyilvános kulcsot a \"Nyilvános kulcs letöltése\" paranccsal töltheti le."
 
 #. Open file selector to select the public key.
 #: ../libpurple/protocols/silc/buddy.c:1067
@@ -8747,12 +8738,8 @@
 msgstr "%s partner nincs jelen a hálózatban"
 
 #: ../libpurple/protocols/silc/buddy.c:1081
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"Partner hozzáadásához importálnia kell a nyilvános kulcsát, ehhez kattintson "
-"az Importálásra."
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "Partner hozzáadásához importálnia kell a nyilvános kulcsát, ehhez kattintson az Importálásra."
 
 #: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
@@ -8763,20 +8750,12 @@
 msgstr "Megfelelő felhasználó kiválasztása"
 
 #: ../libpurple/protocols/silc/buddy.c:1183
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"Több felhasználó található ugyanazzal a nyilvános kulccsal. Válassza ki a "
-"partnerlistához adandó megfelelő felhasználót a listából."
+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 "Több felhasználó található ugyanazzal a nyilvános kulccsal. Válassza ki a partnerlistához adandó megfelelő felhasználót a listából."
 
 #: ../libpurple/protocols/silc/buddy.c:1185
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"Több felhasználó található ugyanazzal a névvel. Válassza ki a "
-"partnerlistához adandó megfelelő felhasználót a listából."
+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 "Több felhasználó található ugyanazzal a névvel. Válassza ki a partnerlistához adandó megfelelő felhasználót a listából."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
@@ -9010,18 +8989,8 @@
 msgstr "Csatorna nyilvános kulcsainak listája"
 
 #: ../libpurple/protocols/silc/chat.c:413
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"A csatornahitelesítés a csatorna illetéktelen hozzáféréssel szembeni "
-"védelmére szolgál. A hitelesítés jelmondatokon és digitális aláírásokon "
-"alapulhat. Ha jelmondat van beállítva, akkor a csatlakozáshoz annak ismerete "
-"szükséges. Ha a csatorna nyilvános kulcsai vannak beállítva, akkor csak azok "
-"a felhasználók csatlakozhatnak, akiknek a nyilvános kulcsa fel van sorolva."
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "A csatornahitelesítés a csatorna illetéktelen hozzáféréssel szembeni védelmére szolgál. A hitelesítés jelmondatokon és digitális aláírásokon alapulhat. Ha jelmondat van beállítva, akkor a csatlakozáshoz annak ismerete szükséges. Ha a csatorna nyilvános kulcsai vannak beállítva, akkor csak azok a felhasználók csatlakozhatnak, akiknek a nyilvános kulcsa fel van sorolva."
 
 #: ../libpurple/protocols/silc/chat.c:422
 #: ../libpurple/protocols/silc/chat.c:423
@@ -9049,9 +9018,7 @@
 #: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr ""
-"Adja meg a(z) %s csatornához felvenni kívánt magáncsoport nevét és "
-"jelmondatát."
+msgstr "Adja meg a(z) %s csatornához felvenni kívánt magáncsoport nevét és jelmondatát."
 
 #: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
@@ -9126,9 +9093,7 @@
 #: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid "You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s "
-"csatornához"
+msgstr "Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s csatornához"
 
 #: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
@@ -9153,16 +9118,23 @@
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
-#: ../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
+#: ../libpurple/protocols/silc/ft.c:89
+#: ../libpurple/protocols/silc/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:96
+#: ../libpurple/protocols/silc/ft.c:100
+#: ../libpurple/protocols/silc/ft.c:104
+#: ../libpurple/protocols/silc/ft.c:205
+#: ../libpurple/protocols/silc/ft.c:210
+#: ../libpurple/protocols/silc/ft.c:215
+#: ../libpurple/protocols/silc/ft.c:221
+#: ../libpurple/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Biztonságos fájlátvitel"
 
-#: ../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:90
+#: ../libpurple/protocols/silc/ft.c:93
+#: ../libpurple/protocols/silc/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:101
 #: ../libpurple/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Hiba a fájlátvitel közben"
@@ -9199,7 +9171,8 @@
 msgid "Cannot send file"
 msgstr "A fájl nem küldhető el"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
+#: ../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"
@@ -9230,13 +9203,15 @@
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Önt a következőről: <I>%s</I> kirúgta <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
+#: ../libpurple/protocols/silc/ops.c:742
+#: ../libpurple/protocols/silc/ops.c:747
 #: ../libpurple/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Önt kidobta a következő: %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
+#: ../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)"
@@ -9416,9 +9391,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:1723
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás "
-"gombra egy új kapcsolat létrehozásához."
+msgstr "A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás gombra egy új kapcsolat létrehozásához."
 
 #: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
@@ -9484,12 +9457,8 @@
 
 #: ../libpurple/protocols/silc/pk.c:104
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"%s nyilvános kulcsa megérkezett. Az Ön helyi másolata nem egyezik meg ezzel "
-"a kulccsal. Még mindig el kívánja fogadni ezt a nyilvános kulcsot?"
+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 nyilvános kulcsa megérkezett. Az Ön helyi másolata nem egyezik meg ezzel a kulccsal. Még mindig el kívánja fogadni ezt a nyilvános kulcsot?"
 
 #: ../libpurple/protocols/silc/pk.c:109
 #, c-format
@@ -9509,7 +9478,8 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:116
+#: ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "Nyilvános kulcs ellenőrzése"
 
@@ -9567,7 +9537,8 @@
 msgid "Your Current Mood"
 msgstr "Az Ön jelenlegi hangulata"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:660
+#: ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "Normál"
 
@@ -9623,14 +9594,8 @@
 msgstr "Felhasználó online állapotattribútumai"
 
 #: ../libpurple/protocols/silc/silc.c:739
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"Megengedheti, hogy más felhasználók lássák az Ön elérhető állapotát és "
-"személyes információit. Kérem töltse ki azokat az információkat, amelyeket "
-"más felhasználók láthatnak Önről."
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "Megengedheti, hogy más felhasználók lássák az Ön elérhető állapotát és személyes információit. Kérem töltse ki azokat az információkat, amelyeket más felhasználók láthatnak Önről."
 
 #: ../libpurple/protocols/silc/silc.c:780
 #: ../libpurple/protocols/silc/silc.c:786
@@ -9746,9 +9711,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;csatorna&gt; [&lt;jelszó&gt;]:  Csatlakozás csatornához ezen a "
-"hálózaton"
+msgstr "join &lt;csatorna&gt; [&lt;jelszó&gt;]:  Csatlakozás csatornához ezen a hálózaton"
 
 #: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
@@ -9759,15 +9722,13 @@
 msgstr "whois &lt;becenév&gt;:  A becenévhez tartozó információk megjelenítése"
 
 #: ../libpurple/protocols/silc/silc.c:1618
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;becenév&gt; &lt;message&gt;:  Magánüzenet küldése a felhasználónak"
 
 #: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr ""
-"query &lt;becenév&gt; [&lt;message&gt;]:  Magánüzenet küldése a "
-"felhasználónak"
+msgstr "query &lt;becenév&gt; [&lt;message&gt;]:  Magánüzenet küldése a felhasználónak"
 
 #: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
@@ -9779,9 +9740,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr ""
-"quit [message]:  Kapcsolat bontása a kiszolgálóval, egy opcionális üzenet "
-"kíséretében"
+msgstr "quit [message]:  Kapcsolat bontása a kiszolgálóval, egy opcionális üzenet kíséretében"
 
 #: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
@@ -9789,9 +9748,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-"kill &lt;becenév&gt; [-pubkey|&lt;ok&gt;]:  A \"becenév\" nevű felhasználó "
-"kidobása"
+msgstr "kill &lt;becenév&gt; [-pubkey|&lt;ok&gt;]:  A \"becenév\" nevű felhasználó kidobása"
 
 #: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
@@ -9799,49 +9756,31 @@
 
 #: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr ""
-"whowas &lt;becenév&gt;:  A becenév nevű felhasználó információinak "
-"megjelenítése"
+msgstr "whowas &lt;becenév&gt;:  A becenév nevű felhasználó információinak megjelenítése"
 
 #: ../libpurple/protocols/silc/silc.c:1656
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;csatorna&gt; [+|-&lt;módok&gt;] [paraméterek]:  Csatorna "
-"üzemmódjainak megjelenítése vagy megváltoztatása"
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;csatorna&gt; [+|-&lt;módok&gt;] [paraméterek]:  Csatorna üzemmódjainak megjelenítése vagy megváltoztatása"
 
 #: ../libpurple/protocols/silc/silc.c:1660
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;csatorna&gt; +|-&lt;modes&gt; &lt;becenév&gt;:  A becenév "
-"módjainak megváltoztatása a csatornán"
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;csatorna&gt; +|-&lt;modes&gt; &lt;becenév&gt;:  A becenév módjainak megváltoztatása a csatornán"
 
 #: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
-"umode &lt;felhasználói módok&gt;:  A felhasználói módjainak beállítása a "
-"hálózaton"
+msgstr "umode &lt;felhasználói módok&gt;:  A felhasználói módjainak beállítása a hálózaton"
 
 #: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;becenév&gt; [-pubkey]:  Kiszolgáló-operátori jogok kérése"
 
 #: ../libpurple/protocols/silc/silc.c:1672
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;csatorna&gt; [-|+]&lt;becenév&gt;:  A becenév nevű felhasználó "
-"meghívása vagy a csatorna meghívási listájához/ról hozzáadása/eltávolítása"
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;csatorna&gt; [-|+]&lt;becenév&gt;:  A becenév nevű felhasználó meghívása vagy a csatorna meghívási listájához/ról hozzáadása/eltávolítása"
 
 #: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;csatorna&gt; &lt;becenév&gt; [megjegyzés]:  Kliens kirúgása a "
-"csatornáról"
+msgstr "kick &lt;csatorna&gt; &lt;becenév&gt; [megjegyzés]:  Kliens kirúgása a csatornáról"
 
 #: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
@@ -9853,9 +9792,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-"getkey &lt;becenév|kiszolgáló&gt;:  A kliens vagy a kiszolgáló nyilvános "
-"kulcsának letöltése"
+msgstr "getkey &lt;becenév|kiszolgáló&gt;:  A kliens vagy a kiszolgáló nyilvános kulcsának letöltése"
 
 #: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
@@ -9870,12 +9807,8 @@
 msgstr "users &lt;csatorna&gt;:  Egy csatorna felhasználóit listázza ki"
 
 #: ../libpurple/protocols/silc/silc.c:1705
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;csatorna/csatornák&gt;:  A "
-"csatorna/csatornák bizonyos felhasználóinak listázása"
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;csatorna/csatornák&gt;:  A csatorna/csatornák bizonyos felhasználóinak listázása"
 
 #. *< type
 #. *< ui_requirement
@@ -9886,64 +9819,65 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokollbővítmény"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1818
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protokoll"
 
-#: ../libpurple/protocols/silc/silc.c:1844 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1862
+#: ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "Hálózat"
 
-#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "Nyilvános kulcs fájlja"
 
-#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "Személyes kulcs fájlja"
 
-#: ../libpurple/protocols/silc/silc.c:1869
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "Titkosító"
 
-#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1882
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "Nyilvános kulcs hitelesítése"
 
-#: ../libpurple/protocols/silc/silc.c:1885
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "Más felhasználók nem láthatnak"
 
-#: ../libpurple/protocols/silc/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "Meghívások tiltása"
 
-#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "Kulcscsere nélküli azonnali üzenetváltások tiltása"
 
-#: ../libpurple/protocols/silc/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "Online állapotattribútum-kérések visszautasítása"
 
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "Üzenetek tiltása a rajzlapra"
 
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "Rajzlap automatikus megnyitása"
 
-#: ../libpurple/protocols/silc/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
 msgstr "Minden üzenet digitális aláírása és ellenőrzése"
 
@@ -10047,12 +9981,8 @@
 
 #: ../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 ""
-"%s üzenetet küldött a rajzlapra a(z) %s csatornán. Meg kívánja nyitni a "
-"rajzlapot?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr "%s üzenetet küldött a rajzlapra a(z) %s csatornán. Meg kívánja nyitni a rajzlapot?"
 
 #: ../libpurple/protocols/silc/wb.c:302
 msgid "Whiteboard"
@@ -10064,26 +9994,26 @@
 msgstr "Nem sikerült az írás"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1486
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "Nem sikerült kapcsolódni"
 
-#: ../libpurple/protocols/simple/simple.c:1520
-#: ../libpurple/protocols/simple/simple.c:1562
-#: ../libpurple/protocols/simple/simple.c:1575
-#: ../libpurple/protocols/simple/simple.c:1626
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "Nem sikerült létrehozni a figyelő foglalatot"
 
-#: ../libpurple/protocols/simple/simple.c:1543
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "Nem sikerült a kiszolgáló feloldása"
 
-#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "A gépnév nem oldható fel"
 
-#: ../libpurple/protocols/simple/simple.c:1651
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "A SIP felhasználónevek nem tartalmazhatnak szóközt vagy @ szimbólumot"
 
@@ -10095,36 +10025,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1826
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE protokollbővítmény"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1827
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "A SIP/SIMPLE protokollbővítmény"
 
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Állapot közzététele (megjegyzés: mindenki figyelheti)"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "UDP használata"
 
+#: ../libpurple/protocols/simple/simple.c:1861
+msgid "Use proxy"
+msgstr "Proxy használata"
+
 #: ../libpurple/protocols/simple/simple.c:1863
-msgid "Use proxy"
-msgstr "Proxy használata"
-
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "Felhasználó hitelesítése"
 
-#: ../libpurple/protocols/simple/simple.c:1869
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "Tartomány hitelesítése"
 
@@ -10190,9 +10120,7 @@
 #: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr ""
-"Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan "
-"küldte."
+msgstr "Nem kapott meg egy üzenetet a következőtől: %s, mert a feladó túl gyorsan küldte."
 
 #: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
@@ -10248,12 +10176,8 @@
 msgstr "A figyelmeztetési szintje jelenleg túl magas a bejelentkezéshez."
 
 #: ../libpurple/protocols/toc/toc.c:558
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha "
-"tovább folytatja, akkor még tovább kell majd várnia."
+msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
+msgstr "Túl gyakran jelentkezik be/ki. Várjon tíz percet, és próbálja meg újra. Ha tovább folytatja, akkor még tovább kell majd várnia."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -10306,8 +10230,10 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "A fájlátvitel sikertelen; valószínűleg a másik oldal megszakította."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878
+#: ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042
+#: ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Az átvitelhez nem sikerült a kapcsolatot létrehozni."
 
@@ -10341,7 +10267,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306
+#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC protokollbővítmény"
 
@@ -10354,204 +10281,186 @@
 msgid "%s just sent you a Buzz!"
 msgstr "%s egy bökést küldött!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:928
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! rendszerüzenet %s számára:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "Hozzáférés elutasítva üzenet:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1069
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
-"közé."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1072
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei "
-"közé, a következő magyarázattal: %s."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1075
+msgstr "%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei közé."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s visszamenőlegesen megtagadta az engedélyt, hogy felvegye őt a partnerei közé, a következő magyarázattal: %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "Partner felvétele megtagadva"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1826
-#, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#, c-format
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
 msgstr "A Yahoo kiszolgáló ismeretlen hitelesítési eljárás használatát kérte. Valószínűleg nem fog tudni sikeresen bejelentkezni. Keressen esetleges frissítéseket a következő helyen: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1829
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! hitelesítés sikertelen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1895
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"Megpróbálta mellőzni %s felhasználót, de ő rajta van a partnerlistáján. Ha "
-"az \"Igen\"-re kattint, eltávolítja a listáról és mellőzni fogja a "
-"felhasználót."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1898
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#, c-format
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "Megpróbálta mellőzni %s felhasználót, de ő rajta van a partnerlistáján. Ha az \"Igen\"-re kattint, eltávolítja a listáról és mellőzni fogja a felhasználót."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "Mellőzi a partnert?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1957
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "A fiókja zárolva van, kérem jelentkezzen be a Yahoo! weboldalára."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1960
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán "
-"megoldhatja ezt a problémát."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2014
+msgstr "Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán megoldhatja ezt a problémát."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz "
-"tartozó kiszolgálóoldali listán."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2017
+msgstr "Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz tartozó kiszolgálóoldali listán."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "Nem sikerült a partnert hozzáadni a kiszolgálóoldali listához"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hallható %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2492
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
-#: ../libpurple/protocols/yahoo/yahoo.c:2774
-#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Kapcsolathiba"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "Nem vagyok itthon"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
 msgid "Not at Desk"
 msgstr "Nem vagyok az asztalnál"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3503
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
 msgid "Not in Office"
 msgstr "Nem vagyok a munkahelyemen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "On Vacation"
 msgstr "Nyaralok"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo.c:3515
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "Kilépett"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/yahoo/yahoo.c:3021
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "Nincs a szerverlistán"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3038
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "Belépettként látszik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3041
-#: ../libpurple/protocols/yahoo/yahoo.c:3117
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "Tartósan kilépettként látszik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "Jelenlét"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "Kilépettként látszik"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne látsszon tartósan kilépettként"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "Csatlakozás a csevegéshez"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3165
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "Konferencia kezdeményezése"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "Jelenlét beállításai"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "Firkálás megkezdése"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "Melyik azonosítót aktiválja?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "Kihez csatlakozik a csevegésben?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Activate ID..."
 msgstr "Azonosító aktiválása..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Join User in Chat..."
 msgstr "Felhasználó csatlakoztatása csevegéshez..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "Elküldött egy bökést!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3825
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;szoba&gt;:  Csatlakozás csevegőszobához a Yahoo hálózatán"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Csatornák listázása a Yahoo hálózatán"
+
 #: ../libpurple/protocols/yahoo/yahoo.c:3830
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Csatornák listázása a Yahoo hálózatán"
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Felhasználó megcsörgetése figyelemfelhívási céllal"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3834
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Felhasználó megcsörgetése figyelemfelhívási céllal"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Kérés a felhasználóhoz egy firkálási folyamat indítására"
 
@@ -10565,65 +10474,63 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo protokollbővítmény"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4071
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japán"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "Személyhívó kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "Japán személyhívó kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "Személyhívó Port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4083
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "Fájlátviteli kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4086
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "Japán fájlátviteli kiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "Fájlátviteli port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4092
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "Csevegőszoba nyelve"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4095
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4103
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "Csevegőszobák listájának URL címe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4106
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "Yahoo csevegőkiszolgáló"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4109
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "Yahoo csevegőport"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s visszalépett az Ön meghívásától a(z) \"%s\" konferenciaszobába, mivel: \"%"
-"s\"."
+msgstr "%s visszalépett az Ön meghívásától a(z) \"%s\" konferenciaszobába, mivel: \"%s\"."
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
@@ -10649,12 +10556,8 @@
 msgstr "Nem érhető el"
 
 #: ../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 ""
-"Ismeretlen hiba. Lehetséges, hogy ki kell lépnie és várnia kell öt percet, "
-"mielőtt újra csatlakozhatna a csevegőszobához"
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "Ismeretlen hiba. Lehetséges, hogy ki kell lépnie és várnia kell öt percet, mielőtt újra csatlakozhatna a csevegőszobához"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:452
 #, c-format
@@ -10718,20 +10621,12 @@
 msgstr "Yahoo! profil"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:814
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
-msgstr ""
-"Sajnáljuk, a \"csak felnőtteknek szóló\" tartalmat tartalmazónak jelölt "
-"profilok jelenleg nem támogatottak."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+msgstr "Sajnáljuk, a \"csak felnőtteknek szóló\" tartalmat tartalmazónak jelölt profilok jelenleg nem támogatottak."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:816
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
-msgstr ""
-"Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell megnyitnia "
-"a böngészőjében:"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
+msgstr "Ha meg szeretné nézni ezt a profilt, a következő hivatkozást kell megnyitnia a böngészőjében:"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
@@ -10774,31 +10669,16 @@
 msgstr "%s felhasználói információi nem érhetőek el"
 
 #: ../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 ""
-"Elnézést, ez a profil olyan nyelvűnek vagy formátumúnak tűnik, ami jelenleg "
-"nem támogatott."
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
+msgstr "Elnézést, ez a profil olyan nyelvűnek vagy formátumúnak tűnik, ami jelenleg nem támogatott."
 
 #: ../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 ""
-"A felhasználó profiljának letöltése sikertelen. Ez valószínűleg átmeneti "
-"kiszolgálóoldali hiba, kérem próbálja újra később."
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "A felhasználó profiljának letöltése sikertelen. Ez valószínűleg átmeneti kiszolgálóoldali hiba, kérem próbálja újra később."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"Nem sikerült letölteni a felhasználó profilját. Ez valószínűleg azt jelenti, "
-"hogy a felhasználó nem létezik, azonban néha a Yahoo! nem találja a "
-"felhasználó profilját. Ha tudja, hogy a felhasználó létezik, akkor kérem "
-"próbálkozzon újra később."
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "Nem sikerült letölteni a felhasználó profilját. Ez valószínűleg azt jelenti, hogy a felhasználó nem létezik, azonban néha a Yahoo! nem találja a felhasználó profilját. Ha tudja, hogy a felhasználó létezik, akkor kérem próbálkozzon újra később."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
@@ -10818,12 +10698,8 @@
 "%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 ""
-"(Hiba történt az üzenet konvertálása közben. \t Ellenőrizze a \"Kódolás\" "
-"beállításait a Fiókszerkesztőben)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(Hiba történt az üzenet konvertálása közben. \t Ellenőrizze a \"Kódolás\" beállításait a Fiókszerkesztőben)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
@@ -10831,110 +10707,92 @@
 msgstr "Nem lehet a(z) %s,%s,%s csevegésbe küldeni"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Felhasználó"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Láthatatlan vagy nincs bejelentkezve"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Ennél: %s %s óta"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Bárki"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Osztály:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Példány:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Címzett:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "A feliratkozási kísérlet a következőre: %s,%s,%s sikertelen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;becenév&gt;: Felhasználó keresése"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;becenév&gt;: Felhasználó keresése"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;példány&gt;: Beállítja az osztályhoz használandó példányt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;példány&gt;: Beállítja az osztályhoz használandó példányt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;példány&gt;: Beállítja az osztályhoz használandó példányt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-"sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új "
-"csevegéshez"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+msgstr "sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új csevegéshez"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,"
-"*&gt;"
-
-#: ../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;osztály&gt; &lt;példány&gt;: Üzenet küldése a következőnek: &lt;"
-"<i>osztály</i>,<i>példány</i>,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a "
-"következőnek: &lt;<i>osztály</i>,<i>példány</i>,<i>címzett</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;"
-"ÜZENET,<i>példány</i>,<i>címzett</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+msgstr "zi &lt;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;osztály&gt; &lt;példány&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,<i>példány</i>,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,<i>példány</i>,<i>címzett</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;példány&gt; &lt;címzett&gt;: Üzenet küldése a következőnek: &lt;ÜZENET,<i>példány</i>,<i>címzett</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-"zc &lt;osztály&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,"
-"SZEMÉLY,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+msgstr "zc &lt;osztály&gt;: Üzenet küldése a következőnek: &lt;<i>osztály</i>,SZEMÉLY,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Ismételt feliratkozás"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Feliratkozások lekérése a kiszolgálótól"
 
@@ -10948,44 +10806,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2945
-#: ../libpurple/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokollbővítmény"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "tzc használata"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc parancs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Exportálás .anyone-ba"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Exportálás .zephyr.subs-ba"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Importálás .anyone-ból"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Importálás .zephyr.subs-ból"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2990
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Tartomány"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2993
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Exportálás"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:458
+#: ../libpurple/proxy.c:877
+#: ../libpurple/proxy.c:1032
 #: ../libpurple/proxy.c:1588
 #, c-format
 msgid ""
@@ -11000,7 +10860,9 @@
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s\n"
 
-#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:686
+#: ../libpurple/proxy.c:732
+#: ../libpurple/proxy.c:770
 #: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -11009,9 +10871,7 @@
 #: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr ""
-"Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %"
-"d. porton."
+msgstr "Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %d. porton."
 
 #: ../libpurple/proxy.c:995
 #, c-format
@@ -11051,12 +10911,12 @@
 msgid "saved statuses"
 msgstr "mentett állapotok"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%s neve ezentúl %s néven szerepel.\n"
-
-#: ../libpurple/server.c:670
+msgstr "%s ezentúl %s néven szerepel.\n"
+
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11065,58 +10925,58 @@
 "%s meghívta %s felhasználót a(z) %s csevegőszobába:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s meghívta %s felhasználót a(z) %s csevegőszobába:\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "Elfogadja a meghívást a csevegésre?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Visszaállítás"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "Nem érhető el"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s megváltoztatta az állapotát (%s -> %s)"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s ezentúl %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s már nem %s"
 
-#: ../libpurple/status.c:1288
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s inaktív lett"
 
-#: ../libpurple/status.c:1305
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s már nem inaktív"
 
-#: ../libpurple/status.c:1371
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s inaktív lett"
 
-#: ../libpurple/status.c:1373
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s már nem inaktív"
@@ -11126,95 +10986,88 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2495
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "Hiba %s olvasásakor"
 
-#: ../libpurple/util.c:2496
-#, 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 ""
-"Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a "
-"régi fájl %s~ néven lett elmentve."
-
-#: ../libpurple/util.c:2980
+#: ../libpurple/util.c:2554
+#, 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 "Hiba lépett fel a(z) %s feldolgozása közben. Ezek nem lettek betöltve, a régi fájl %s~ néven lett elmentve."
+
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "Számítás..."
 
-#: ../libpurple/util.c:2983
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "Ismeretlen."
 
-#: ../libpurple/util.c:3009
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d másodperc"
 msgstr[1] "%d másodperc"
 
-#: ../libpurple/util.c:3021
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d nap"
 msgstr[1] "%d nap"
 
-#: ../libpurple/util.c:3029
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d óra"
 msgstr[1] "%s, %d óra"
 
-#: ../libpurple/util.c:3035
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d óra"
 msgstr[1] "%d óra"
 
-#: ../libpurple/util.c:3043
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d perc"
 msgstr[1] "%s, %d perc"
 
-#: ../libpurple/util.c:3049
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d perc"
 msgstr[1] "%d perc"
 
-#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
+#: ../libpurple/util.c:3362
+#: ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Nem lehet csatlakozni a következőhöz: %s"
 
-#: ../libpurple/util.c:3441
-#, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"Nem lehet elég memóriát lefoglalni a(z) %s tartalmának tárolásához. "
-"Lehetséges, hogy a webkiszolgáló valami ártalmassal próbálkozik."
-
-#: ../libpurple/util.c:3476
+#: ../libpurple/util.c:3488
+#, c-format
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "Nem lehet elég memóriát lefoglalni a(z) %s tartalmának tárolásához. Lehetséges, hogy a webkiszolgáló valami ártalmassal próbálkozik."
+
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Hiba %s olvasása közben: %s"
 
-#: ../libpurple/util.c:3507
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Hiba %s írása közben: %s"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Nem lehet a következőhöz kapcsolódni: %s: %s"
@@ -11240,55 +11093,56 @@
 msgstr "A tálca tájolása."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:398
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "Bejelentkezés beállításai"
 
-#: ../pidgin/gtkaccount.c:500
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "Helyi álnév:"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:562
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "Felhasználói beállítások"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:580
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "Ezen partnerikon használata a fiókhoz:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:700
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s beállításai"
 
-#: ../pidgin/gtkaccount.c:897
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "GNOME proxybeállítások használata"
 
-#: ../pidgin/gtkaccount.c:898
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "Globális proxybeállítások használata"
 
-#: ../pidgin/gtkaccount.c:904
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "Nincs Proxy"
 
-#: ../pidgin/gtkaccount.c:910
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:916
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:922
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "Környezeti beállítások használata"
 
@@ -11297,308 +11151,316 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "ha igazán közelről nézi"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "láthatja a pillangók nászát"
 
-#: ../pidgin/gtkaccount.c:991
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "Proxy beállításai"
 
-#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020
+#: ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "Proxy _típusa:"
 
-#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029
+#: ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Gépnév:"
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033
+#: ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1026
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "_Felhasználó:"
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048
+#: ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "Jel_szó:"
 
-#: ../pidgin/gtkaccount.c:1440
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "Fiók hozzáadása"
 
-#: ../pidgin/gtkaccount.c:1464
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "_Alap"
 
-#: ../pidgin/gtkaccount.c:1475
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "_Haladó"
 
-#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: ../pidgin/gtkaccount.c:1975
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "Protokoll"
 
 # fixme: üdvözli a %s az {pidgin | finch} lehet, nemde?
-#: ../pidgin/gtkaccount.c:2169
+#: ../pidgin/gtkaccount.c:2183
 #, 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"
+"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"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Üdvözli a %s!</span>\n"
 "\n"
 "Nincsenek beállítva azonnaliüzenő-fiókjai. A %s használatának megkezdéséhez kattintson az alábbi <b>Hozzáadás</b> gombra és állítsa be első fiókját. Ha azt szeretné hogy a %s több fiókhoz csatlakozzon, kattintson újra a <b>Hozzáadás</b> gombra és állítsa be mindet.\n"
 "\n"
-"A Partnerlista ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével visszatérhet ehhez az ablakhoz fiókok hozzáadásához, "
-"szerkesztéséhez vagy eltávolításához."
-
-#: ../pidgin/gtkblist.c:722
+"A Partnerlista ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével visszatérhet ehhez az ablakhoz fiókok hozzáadásához, szerkesztéséhez vagy eltávolításához."
+
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "Csatlakozás egy csevegéshez"
 
-#: ../pidgin/gtkblist.c:743
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez "
-"csatlakozni kíván.\n"
-
-#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkblist.c:745
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
+msgstr "Kérem adja meg a megfelelő információt arról a csevegésről, amelyhez csatlakozni kíván.\n"
+
+#: ../pidgin/gtkblist.c:756
+#: ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "F_iók:"
 
-#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1045
+#: ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Tiltás"
 
-#: ../pidgin/gtkblist.c:1028
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "_Tiltás feloldása"
 
-#: ../pidgin/gtkblist.c:1079
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "_Info"
 
-#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:86
+#: ../pidgin/gtkblist.c:1099
+#: ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "Ü_zenet"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "_Fájl küldése"
 
-#: ../pidgin/gtkblist.c:1095
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "_Partnerfigyelmeztetés felvétele"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
-#: ../pidgin/gtkblist.c:1204 ../pidgin/gtkblist.c:1227
+#: ../pidgin/gtkblist.c:1116
+#: ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222
+#: ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "Nap_ló megtekintése"
 
-#: ../pidgin/gtkblist.c:1115
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "Álnév..."
 
-#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1212
-#: ../pidgin/gtkblist.c:1233
+#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "Ál_név..."
 
-#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1214
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1143
+#: ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "P_artner felvétele"
 
-#: ../pidgin/gtkblist.c:1177
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "_Csevegés felvétele"
 
-#: ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "_Csoport törlése"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "Á_tnevezés"
 
 #. join button
-#: ../pidgin/gtkblist.c:1200 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1218
+#: ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463
+#: ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Csatlakozás"
 
-#: ../pidgin/gtkblist.c:1202
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "Automatikus csatlakozás"
 
-#: ../pidgin/gtkblist.c:1240 ../pidgin/gtkblist.c:1263
+#: ../pidgin/gtkblist.c:1258
+#: ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "Összecs_ukás"
 
-#: ../pidgin/gtkblist.c:1268
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "_Kibontás"
 
-#: ../pidgin/gtkblist.c:1513 ../pidgin/gtkblist.c:1525
-#: ../pidgin/gtkblist.c:4491 ../pidgin/gtkblist.c:4501
+#: ../pidgin/gtkblist.c:1531
+#: ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511
+#: ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/Eszközök/Hangok némítása"
 
-#: ../pidgin/gtkblist.c:1985 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkblist.c:2003
+#: ../pidgin/gtkconv.c:4535
 #: ../pidgin/gtkpounce.c:423
 msgid "You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a "
-"partnert."
+msgstr "Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a partnert."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2813
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/_Partnerek"
 
-#: ../pidgin/gtkblist.c:2814
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Partnerek/Új azonnal_i üzenet..."
 
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Partnerek/_Csatlakozás csevegéshez..."
 
-#: ../pidgin/gtkblist.c:2816
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/Partnerek/_Felhasználó adatainak lekérése..."
 
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/Partnerek/Felhasználó _naplójának lekérése..."
 
-#: ../pidgin/gtkblist.c:2819
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Partnerek/Ki_lépett partnerek megjelenítése"
 
-#: ../pidgin/gtkblist.c:2820
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Partnerek/Ür_es csoportok megjelenítése"
 
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Partnerek/_Partner részleteinek megjelenítése"
 
-#: ../pidgin/gtkblist.c:2822
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Partnerek/Inaktív i_dők megjelenítése"
 
-#: ../pidgin/gtkblist.c:2823
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Partnerek/Part_nerek rendezése"
 
-#: ../pidgin/gtkblist.c:2825
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Partnerek/_Partner felvétele..."
 
-#: ../pidgin/gtkblist.c:2826
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/Partnerek/Cse_vegés felvétele..."
 
-#: ../pidgin/gtkblist.c:2827
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/Partnerek/C_soport felvétele..."
 
-#: ../pidgin/gtkblist.c:2829
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/Partnerek/_Kilépés"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/_Fiókok"
 
-#: ../pidgin/gtkblist.c:2833 ../pidgin/gtkblist.c:6414
+#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Fiókok/Hozzáadás\\/Szerkesztés"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: ../pidgin/gtkblist.c:2837
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Eszközök/_Partnerfigyelmeztetések"
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/Eszközök/Bő_vítmények"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/Eszközök/_Beállítások"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/Eszközök/Ma_gánszféra"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/Eszközök/_Fájlátvitelek"
 
-#: ../pidgin/gtkblist.c:2843
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/Eszközök/_Szobalista"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/Eszközök/_Rendszernapló"
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/Eszközök/_Hangok némítása"
 
 #. Help
-#: ../pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "/Súgó/Online _súgó"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/Súgó/_Hibakereső ablak"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/Súgó/_Névjegy"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11607,234 +11469,217 @@
 "\n"
 "<b>Fiók:</b> %s"
 
-#: ../pidgin/gtkblist.c:2958
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "Partnerálnév"
 
-#: ../pidgin/gtkblist.c:2979
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "Bejelentkezve"
 
-#: ../pidgin/gtkblist.c:3025
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "Utoljára látszott"
 
-#: ../pidgin/gtkblist.c:3045
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "Idegroncs"
 
-#: ../pidgin/gtkblist.c:3047
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "Szuper"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "Király"
 
-#: ../pidgin/gtkblist.c:3374
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inaktív (%d ó %02d p)"
 
-#: ../pidgin/gtkblist.c:3376
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "Inaktív (%d p)"
 
-#: ../pidgin/gtkblist.c:3513
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/Partnerek/Új azonnali üzenet..."
 
-#: ../pidgin/gtkblist.c:3514 ../pidgin/gtkblist.c:3547
+#: ../pidgin/gtkblist.c:3534
+#: ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/Partnerek/Csatlakozás csevegéshez..."
 
-#: ../pidgin/gtkblist.c:3515
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/Partnerek/Felhasználó adatainak lekérése..."
 
-#: ../pidgin/gtkblist.c:3516
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/Partnerek/Partner felvétele..."
 
-#: ../pidgin/gtkblist.c:3517 ../pidgin/gtkblist.c:3550
+#: ../pidgin/gtkblist.c:3537
+#: ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/Partnerek/Csevegés felvétele..."
 
-#: ../pidgin/gtkblist.c:3518
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/Partnerek/Csoport felvétele..."
 
-#: ../pidgin/gtkblist.c:3553
-msgid "/Tools/Buddy Pounces"
-msgstr "/Eszközök/Partnerfigyelmeztetések"
-
-#: ../pidgin/gtkblist.c:3556
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/Eszközök/Magánszféra"
 
-#: ../pidgin/gtkblist.c:3559
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/Eszközök/Szobalista"
 
-#: ../pidgin/gtkblist.c:3656 ../pidgin/gtkdocklet.c:156
+#: ../pidgin/gtkblist.c:3673
+#: ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d olvasatlan üzenet %s partnertől\n"
 msgstr[1] "%d olvasatlan üzenet %s partnertől\n"
 
-#: ../pidgin/gtkblist.c:3733
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "Kézi"
 
-#: ../pidgin/gtkblist.c:3735
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "ABC sorrend"
 
-#: ../pidgin/gtkblist.c:3736
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "Állapot szerint"
 
-#: ../pidgin/gtkblist.c:3737
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "Napló mérete szerint"
 
-#: ../pidgin/gtkblist.c:3939 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956
+#: ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s bontotta a kapcsolatot"
 
-#: ../pidgin/gtkblist.c:3949
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "Fiók újraengedélyezése"
 
-#: ../pidgin/gtkblist.c:3970
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s bontotta a kapcsolatot: %s</span>"
 
-#: ../pidgin/gtkblist.c:4123
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>Felhasználónév:</b>"
 
-#: ../pidgin/gtkblist.c:4130
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>Jelszó:</b>"
 
-#: ../pidgin/gtkblist.c:4141
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "_Bejelentkezés"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/Fiókok"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4240
+#: ../pidgin/gtkblist.c:4259
 #, 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."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span size='larger' weight='bold'>Üdvözli a %s!</span>\n"
 "\n"
-"Nincsenek engedélyezve fiókjai. A <b>Fiókok</b> ablak <b>Fiókok -> Hozzáadás/"
-"Szerkesztés</b> menüpontja segítségével engedélyezze azonnali üzenő "
-"fiókjait. A fiókok engedélyezése után bejelentkezhet, beállíthatja állapotát "
-"és cseveghet barátaival."
+"Nincsenek engedélyezve fiókjai. A <b>Fiókok</b> ablak <b>Fiókok -> Hozzáadás/Szerkesztés</b> menüpontja segítségével engedélyezze azonnali üzenő fiókjait. A fiókok engedélyezése után bejelentkezhet, beállíthatja állapotát és cseveghet barátaival."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4485
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Partnerek/Kilépett partnerek megjelenítése"
 
-#: ../pidgin/gtkblist.c:4488
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Partnerek/Üres csoportok megjelenítése"
 
-#: ../pidgin/gtkblist.c:4494
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Partnerek/Partner részleteinek megjelenítése"
 
-#: ../pidgin/gtkblist.c:4497
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/Partnerek/Inaktivitási idők megjelenítése"
 
-#: ../pidgin/gtkblist.c:5335
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat "
-"egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett "
-"kerül megjelenítésre, amennyiben az lehetséges.\n"
-
-#: ../pidgin/gtkblist.c:5395 ../pidgin/gtkblist.c:5756
+#: ../pidgin/gtkblist.c:5367
+msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "Adja meg a felvenni kívánt partner felhasználónevét. Opcionálisan megadhat egy álnevet vagy becenevet a partnerhez. Az álnév a felhasználónév helyett kerül megjelenítésre, amennyiben az lehetséges.\n"
+
+#: ../pidgin/gtkblist.c:5427
+#: ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Csoport:"
 
-#: ../pidgin/gtkblist.c:5654
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "Ez a protokoll nem támogatja a csevegőszobákat."
 
-#: ../pidgin/gtkblist.c:5670
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas "
-"lenne."
-
-#: ../pidgin/gtkblist.c:5711
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni "
-"kívánt csevegésről.\n"
-
-#: ../pidgin/gtkblist.c:5794
+#: ../pidgin/gtkblist.c:5702
+msgid "You are not currently signed on with any protocols that have the ability to chat."
+msgstr "Jelenleg nincs bejelentkezve olyan protokollal, ami csevegésre alkalmas lenne."
+
+#: ../pidgin/gtkblist.c:5743
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "Adjon meg egy álnevet és a megfelelő információt a partnerlistára felvenni kívánt csevegésről.\n"
+
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "Kérem adja meg a felvenni kívánt csoport nevét."
 
-#: ../pidgin/gtkblist.c:6434
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Fiókok/"
 
-#: ../pidgin/gtkblist.c:6458
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "_Fiók szerkesztése"
 
-#: ../pidgin/gtkblist.c:6471 ../pidgin/gtkconv.c:2900
+#: ../pidgin/gtkblist.c:6503
+#: ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "Nem állnak rendelkezésre műveletek"
 
-#: ../pidgin/gtkblist.c:6479
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "_Tiltás"
 
-#: ../pidgin/gtkblist.c:6491
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "Fiók engedélyezése"
 
-#: ../pidgin/gtkblist.c:6497
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Fiókok/Fiók engedélyezése"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/Eszközök"
 
-#: ../pidgin/gtkblist.c:6616
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/Partnerek/Partnerek rendezése"
 
@@ -11843,215 +11688,214 @@
 msgid ""
 "%s\n"
 "\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
+"%s will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"A %s nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a "
-"hibát és nem engedélyezi újra a fiókot."
-
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+"A %s nem próbálja meg újra csatlakoztatni a fiókot, amíg nem javítja a hibát és nem engedélyezi újra a fiókot."
+
+#: ../pidgin/gtkconv.c:788
+#: ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "A partner nem ugyanazt a protokollt használja, mint ez a csevegés"
 
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a "
-"partnert."
-
-#: ../pidgin/gtkconv.c:855
+msgstr "Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a partnert."
+
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "Partner meghívása a csevegőszobába"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy "
-"tetszőleges meghívóüzenettel együtt."
-
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:891
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "Adja meg annak a partnernek a nevét, akit meg szeretne hívni, egy tetszőleges meghívóüzenettel együtt."
+
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "_Partner:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtkconv.c:932
+#: ../pidgin/gtksavedstatuses.c:1142
 #: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "Ü_zenet:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:2499
+#: ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Nem lehet megnyitni a fájlt."
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Társalgás %s partnerrel</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "Társalgás mentése"
 
-#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+#: ../pidgin/gtkconv.c:1180
+#: ../pidgin/gtkdebug.c:165
+#: ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "Keresés"
 
-#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206
+#: ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "Kere_sés:"
 
-#: ../pidgin/gtkconv.c:1340
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "A naplózás elkezdődött. A társalgás jövőbeli üzenetei naplózva lesznek."
 
-#: ../pidgin/gtkconv.c:1348
+#: ../pidgin/gtkconv.c:1366
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "A naplózás befejeződött. A társalgás jövőbeli üzenetei nem lesznek naplózva."
 
-#: ../pidgin/gtkconv.c:1596
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "Mellőzés visszavonása"
 
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "Mellőzés"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "Távollét üzenet lekérdezése"
 
-#: ../pidgin/gtkconv.c:1642
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "Utoljára ezt mondta"
 
-#: ../pidgin/gtkconv.c:2484
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "Nem menthető lemezre az ikonfájl."
 
-#: ../pidgin/gtkconv.c:2535
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "Ikon mentése"
 
-#: ../pidgin/gtkconv.c:2587
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "Animálás"
 
-#: ../pidgin/gtkconv.c:2592
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "Ikon elrejtése"
 
-#: ../pidgin/gtkconv.c:2595
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "Ikon mentése másként..."
 
-#: ../pidgin/gtkconv.c:2599
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "Egyéni ikon beállítása..."
 
-#: ../pidgin/gtkconv.c:2612
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "Egyéni ikon eltávolítása"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2754
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/_Társalgás"
 
-#: ../pidgin/gtkconv.c:2756
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Társalgás/Új azonnali ü_zenet..."
 
-#: ../pidgin/gtkconv.c:2761
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/Társalgás/Ker_esés..."
 
-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/Társalgás/Nap_ló megtekintése"
 
-#: ../pidgin/gtkconv.c:2764
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/Társalgás/_Mentés másként..."
 
-#: ../pidgin/gtkconv.c:2766
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Társalgás/Elő_zmények törlése"
 
-#: ../pidgin/gtkconv.c:2770
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/Se_nd File..."
 msgstr "/Társalgás/Fájl kül_dése..."
 
-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Társalgás/_Partnerfigyelmeztetés felvétele..."
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/Társalgás/_Információ lekérése"
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/Társalgás/Me_ghívás..."
 
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/Társalgás/_Több"
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/Társalgás/Ál_név..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/Társalgás/_Tiltás..."
 
-#: ../pidgin/gtkconv.c:2785
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/Társalgás/_Tiltás feloldása..."
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/Társalgás/_Hozzáadás..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/Társalgás/_Eltávolítás..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/Társalgás/_Bezárás"
 
 #. Options
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/_Beállítások"
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/Beállítások/_Naplózás engedélyezése"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/Beállítások/_Hangok engedélyezése"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Beállítások/_Partnerikonok megjelenítése"
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Beállítások/_Formázás eszköztárak mutatása"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Beállítások/I_dőbélyegek mutatása"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/Társalgás/Több"
 
@@ -12060,238 +11904,253 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+#: ../pidgin/gtkconv.c:2947
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/Társalgás"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/Társalgás/Napló megtekintése"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/Társalgás/Fájl küldése..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Társalgás/Partnerfigyelmeztetés felvétele..."
 
-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/Társalgás/Információ lekérése"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/Társalgás/Meghívás..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/Társalgás/Álnév..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/Társalgás/Tiltás..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/Társalgás/Tiltás feloldása..."
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/Társalgás/Hozzáadás..."
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/Társalgás/Eltávolítás..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3033
 msgid "/Options/Enable Logging"
 msgstr "/Beállítások/Naplózás engedélyezése"
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/Beállítások/Hangok engedélyezése"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Beállítások/Formázás eszköztárak mutatása"
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Show Timestamps"
 msgstr "/Beállítások/Időbélyegek mutatása"
 
-#: ../pidgin/gtkconv.c:3032
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/Beállítások/Partnerikon megjelenítése"
 
-#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
 msgstr "A felhasználó gépel..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
 msgstr "A felhasználó gépelt valamit és megállt"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3341
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "_Küldés mint"
 
-#: ../pidgin/gtkconv.c:4049
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "_Küldés"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4197
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "0 személy tartózkodik a szobában"
 
-#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#: ../pidgin/gtkconv.c:5421
+#: ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d személy van a szobában"
 msgstr[1] "%d személy van a szobában"
 
-#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6108
+#: ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Gépel"
 
-#: ../pidgin/gtkconv.c:6054
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "Abbahagyta a gépelést"
 
-#: ../pidgin/gtkconv.c:6059
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "Becenév kimondva"
 
-#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:509
+#: ../pidgin/gtkconv.c:6124
+#: ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Olvasatlan üzenetek"
 
-#: ../pidgin/gtkconv.c:6069
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "Új esemény"
 
-#: ../pidgin/gtkconv.c:7196
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "Bezárás jóváhagyása"
 
-#: ../pidgin/gtkconv.c:7228
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Olvasatlan üzenetei vannak. Biztos, hogy bezárja az ablakot?"
 
-#: ../pidgin/gtkconv.c:7763
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "Más lapok bezárása"
 
-#: ../pidgin/gtkconv.c:7769
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr "Minden lap bezárása"
 
-#: ../pidgin/gtkconv.c:7777
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "Ezen lap leválasztása"
 
-#: ../pidgin/gtkconv.c:7783
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr "Ezen lap bezárása"
 
-#: ../pidgin/gtkconv.c:8086
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "Társalgás bezárása"
 
-#: ../pidgin/gtkconv.c:8550
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "Utoljára létrehozott ablak"
 
-#: ../pidgin/gtkconv.c:8552
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "Üzenő- és csevegőablakok elkülönítése"
 
-#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736
+#: ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "Új ablak"
 
-#: ../pidgin/gtkconv.c:8556
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "Csoport szerint"
 
-#: ../pidgin/gtkconv.c:8558
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "Fiók szerint"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Hibakereső napló mentése"
 
-#: ../pidgin/gtkdebug.c:596
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr "Invertálás"
 
-#: ../pidgin/gtkdebug.c:599
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "Találatok kiemelése"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "Csak i_kon"
 
-#: ../pidgin/gtkdebug.c:667
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "Csak s_zöveg"
 
-#: ../pidgin/gtkdebug.c:668
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "Ik_on és szöveg"
 
-#: ../pidgin/gtkdebug.c:804
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "Szűrő"
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "Kattintson a jobb egérgombbal további beállításokért."
 
-#: ../pidgin/gtkdebug.c:853
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "Szint: "
 
-#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "Válassza ki a hibakeresési szűrő szintjét."
 
-#: ../pidgin/gtkdebug.c:862
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "Minden"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "Egyéb"
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../pidgin/gtkdebug.c:866
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
 msgstr "Hiba "
 
-#: ../pidgin/gtkdebug.c:867
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "Végzetes hiba"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71
+#: ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "vezető fejlesztő"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:72
+#: ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 #: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "fejlesztő"
@@ -12312,7 +12171,8 @@
 msgid "win32 port"
 msgstr "win32 portolás"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "karbantartó"
 
@@ -12326,8 +12186,8 @@
 msgstr "hacker és kijelölt vezető"
 
 #: ../pidgin/gtkdialogs.c:115
-msgid "Jabber developer"
-msgstr "Jabber fejlesztő"
+msgid "XMPP developer"
+msgstr "XMPP fejlesztő"
 
 #: ../pidgin/gtkdialogs.c:116
 msgid "original author"
@@ -12341,13 +12201,16 @@
 msgid "Arabic"
 msgstr "Arab"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:125
+#: ../pidgin/gtkdialogs.c:126
 #: ../pidgin/gtkdialogs.c:209
 msgid "Bulgarian"
 msgstr "Bolgár"
 
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:127
+#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "Bengáli"
 
@@ -12355,34 +12218,41 @@
 msgid "Bosnian"
 msgstr "Bosnyák"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:210
 #: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "Katalán"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "Valenciai katalán"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "Cseh"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "Dán"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
 #: ../pidgin/gtkdialogs.c:213
 msgid "German"
 msgstr "Német"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141
 #: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "Görög"
 
@@ -12402,28 +12272,35 @@
 msgid "Esperanto"
 msgstr "Eszperantó"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216
 #: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "Spanyol"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "Baszk"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 #: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "Perzsa"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:218
 #: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "Finn"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:222
 #: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "Francia"
@@ -12432,11 +12309,17 @@
 msgid "Galician"
 msgstr "Galíciai"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "Gudzsarati"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "Gudzsarati fordítócsapat"
+
+#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "Héber"
 
@@ -12452,33 +12335,48 @@
 msgid "Indonesian"
 msgstr "Indonéz"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "Olasz"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "Japán"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "Grúz"
 
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Grúz Ubuntu fordítók"
+
 #: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "Kannada fordítócsapat"
+
+#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "Koreai"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
 msgstr "Kurd"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:231
 #: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "Litván"
@@ -12503,8 +12401,10 @@
 msgid "Norwegian"
 msgstr "Norvég"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "Lengyel"
 
@@ -12524,18 +12424,22 @@
 msgid "Romanian"
 msgstr "Román"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:234
 #: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "Orosz"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 #: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "Szlovák"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
 msgstr "Szlovén"
 
@@ -12543,11 +12447,13 @@
 msgid "Albanian"
 msgstr "Albán"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "Szerb"
 
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "Svéd"
 
@@ -12575,15 +12481,18 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh és a Gnome-Vi csapat"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "Egyszerűsített kínai"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Hong Kong Chinese"
 msgstr "Hongkongi kínai"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 #: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "Hagyományos kínai"
@@ -12597,226 +12506,180 @@
 msgid "About %s"
 msgstr "A %s névjegye"
 
-#: ../pidgin/gtkdialogs.c:363
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"A %s egy moduláris üzenetküldő kliens AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
-"SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
-"Gadu és QQ protokollok egyidejű használatának képességével. A Gtk+ "
-"használatával készül és GPL licenc alatt terjeszthető.<BR><BR>A programot "
-"terjesztheti és/vagy módosíthatja a GPL második (vagy későbbi) változatában "
-"foglaltak alapján. A GPL egy példánya megtalálható a %s programmal terjesztett "
-"\"COPYING\" fájlban. A %s szerzői jogait a közreműködők birtokolják, ezek "
-"teljes listája megtalálható a COPYRIGHT fájlban. A programra nem biztosítunk "
-"garanciát.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to 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 "A %s egy libpurple alapú moduláris üzenetküldő kliens AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu és QQ protokollok egyidejű használatának lehetőségével. A Gtk+ használatával készül és GPL licenc alatt terjeszthető.<BR><BR>A programot terjesztheti és/vagy módosíthatja a GPL második (vagy későbbi) változatában foglaltak alapján. A GPL egy példánya megtalálható a %s programmal terjesztett \"COPYING\" fájlban. A %s szerzői jogait a közreműködők birtokolják, ezek teljes listája megtalálható a COPYRIGHT fájlban. A programra nem biztosítunk garanciát.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 az irc.freenode.net hálózaton<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:381
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin az irc.freenode.net hálózaton<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "Jelenlegi fejlesztők"
 
-#: ../pidgin/gtkdialogs.c:402
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "Őrült patch szerzők"
 
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "Visszavonult fejlesztők"
 
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
 msgstr "Grafikusok"
 
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "Jelenlegi fordítók"
 
-#: ../pidgin/gtkdialogs.c:467
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "Korábbi fordítók"
 
-#: ../pidgin/gtkdialogs.c:485
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "Hibakeresési információk"
 
-#: ../pidgin/gtkdialogs.c:854
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "Felhasználó adatainak lekérése"
 
-#: ../pidgin/gtkdialogs.c:856
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg "
-"szeretné tekinteni."
-
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:859
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek az adatait meg szeretné tekinteni."
+
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "Felhasználó naplójának lekérése"
 
-#: ../pidgin/gtkdialogs.c:948
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg "
-"szeretné tekinteni."
-
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:951
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr "Adja meg azon partner felhasználónevét vagy álnevét, akinek a naplóját meg szeretné tekinteni."
+
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "Kapcsolat álneve"
 
-#: ../pidgin/gtkdialogs.c:969
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "Adjon meg egy álnevet ehhez a kapcsolathoz."
 
-#: ../pidgin/gtkdialogs.c:991
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Adjon meg egy álnevet %s számára."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "Partner álneve"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "Csevegés álneve"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "Adjon meg egy álnevet ehhez a csevegéshez."
 
-#: ../pidgin/gtkdialogs.c:1054
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
-"partnerlistájáról. Folytatni akarja?"
-msgstr[1] ""
-"%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a "
-"partnerlistájáról. Folytatni akarja?"
-
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1057
+#, c-format
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+msgstr[1] "%s és %d más partnert tartalmazó kapcsolat eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "Kapcsolat eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "_Kapcsolat eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1096
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"A(z) %s csoport összes tagjának a(z) %s csoportba fésülésére készül. "
-"Folytatni akarja?"
-
-#: ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1099
+#, c-format
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgstr "A(z) %s csoport összes tagjának a(z) %s csoportba fésülésére készül. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "Csoportok összefésülése"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "_Csoportok összefésülése"
 
-#: ../pidgin/gtkdialogs.c:1156
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"A(z) %s csoport és annak összes tagja eltávolítására készül a "
-"partnerlistájáról. Folytatni akarja?"
-
 #: ../pidgin/gtkdialogs.c:1159
+#, c-format
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "A(z) %s csoport és annak összes tagja eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "Csoport törlése"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "_Csoport eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1195
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "%s eltávolítására készül a partnerlistájáról. Folytatni akarja?"
 
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "Partner törlése"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "Partner _törlése"
 
-#: ../pidgin/gtkdialogs.c:1222
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
+#: ../pidgin/gtkdialogs.c:1225
+#, c-format
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "%s csevegés eltávolítására készül a partnerlistájáról. Folytatni akarja?"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "Csevegés eltávolítása"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "_Csevegés eltávolítása"
 
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "További olvasatlan üzenetekért kattintson a jobb egérgombbal...\n"
 
-#: ../pidgin/gtkdocklet.c:452
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "Állapot megváltoztatása"
 
-#: ../pidgin/gtkdocklet.c:504
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Partnerlista mutatása"
 
-#: ../pidgin/gtkdocklet.c:530
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "Új üzenet..."
 
-#: ../pidgin/gtkdocklet.c:545
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Hangok némítása"
 
-#: ../pidgin/gtkdocklet.c:552
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "Villogjon új üzenetkor"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:563
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Kilépés"
 
@@ -12897,7 +12760,8 @@
 msgstr "Fájlát_vitel részletei"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkft.c:835
+#: ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Szünet"
 
@@ -12942,7 +12806,7 @@
 msgid "_Copy Link Location"
 msgstr "_Hivatkozás helyének másolása"
 
-#: ../pidgin/gtkimhtml.c:3202
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12952,7 +12816,7 @@
 "\n"
 "Alapértelmezett PNG használata."
 
-#: ../pidgin/gtkimhtml.c:3205
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12962,7 +12826,7 @@
 "\n"
 "Alapértelmezett PNG használata."
 
-#: ../pidgin/gtkimhtml.c:3218
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12973,7 +12837,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3221
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12984,11 +12848,12 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+#: ../pidgin/gtkimhtml.c:3310
+#: ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "Kép mentése"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "Kép menté_se..."
 
@@ -13013,12 +12878,8 @@
 msgstr "_Leírás"
 
 #: ../pidgin/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás "
-"opcionális."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgstr "Kérem adja meg a beszúrandó hivatkozás URL-jét és leírását. A leírás opcionális."
 
 #: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
@@ -13037,7 +12898,8 @@
 msgid "Failed to store image: %s\n"
 msgstr "A kép tárolása nem sikerült: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:513
+#: ../pidgin/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Kép beszúrása"
 
@@ -13050,15 +12912,18 @@
 msgid "Smile!"
 msgstr "Hangulatjel választása"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:922
+#: ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Félkövér"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:933
+#: ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Dőlt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:944
+#: ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Aláhúzott"
 
@@ -13100,23 +12965,17 @@
 
 #: ../pidgin/gtklog.c:267
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
 msgstr "Biztos, hogy törölni akarja a(z) %s partnerrel folytatott, %s időpontban kezdődött beszélgetés naplóját?"
 
 #: ../pidgin/gtklog.c:278
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
 msgstr "Biztos, hogy törölni akarja a(z) %s csatornán folytatott, %s időpontban kezdődött beszélgetés naplóját?"
 
 #: ../pidgin/gtklog.c:283
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
 msgstr "Biztos, hogy törölni akarja a(z) %s időpontban kezdődött rendszernaplót?"
 
 #: ../pidgin/gtklog.c:427
@@ -13134,26 +12993,16 @@
 msgstr "%Y %B"
 
 #: ../pidgin/gtklog.c:524
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes "
-"állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "A rendszeresemények csak akkor lesznek naplózva, ha az \"Összes állapotváltozás naplózása a rendszernaplóba\" tulajdonság be van állítva."
 
 #: ../pidgin/gtklog.c:528
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Az azonnali üzenetek csak akkor lesznek naplózva, ha az \"Összes azonnali "
-"üzenet naplózása\" tulajdonság be van állítva."
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "Az azonnali üzenetek csak akkor lesznek naplózva, ha az \"Összes azonnali üzenet naplózása\" tulajdonság be van állítva."
 
 #: ../pidgin/gtklog.c:531
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása"
-"\" tulajdonság be van állítva."
+msgstr "A csevegések csak akkor lesznek naplózva, ha az \"Összes csevegés naplózása\" tulajdonság be van állítva."
 
 #: ../pidgin/gtklog.c:535
 msgid "No logs were found"
@@ -13173,7 +13022,8 @@
 msgid "Conversations in %s"
 msgstr "Társalgások ezen: %s"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:691
+#: ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "Társalgások a következővel: %s"
@@ -13182,12 +13032,12 @@
 msgid "System Log"
 msgstr "Rendszernapló"
 
-#: ../pidgin/gtkmain.c:372
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Próbálja a \"%s -h\" parancsot további információkért.\n"
 
-#: ../pidgin/gtkmain.c:374
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13212,44 +13062,44 @@
 "                      használandó fiókok vesszőkkel tagolt listáját)\n"
 "  -v, --version       az aktuális verzió megjelenítése és kilépés\n"
 
-#: ../pidgin/gtkmain.c:497
+#: ../pidgin/gtkmain.c:493
 #, 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"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\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"
+"%swiki/GetABacktrace\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"
+"%swiki/DeveloperPages\n"
 msgstr ""
 "A %s összeomlott és megpróbált kiírni egy magfájlt.\n"
 "Ez a szoftver és nem az Ön hibája miatt történt.\n"
 "\n"
 "Ha ismételten elő tudja állítani az összeomlást, akkor\n"
 "értesítse a Pidgin fejlesztőit a következő címen:\n"
-"%sbug.php\n"
+"%snewticket/\n"
 "\n"
 "Győződjön meg róla, hogy megadta, mit csinált az összeomlás előtt,\n"
 "és küldje be a visszakövetésből származó magfájlt. Ha nem tudja, hogyan\n"
 "szerezze be a visszakövetést, akkor olvassa el a következő címen található\n"
 "utasításokat:\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
-"Ha további segítségre van szüksége, akkor küldjön azonnali üzenetet (angolul)\n"
+"Ha további segítségre van szüksége, akkor küldjön azonnali üzenetet (AIM protokollon, angolul)\n"
 "SeanEgn-nak vagy LSchiere-nek. Sean és Luke kapcsolatinformációi más\n"
 "protokollokhoz elérhetők a következő oldalon:\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 
 #: ../pidgin/gtknotify.c:337
 msgid "Open All Messages"
@@ -13277,22 +13127,25 @@
 msgstr[0] "<b>%d új e-mailje érkezett.</b>"
 msgstr[1] "<b>%d új e-mailje érkezett.</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "A(z) \"%s\" böngészőparancs érvénytelen."
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953
+#: ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978
+#: ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "Az URL megnyitása sikertelen"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963
+#: ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Hiba \"%s\" indításakor: %s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "A \"Kézi\" böngészőparancsot választotta, de nem adott meg parancsot."
 
@@ -13440,12 +13293,8 @@
 msgstr "A hangulatjel-téma kicsomagolása meghiúsult."
 
 #: ../pidgin/gtkprefs.c:638
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új "
-"témák a témalistába dobással telepíthetők."
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "Válassza ki a használni kívánt hangulatjel-témát az alábbi listából. Új témák a témalistába dobással telepíthetők."
 
 #: ../pidgin/gtkprefs.c:673
 msgid "Icon"
@@ -13459,7 +13308,9 @@
 msgid "_Show system tray icon:"
 msgstr "_Rendszertálca-ikon megjelenítése:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819
+#: ../pidgin/gtkprefs.c:831
+#: ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13478,7 +13329,8 @@
 msgid "_Hide new IM conversations:"
 msgstr "Új társal_gások elrejtése:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830
+#: ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "Ha távol vagyok"
 
@@ -13560,12 +13412,8 @@
 msgstr "Alapértelmezett formázás"
 
 #: ../pidgin/gtkprefs.c:941
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, "
-"amelyek támogatják a formázást. :)"
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
+msgstr "Így fog kinézni a kimenő üzenet szövege, ha olyan protokollokat használ, amelyek támogatják a formázást. :)"
 
 #: ../pidgin/gtkprefs.c:1017
 msgid "ST_UN server:"
@@ -13704,6 +13552,12 @@
 msgid "Log all _status changes to system log"
 msgstr "Összes állapot_változás naplózása a rendszernaplóba"
 
+#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "(alapértelmezett)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "Hang kiválasztása"
@@ -13912,7 +13766,8 @@
 msgid "Set privacy for:"
 msgstr "Magánszféra beállításai ehhez:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:560
+#: ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "Felhasználó engedélyezése"
 
@@ -13922,11 +13777,10 @@
 
 #: ../pidgin/gtkprivacy.c:562
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy "
-"kapcsolatba lépjen Önnel."
-
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+msgstr "Adja meg egy felhasználó nevét, akinek meg szeretné engedni, hogy kapcsolatba lépjen Önnel."
+
+#: ../pidgin/gtkprivacy.c:565
+#: ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "_Engedélyezés"
 
@@ -13940,7 +13794,8 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Biztosan megengedi, hogy %s kapcsolatba lépjen Önnel?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "Felhasználó tiltása"
 
@@ -13980,9 +13835,10 @@
 
 #: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
-msgstr "Válasszon új nevet"
-
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+msgstr "Új név választása"
+
+#: ../pidgin/gtkrequest.c:1624
+#: ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "Válasszon mappát..."
 
@@ -14005,7 +13861,8 @@
 msgstr "Biztos, hogy törölni akarja a kijelölt mentett állapotokat?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580
+#: ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "_Használat"
 
@@ -14021,7 +13878,8 @@
 msgid "_Title:"
 msgstr "_Cím:"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1126
+#: ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "Áll_apot:"
 
@@ -14092,92 +13950,82 @@
 msgid "Waiting for network connection"
 msgstr "Várakozás a hálózati kapcsolatra"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1372
+#: ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "A következő hiba történt %s betöltése közben: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375
+#: ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "A kép betöltése meghiúsult"
 
-#: ../pidgin/gtkutils.c:1419
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "A(z) %s mappa nem küldhető el."
 
-#: ../pidgin/gtkutils.c:1420
-#, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"A %s nem képes átvinni egy mappát. Az általa tartalmazott fájlokat "
-"egyenként kell elküldenie."
-
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1472
+#, c-format
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
+msgstr "A(z) %s nem képes átvinni egy mappát. Az általa tartalmazott fájlokat egyenként kell elküldenie."
+
+#: ../pidgin/gtkutils.c:1504
+#: ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "Egy képet húzott be"
 
-#: ../pidgin/gtkutils.c:1453
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy "
-"használhatja ezen felhasználó partnerikonjaként."
-
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+#: ../pidgin/gtkutils.c:1505
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "Elküldheti ezt a képet fájlátvitelként, beágyazhatja az üzenetbe, vagy használhatja ezen felhasználó partnerikonjaként."
+
+#: ../pidgin/gtkutils.c:1511
+#: ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "Beállítás partnerikonként"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1512
+#: ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "Képfájl küldése"
 
-#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1513
+#: ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "Beszúrás az üzenetbe"
 
-#: ../pidgin/gtkutils.c:1465
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Be kívánja állítani partnerikonként ehhez a felhasználóhoz?"
 
-#: ../pidgin/gtkutils.c:1472
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"Elküldheti ezt a képet fájlátvitelként, vagy beágyazhatja az üzenetbe, vagy "
-"használhatja ezen felhasználó partnerikonjaként."
-
-#: ../pidgin/gtkutils.c:1474
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó "
-"partnerikonjaként."
+#: ../pidgin/gtkutils.c:1524
+msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
+msgstr "Elküldheti ezt a képet fájlátvitelként, vagy beágyazhatja az üzenetbe, vagy használhatja ezen felhasználó partnerikonjaként."
+
+#: ../pidgin/gtkutils.c:1526
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "Elküldheti ezt a képet fájlátvitelként, vagy használhatja ezen felhasználó partnerikonjaként."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "Az indítóikon nem küldhető el"
 
-#: ../pidgin/gtkutils.c:1532
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott "
-"objektumot akarta elküldeni az indítóikon helyett."
-
-#: ../pidgin/gtkutils.c:2302
+#: ../pidgin/gtkutils.c:1584
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott objektumot akarta elküldeni az indítóikon helyett."
+
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14188,32 +14036,31 @@
 "<b>Fájlméret:</b> %s\n"
 "<b>Képméret:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2592
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "A(z) \"%s\" fájl túl nagy a következőhöz: %s. Próbálkozzon kisebb képpel.\n"
 
-#: ../pidgin/gtkutils.c:2594
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Ikonhiba"
 
-#: ../pidgin/gtkutils.c:2595
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Az ikon beállítása meghiúsult"
 
-#: ../pidgin/gtkutils.c:2695
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nem sikerült megnyitni a(z) \"%s\" fájlt: %s"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"A(z) \"%s\" kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült "
-"a képfájl"
-
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+msgstr "A(z) \"%s\" kép betöltése sikertelen: az ok nem ismert, valószínűleg sérült a képfájl"
+
+#: ../pidgin/gtkwhiteboard.c:760
+#: ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "Fájl mentése"
 
@@ -14221,27 +14068,33 @@
 msgid "Select color"
 msgstr "Szín kiválasztása"
 
-#: ../pidgin/pidginstock.c:83
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "Ál_név"
 
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "_Lapok bezárása"
+
 #: ../pidgin/pidginstock.c:85
-msgid "Close _tabs"
-msgstr "_Lapok bezárása"
-
-#: ../pidgin/pidginstock.c:87
 msgid "_Get Info"
 msgstr "Információ le_kérése"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "Meg_hívás"
 
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Módosítás"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "_Levél megnyitása"
 
@@ -14249,7 +14102,8 @@
 msgid "Display Statistics"
 msgstr "Statisztikák megjelenítése"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:461
+#: ../pidgin/plugins/cap/cap.c:464
 msgid "Response Probability:"
 msgstr "Válasz valószínűsége:"
 
@@ -14262,8 +14116,10 @@
 msgid "Maximum response timeout:"
 msgstr "Legnagyobb válasz-időkorlát:"
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:816
+#: ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830
+#: ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "perc"
 
@@ -14295,12 +14151,8 @@
 
 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:937
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"A partnerelérhetőség bővítmény statisztikai információk megjelenítésére "
-"szolgál a felhasználó partnerlistáján található partnerekről."
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgstr "A partnerelérhetőség bővítmény statisztikai információk megjelenítésére szolgál a felhasználó partnerlistáján található partnerekről."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -14328,12 +14180,8 @@
 msgstr "Pontértékek használata, ha..."
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-"A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog "
-"rendelkezni a kapcsolatban.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr "A <i>legnagyobb pontszámmal</i> rendelkező partner prioritással fog rendelkezni a kapcsolatban.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -14349,33 +14197,28 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Kapcsolat prioritása"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid "Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek "
-"beállítását."
+msgstr "Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek beállítását."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó "
-"pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
+#: ../pidgin/plugins/contact_priority.c:192
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "Lehetővé teszi a partnerek inaktív/távol/kilépett állapotaihoz tartozó pontértékek megváltoztatását a kapcsolatok prioritásainak számításakor."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Társalgás színei"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25
+#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "A társalgási ablak színeinek testreszabása"
 
@@ -14399,7 +14242,8 @@
 msgid "Received Messages"
 msgstr "Fogadott üzenetek"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210
+#: ../pidgin/plugins/pidginrc.c:320
 #, c-format
 msgid "Select Color for %s"
 msgstr "Válassza ki %s színét"
@@ -14424,11 +14268,16 @@
 msgid "Conversation Placement"
 msgstr "Társalgás elhelyezése"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr "Megjegyzés: Az \"Új társalgások\" beállítást \"Társalgások száma szerint\" értékre kell állítani."
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Társalgások száma ablakonként"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Azonnali üzenő- és csevegőablakok elkülönítése szám szerinti elhelyezésnél"
 
@@ -14438,25 +14287,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:141
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Bővített elhelyezés"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:143
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Társalgások elhelyezésének beállításai."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:145
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Ablakonkénti társalgások számának korlátozása, opcionálisan az azonnali "
-"üzenetek és csevegés elkülönítése"
+#: ../pidgin/plugins/extplacement.c:150
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "Ablakonkénti társalgások számának korlátozása, opcionálisan az azonnali üzenetek és csevegés elkülönítése"
 
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
@@ -14533,12 +14378,8 @@
 
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:345
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek "
-"vagy hozzon létre egy újat."
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "Válassza ki címjegyzékéből azt a személyt, aki megfelel ennek a partnernek vagy hozzon létre egy újat."
 
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:433
@@ -14557,9 +14398,7 @@
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
-"Az evolution végrehajtható állomány nem található a PATH változóban megadott "
-"útvonalon."
+msgstr "Az evolution végrehajtható állomány nem található a PATH változóban megadott útvonalon."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "An e-mail address was not found for this buddy."
@@ -14581,9 +14420,7 @@
 #. Label
 #: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá "
-"kell rendelni."
+msgstr "Jelölje ki az összes fiókot, amelyekhez a partnereket automatikusan hozzá kell rendelni."
 
 #. *< type
 #. *< ui_requirement
@@ -14591,7 +14428,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Evolution integráció"
 
@@ -14599,8 +14436,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "Integrációt biztosít az Evolutionnel."
 
@@ -14670,7 +14507,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85
+#: ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Ikonállapotba helyezi a partnerlistát és a társalgásokat, amikor távol van."
 
@@ -14690,7 +14528,8 @@
 msgid "Markerline"
 msgstr "Jelölő vonal"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25
+#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Vonal húzása a társalgás új üzeneteinek jelzése érdekében."
 
@@ -14698,21 +14537,19 @@
 msgid "Draw Markerline in "
 msgstr "Jelölő vonal húzása a következőkben:"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250
+#: ../pidgin/plugins/notify.c:676
 msgid "_IM windows"
 msgstr "_IM ablakok"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254
+#: ../pidgin/plugins/notify.c:683
 msgid "C_hat windows"
 msgstr "_Csevegőablakok"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson "
-"az MM ikonra."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "Valaki egy zenei üzenetküldő munkamenetet kért. Az elfogadáshoz kattintson az MM ikonra."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
@@ -14761,12 +14598,8 @@
 
 #. *  summary
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több "
-"felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:672
@@ -14854,7 +14687,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:904
+#: ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Különböző lehetőségeket nyújt az olvasatlan üzenetekre figyelmeztetésre."
 
@@ -14900,38 +14734,30 @@
 msgid "Hyperlink Color"
 msgstr "Hiperhivatkozás színe"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView kiterjesztő mérete"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView vízszintes elválasztás"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Társalgás beviteli mező"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "Társalgások előzményei"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "Naplómegjelenítő"
 
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Kérdés párbeszédablak"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Figyelmeztetés párbeszédablak"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView behúzási kiterjesztők"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "Válasszon színt"
@@ -14953,36 +14779,57 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ szöveges gyorsbillentyű téma"
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "Felület színei"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Felöleti elemek méretei"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "Betűkészletek"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "Eszközök"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Beállítások kiírása ide: %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "A gtkrc fájlok újraolvasása"
 
-#: ../pidgin/plugins/pidginrc.c:622
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ témavezérlés"
 
-#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+#: ../pidgin/plugins/pidginrc.c:626
+#: ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Hozzáférést biztosít az általánosan használt gtkrc beállításokhoz."
 
@@ -14995,13 +14842,8 @@
 msgstr "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára."
 
 #: ../pidgin/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (Jabber, "
-"MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a "
-"hibakereső ablakot."
+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 "Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (XMPP, MSN, IRC, TOC). Nyomja meg az \"Enter\" billentyűt a küldéshez. Figyelje a hibakereső ablakot."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
@@ -15019,12 +14861,11 @@
 
 #: ../pidgin/plugins/relnot.c:82
 #, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
+msgid "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin.im</a>."
 msgstr "A(z) %s verzióhoz hozzájuthat a <br><a href=\"http://pidgin.im/\">http://pidgin.im</a> címről."
 
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+#: ../pidgin/plugins/relnot.c:86
+#: ../pidgin/plugins/relnot.c:87
 msgid "New Version Available"
 msgstr "Új verzió érhető el"
 
@@ -15047,12 +14888,8 @@
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:150
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának "
-"segítségével értesíti a felhasználót."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "Rendszeresen ellenőrzi az új verziók megjelenését és a változások naplójának segítségével értesíti a felhasználót."
 
 #: ../pidgin/plugins/spellchk.c:1965
 msgid "Duplicate Correction"
@@ -15097,9 +14934,7 @@
 #. Created here so it can be passed to whole_words_button_toggled.
 #: ../pidgin/plugins/spellchk.c:2314
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus "
-"kezeléséhez)"
+msgstr "Kis- és nagybetűk _pontos egyezése (ne jelölje be azok automatikus kezeléséhez)"
 
 #: ../pidgin/plugins/spellchk.c:2316
 msgid "Only replace _whole words"
@@ -15117,11 +14952,10 @@
 msgid "Text replacement"
 msgstr "Szöveg cseréje"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2375
+#: ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a "
-"kimenő üzenetekben."
+msgstr "A felhasználó által megadott szabályoknak megfelelően cseréli a szöveget a kimenő üzenetekben."
 
 #. *< type
 #. *< ui_requirement
@@ -15129,7 +14963,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:77
+#: ../pidgin/plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "Partnerfigyelő"
 
@@ -15137,7 +14972,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:358
+#: ../pidgin/plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Vízszintesen gördülő partnerlista."
 
@@ -15172,9 +15008,8 @@
 msgstr "Időpecsét formátumbeállításai"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "(hagyományos %s) 24 órás i_dőformátum kényszerítése"
+msgid "_Force 24-hour time format"
+msgstr "24 órás i_dőformátum kényszerítése"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15204,25 +15039,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:150
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Üzenet időpecsét-formátumok"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:153
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Az üzenet időpecsét-formátumok testreszabása."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:155
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és "
-"naplóüzenetek időpecsét-formátumainak testreszabását."
+#: ../pidgin/plugins/timestamp_format.c:156
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és naplóüzenetek időpecsét-formátumainak testreszabását."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
@@ -15285,13 +15116,11 @@
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a "
-"társalgás és a partnerlista ablakában.\n"
+"Ez a bővítmény lehetővé teszi változó alfa átlátszóság beállítását a társalgás és a partnerlista ablakában.\n"
 "\n"
 "* Megjegyzés: A bővítményhez Win2000 vagy újabb szükséges."
 
@@ -15328,8 +15157,8 @@
 msgstr "_Villogtassa az ablakot új csevegésüzenetek fogadásakor"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:375
-msgid "Pidgwin Options"
-msgstr "A Pidgwin beállításai"
+msgid "Windows Pidgin Options"
+msgstr "A windowsos Pidin beállításai"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
@@ -15337,9 +15166,7 @@
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"A windowsos Pidginre jellemző beállításokat biztosít, mint például a "
-"partnerlista dokkolása."
+msgstr "A windowsos Pidginre jellemző beállításokat biztosít, mint például a partnerlista dokkolása."
 
 #: ../pidgin/plugins/xmppconsole.c:665
 msgid "<font color='#777777'>Logged out.</font>"
@@ -15351,7 +15178,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:745
+#: ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP konzol"
@@ -15386,7 +15214,5 @@
 #. *  description
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-"Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
-"hasznos."
-
+msgstr "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez hasznos."
+
diff -r 6ec8bae7d98a -r cb5bd3c045a9 po/ru.po
--- a/po/ru.po	Wed May 23 23:13:11 2007 +0000
+++ b/po/ru.po	Wed May 23 23:17:50 2007 +0000
@@ -9,697 +9,22 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-04 14:02+0400\n"
-"PO-Revision-Date: 2007-04-04 14:30+0400\n"
+"POT-Creation-Date: 2007-05-07 11:26+0400\n"
+"PO-Revision-Date: 2007-05-11 15:00+0400\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@users.sf.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\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:1405
-#: ../libgaim/protocols/jabber/chat.c:679
-#: ../libgaim/protocols/jabber/chat.c:690
-#: ../libgaim/protocols/jabber/jabber.c:1215
-#: ../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:1767
-#: ../libgaim/protocols/jabber/buddy.c:1801
-#: ../libgaim/protocols/jabber/chat.c:788
-#: ../libgaim/protocols/jabber/jabber.c:864
-#: ../libgaim/protocols/jabber/jabber.c:1370
-#: ../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:6057
-#: ../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:795
-#: ../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
-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:820
-#: ../libgaim/protocols/jabber/buddy.c:1568
-#: ../libgaim/protocols/jabber/buddy.c:1750
-#: ../libgaim/protocols/jabber/jabber.c:805
-#: ../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:646
-#: ../libgaim/protocols/jabber/buddy.c:686 ../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 "_Имя"
-
-#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
-#: ../gtk/gtkdialogs.c:888
-msgid "_Account"
-msgstr "_Учётная запись"
-
-#: ../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:1369
-#: ../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:6056
-#: ../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 "OK"
-
-#. 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 "<AUTO-REPLY> "
-
-#. 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 ""
-
-#: ../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 "accounts: Вывести окно учётных записей."
-
-#: ../console/gntconv.c:728
-msgid "debugwin: Show the debug window."
-msgstr "debugwin: Вывести окно отладки."
-
-#: ../console/gntconv.c:731
-msgid "prefs: Show the preference window."
-msgstr "prefs: Вывести окно настроек."
-
-#: ../console/gntconv.c:734
-msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Вывести окно сохранённых статусов."
-
-#: ../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
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Наберите `%s -h' для получения дополнительной информации.\n"
 
-#: ../console/gntgaim.c:229
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -720,75 +45,901 @@
 "  -n, --nologin       не входить автоматически\n"
 "  -v, --version       показать текущую версию и выйти\n"
 
-#: ../console/gntnotify.c:146
+#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+
+#: ../finch/finch.c:306
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
+#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1401
+#: ../libpurple/protocols/jabber/chat.c:679
+#: ../libpurple/protocols/jabber/chat.c:690
+#: ../libpurple/protocols/jabber/jabber.c:1225
+#: ../libpurple/protocols/qq/group_join.c:326
+#: ../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:575
+msgid "New mail notifications"
+msgstr "Уведомления о новой почте"
+
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+msgid "Remember password"
+msgstr "Запомнить пароль"
+
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1441
+#: ../pidgin/gtkblist.c:3947
+msgid "Modify Account"
+msgstr "Изменить учётную запись"
+
+#: ../finch/gntaccount.c:474
+msgid "New Account"
+msgstr "Новая учётная запись"
+
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+msgid "Protocol:"
+msgstr "Протокол:"
+
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
+#: ../pidgin/gtkblist.c:5356
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Идентификатор пользователя:"
+
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5377
+#: ../pidgin/gtkblist.c:5740
+msgid "Alias:"
+msgstr "Псевдоним:"
+
+#. Cancel button
+#. Cancel
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
+#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2142 ../finch/gntplugin.c:336
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1763
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/jabber/chat.c:788
+#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:1380
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
+#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/oscar/oscar.c:6009
+#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5391
+#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
+#: ../libpurple/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:991
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1879
+#: ../pidgin/gtkaccount.c:2470 ../pidgin/gtkblist.c:5796
+#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
+#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+msgid "Cancel"
+msgstr "Отменить"
+
+#. Save button
+#. Save
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../pidgin/gtkrequest.c:276
+msgid "Save"
+msgstr "Сохранить"
+
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1871
+#: ../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:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1878 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2047 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2296 ../pidgin/gtkdocklet.c:541
+msgid "Accounts"
+msgstr "Учётные записи"
+
+#: ../finch/gntaccount.c:652
+msgid "You can enable/disable accounts from the following list."
+msgstr "Вы можете включать/выключать учётные записи из следующего списка."
+
+#. Add button
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2469
+#: ../pidgin/gtkblist.c:5795 ../pidgin/gtkconv.c:1633
+#: ../pidgin/gtkrequest.c:274
+msgid "Add"
+msgstr "Добавить"
+
+#. Modify button
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+msgid "Modify"
+msgstr "Изменить"
+
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2416
+#, 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:833 ../pidgin/gtkaccount.c:2468
+msgid "Add buddy to your list?"
+msgstr "Добавить собеседника в список?"
+
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2520
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s хочет добавить %s в свой список собеседников%s%s"
+
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2543 ../pidgin/gtkaccount.c:2549
+msgid "Authorize buddy?"
+msgstr "Авторизовать собеседника?"
+
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+msgid "Authorize"
+msgstr "Авторизовать"
+
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+msgid "Deny"
+msgstr "Отказать"
+
+#: ../finch/gntblist.c:278
+msgid "You must provide a screename for the buddy."
+msgstr ""
+
+#: ../finch/gntblist.c:280
+msgid "You must provide a group."
+msgstr ""
+
+#: ../finch/gntblist.c:282
+msgid "You must select an account."
+msgstr "Вы должны выбрать учётную запись."
+
+#: ../finch/gntblist.c:286
+msgid "Error adding buddy"
+msgstr "Ошибка добавления собеседника"
+
+#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1954 ../pidgin/gtksavedstatuses.c:924
+msgid "Screen Name"
+msgstr "Идентификатор пользователя"
+
+#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
+#: ../finch/gntblist.c:1196 ../libpurple/protocols/msn/msn.c:1360
+#: ../libpurple/protocols/silc/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkrequest.c:277
+msgid "Alias"
+msgstr "Псевдоним"
+
+#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+msgid "Group"
+msgstr "Группа"
+
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1246
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2948 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+msgid "Account"
+msgstr "Учётная запись"
+
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5310
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+msgid "Add Buddy"
+msgstr "Добавить собеседника"
+
+#: ../finch/gntblist.c:327
+msgid "Please enter buddy information."
+msgstr "Введите информацию о собеседнике."
+
+#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+msgid "Chats"
+msgstr "Чаты"
+
+#. Extract their Name and put it in
+#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
+#: ../libpurple/protocols/msn/msn.c:1533 ../libpurple/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+msgid "Name"
+msgstr "Имя"
+
+#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5686
+msgid "Add Chat"
+msgstr "Добавить чат"
+
+#: ../finch/gntblist.c:398
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+msgid "Error adding group"
+msgstr "Ошибка добавления группы"
+
+#: ../finch/gntblist.c:412
+msgid "You must give a name for the group to add."
+msgstr "Вы должны дать имя добавляемой группе."
+
+#: ../finch/gntblist.c:425
+msgid "A group with the name already exists."
+msgstr "Группа с таким именем уже существует."
+
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
+#: ../libpurple/protocols/sametime/sametime.c:5390
+#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5792
+msgid "Add Group"
+msgstr "Добавить группу"
+
+#: ../finch/gntblist.c:432
+msgid "Enter the name of the group"
+msgstr "Введите имя группы"
+
+#: ../finch/gntblist.c:761
+msgid "Edit Chat"
+msgstr "Изменить чат"
+
+#: ../finch/gntblist.c:761
+msgid "Please Update the necessary fields."
+msgstr "Обновите нужные поля."
+
+#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+msgid "Edit"
+msgstr "Изменить"
+
+#: ../finch/gntblist.c:778
+msgid "Auto-join"
+msgstr "Присоединяться автоматически"
+
+#: ../finch/gntblist.c:787
+msgid "Edit Settings"
+msgstr "Изменить настройки"
+
+#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+msgid "Get Info"
+msgstr "Получить информацию"
+
+#: ../finch/gntblist.c:855
+msgid "Add Buddy Pounce"
+msgstr "Добавить правило"
+
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:636
+#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+msgid "Send File"
+msgstr "Отправить файл"
+
+#: ../finch/gntblist.c:866
+msgid "View Log"
+msgstr "Просмотреть журнал"
+
+#: ../finch/gntblist.c:947
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Введите новое имя для %s"
+
+#: ../finch/gntblist.c:949 ../finch/gntblist.c:1196
+msgid "Rename"
+msgstr "Переименовать"
+
+#: ../finch/gntblist.c:950
+msgid "Enter empty string to reset the name."
+msgstr "Введите пустую строку для сброса имени."
+
+#: ../finch/gntblist.c:1026
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+"Удаление этого контакта приведёт к удалению всех входящих в него собеседников"
+
+#: ../finch/gntblist.c:1034
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+"Удаление этой группы приведёт к удалению всех входящих в неё собеседников"
+
+#: ../finch/gntblist.c:1039
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Вы действительно хотите удалить %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../finch/gntblist.c:1042
+msgid "Confirm Remove"
+msgstr "Подтвердить удаление"
+
+#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1198 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+msgid "Remove"
+msgstr "Удалить"
+
+#. Buddy List
+#: ../finch/gntblist.c:1172 ../finch/gntblist.c:2219 ../finch/gntprefs.c:239
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4189
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+msgid "Buddy List"
+msgstr "Список собеседников"
+
+#: ../finch/gntblist.c:1203
+msgid "Place tagged"
+msgstr "Место помечено"
+
+#: ../finch/gntblist.c:1208
+msgid "Toggle Tag"
+msgstr "Обратить пометку"
+
+#. General
+#: ../finch/gntblist.c:1241 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1564
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/jabber/jabber.c:815
+#: ../libpurple/protocols/msn/msn.c:1368 ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1036
+#: ../libpurple/protocols/silc/ops.c:1179
+#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2972
+msgid "Nickname"
+msgstr "Псевдоним"
+
+#. Idle stuff
+#: ../finch/gntblist.c:1261 ../finch/gntprefs.c:242
+#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:533 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2902
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2992
+#: ../pidgin/gtkblist.c:3381 ../pidgin/gtkprefs.c:1809
+msgid "Idle"
+msgstr "Бездействие"
+
+#: ../finch/gntblist.c:1350
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"В сети: %d\n"
+"Всего: %d"
+
+#: ../finch/gntblist.c:1359
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Учётная запись: %s (%s)"
+
+#: ../finch/gntblist.c:1371
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Последнее появление: %s назад"
+
+#: ../finch/gntblist.c:1636 ../pidgin/gtkdocklet.c:489
+#: ../pidgin/gtkstatusbox.c:1064
+msgid "New..."
+msgstr "Новый..."
+
+#: ../finch/gntblist.c:1643 ../pidgin/gtkdocklet.c:490
+#: ../pidgin/gtkstatusbox.c:1065
+msgid "Saved..."
+msgstr "Сохранённый..."
+
+#: ../finch/gntblist.c:2015 ../finch/gntplugin.c:224 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
+msgid "Plugins"
+msgstr "Модули"
+
+#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:703
+#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+msgid "_Name"
+msgstr "_Имя"
+
+#: ../finch/gntblist.c:2128 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+msgid "_Account"
+msgstr "_Учётная запись"
+
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:716
+msgid "New Instant Message"
+msgstr "Новое мгновенное сообщение"
+
+#: ../finch/gntblist.c:2138 ../pidgin/gtkdialogs.c:718
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Введите идентификатор пользователя или псевдоним персоны, которой вы хотели "
+"бы отправить сообщение."
+
+#: ../finch/gntblist.c:2141 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1379
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
+#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/yahoo/yahoo.c:990
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3946
+#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+msgid "OK"
+msgstr "OK"
+
+#. Create the "Options" frame.
+#: ../finch/gntblist.c:2161 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+msgid "Options"
+msgstr "Параметры"
+
+#: ../finch/gntblist.c:2167
+msgid "Send IM..."
+msgstr "Отправить мгновенное сообщение..."
+
+#: ../finch/gntblist.c:2171
+msgid "Toggle offline buddies"
+msgstr "Обратить показывание собеседников не в сети"
+
+#: ../finch/gntblist.c:2177
+msgid "Sort by status"
+msgstr "Сортировать по статусу"
+
+#: ../finch/gntblist.c:2181
+msgid "Sort alphabetically"
+msgstr "Сортировать по алфавиту"
+
+#: ../finch/gntblist.c:2185
+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:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3943
+msgid "Connection Error"
+msgstr "Ошибка соединения"
+
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3948
+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:217
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../finch/gntconv.c:240
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s набирает сообщение..."
+
+#: ../finch/gntconv.c:390
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-REPLY> "
+
+#. Print the list of users in the room
+#: ../finch/gntconv.c:492
+msgid "List of users:\n"
+msgstr "Список пользователей:\n"
+
+#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+msgid "Supported debug options are:  version"
+msgstr "Поддерживаемые параметры отладки:  version"
+
+#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+msgid "No such command (in this context)."
+msgstr "Нет такой команды (в этом контексте)."
+
+#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Используйте \"/help &lt;команда&gt;\" для помощи по конкретной команде.\n"
+"Следующие команды доступны в этом контексте:\n"
+
+#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+
+#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+"me &lt;действие&gt;:  Отправить действие в стиле IRC собеседнику или в чат."
+
+#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;параметр&gt;:  Отправить различную отладочную информацию в текущую "
+"беседу."
+
+#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Очистить окно беседы."
+
+#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;команда&gt;:  Получить помощь по конкретной команде."
+
+#: ../finch/gntconv.c:710
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Вывести окно модулей."
+
+#: ../finch/gntconv.c:713
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Вывести список собеседников."
+
+#: ../finch/gntconv.c:716
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Вывести окно учётных записей."
+
+#: ../finch/gntconv.c:719
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Вывести окно отладки."
+
+#: ../finch/gntconv.c:722
+msgid "prefs: Show the preference window."
+msgstr "prefs: Вывести окно настроек."
+
+#: ../finch/gntconv.c:725
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Вывести окно сохранённых статусов."
+
+#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+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:232 ../pidgin/gtkdebug.c:769
+msgid "Clear"
+msgstr "Очистить"
+
+#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+msgid "Pause"
+msgstr "Пауза"
+
+#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
+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:537 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1210
+#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3036
+#: ../pidgin/gtkblist.c:3049 ../pidgin/gtkblist.c:3051
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+msgid "Status"
+msgstr "Статус"
+
+#: ../finch/gntft.c:207
+msgid "Close this window when all transfers finish"
+msgstr "Закрывать это окно по завершении всех передач"
+
+#: ../finch/gntft.c:214
+msgid "Clear finished transfers"
+msgstr "Очищать завершённые передачи"
+
+#: ../finch/gntft.c:228
+msgid "Stop"
+msgstr "Остановить"
+
+#. Close button
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2443 ../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/s"
+
+#: ../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 "Адреса e-mail"
 
-#: ../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:1160
+#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From"
 msgstr "От"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
+#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Тема"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
-#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
-#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
-#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
-msgid "Close"
-msgstr "Закрыть"
-
-#: ../console/gntnotify.c:182
+#: ../finch/gntnotify.c:182
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) имеет %d новое сообщение."
-msgstr[1] "%s (%s) имеет %d новых сообщений."
-
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
+msgstr[1] "%s (%s) имеет %d новых сообщения."
+msgstr[2] "%s (%s) имеет %d новых сообщений."
+
+#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Новая почта"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
+#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
 #, c-format
 msgid "Info for %s"
 msgstr "Информация для %s"
 
-#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
-#: ../libgaim/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:868
 msgid "Buddy Information"
 msgstr "Информация о собеседнике"
 
-#: ../console/gntnotify.c:306
+#: ../finch/gntnotify.c:306
 msgid "Continue"
 msgstr "Продолжить"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
 msgid "Info"
 msgstr "Информация"
 
-#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
 msgid "IM"
 msgstr "Мгновенное сообщение"
 
-#: ../console/gntnotify.c:318
+#: ../finch/gntnotify.c:318
 msgid "Join"
 msgstr "Присоединиться"
 
-#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
+#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Пригласить"
 
-#: ../console/gntnotify.c:324
+#: ../finch/gntnotify.c:324
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../console/gntplugin.c:102
+#: ../finch/gntplugin.c:111
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -805,291 +956,458 @@
 "Веб-сайт: %s\n"
 "Имя файла: %s\n"
 
-#: ../console/gntplugin.c:155
+#: ../finch/gntplugin.c:164
 msgid "Plugin need to be loaded before you can configure it."
 msgstr ""
 
-#: ../console/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../console/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr ""
-
-#: ../console/gntplugin.c:200
+#: ../finch/gntplugin.c:208
 msgid "No configuration options for this plugin."
 msgstr ""
 
-#: ../console/gntplugin.c:221
+#: ../finch/gntplugin.c:229
 msgid "You can (un)load plugins from the following list."
-msgstr ""
-
-#: ../console/gntplugin.c:264
+msgstr "Вы можете загружать/выгружать модули из следующего списка."
+
+#: ../finch/gntplugin.c:272
 msgid "Configure Plugin"
 msgstr "Настроить модуль"
 
-#: ../console/gntprefs.c:122
+#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "Настройки"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+msgid "Please enter a buddy to pounce."
+msgstr "Введите собеседника для слежения."
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "New Buddy Pounce"
+msgstr "Новое правило"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "Edit Buddy Pounce"
+msgstr "Изменить правило"
+
+#: ../finch/gntpounce.c:330
+msgid "Pounce Who"
+msgstr "За кем следить"
+
+#. Account:
+#. Set up stuff for the account box
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5404
+#: ../pidgin/gtkblist.c:5720
+msgid "Account:"
+msgstr "Учётная запись:"
+
+#: ../finch/gntpounce.c:355
+msgid "Buddy name:"
+msgstr "Имя собеседника:"
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+msgid "Pounce When Buddy..."
+msgstr "Выполнять, когда собеседник..."
+
+#: ../finch/gntpounce.c:373
+msgid "Signs on"
+msgstr "Входит"
+
+#: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "Выходит"
+
+#: ../finch/gntpounce.c:375
+msgid "Goes away"
+msgstr "Отходит"
+
+#: ../finch/gntpounce.c:376
+msgid "Returns from away"
+msgstr "Возвращается"
+
+#: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "Начинает бездействовать"
+
+#: ../finch/gntpounce.c:378
+msgid "Is no longer idle"
+msgstr "Перестаёт бездействовать"
+
+#: ../finch/gntpounce.c:379
+msgid "Starts typing"
+msgstr "Начинает набор сообщения"
+
+#: ../finch/gntpounce.c:380
+msgid "Pauses while typing"
+msgstr "Приостанавливает набор сообщения"
+
+#: ../finch/gntpounce.c:381
+msgid "Stops typing"
+msgstr "Прекращает набор сообщения"
+
+#: ../finch/gntpounce.c:382
+msgid "Sends a message"
+msgstr "Отправляет сообщение"
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+msgid "Action"
+msgstr "Действие"
+
+#: ../finch/gntpounce.c:413
+msgid "Open an IM window"
+msgstr "Открыть окно мгновенных сообщений"
+
+#: ../finch/gntpounce.c:414
+msgid "Pop up a notification"
+msgstr "Вывести уведомление"
+
+#: ../finch/gntpounce.c:415
+msgid "Send a message"
+msgstr "Отправить сообщение"
+
+#: ../finch/gntpounce.c:416
+msgid "Execute a command"
+msgstr "Выполнить команду"
+
+#: ../finch/gntpounce.c:417
+msgid "Play a sound"
+msgstr "Воспроизвести звук"
+
+#: ../finch/gntpounce.c:445
+msgid "Pounce only when my status is not available"
+msgstr "Выполнять только при статусе, отличном от \"Доступен\""
+
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+msgid "Recurring"
+msgstr "Повторение"
+
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Вы действительно хотите удалить правило %s для %s?"
+
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+msgid "Buddy Pounces"
+msgstr "Правила"
+
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s начал набор сообщения для вас (%s)"
+
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s приостановил набор сообщения для вас (%s)"
+
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s в сети (%s)"
+
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s перестал бездействовать (%s)"
+
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s вернулся (%s)"
+
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s прекратил набор сообщения для вас (%s)"
+
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s не в сети (%s)"
+
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s начал бездействовать (%s)"
+
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s отошёл (%s)"
+
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s отправил вам сообщение (%s)"
+
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+msgid "Unknown pounce event. Please report this!"
+msgstr "Неизвестное событие слежения. Сообщите об этом!"
+
+#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+msgid "From last sent message"
+msgstr "С момента последней отправки сообщения"
+
+#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+msgid "Never"
+msgstr "Никогда"
+
+#: ../finch/gntprefs.c:170
 msgid "Show Idle Time"
 msgstr "Показывать время бездействия"
 
-#: ../console/gntprefs.c:123
+#: ../finch/gntprefs.c:171
 msgid "Show Offline Buddies"
 msgstr "Показывать собеседников не в сети"
 
-#: ../console/gntprefs.c:129
+#: ../finch/gntprefs.c:177
 msgid "Show Timestamps"
 msgstr "Показывать время сообщений"
 
-#: ../console/gntprefs.c:130
+#: ../finch/gntprefs.c:178
 msgid "Notify buddies when you are typing"
 msgstr "Уведомлять собеседников о наборе сообщения"
 
-#: ../console/gntprefs.c:136
+#: ../finch/gntprefs.c:184
 msgid "Log format"
 msgstr "Формат журнала"
 
-#: ../console/gntprefs.c:137
+#: ../finch/gntprefs.c:185
 msgid "Log IMs"
 msgstr "Записывать мгновенные сообщения"
 
-#: ../console/gntprefs.c:138
+#: ../finch/gntprefs.c:186
 msgid "Log chats"
 msgstr "Записывать чаты"
 
-#: ../console/gntprefs.c:139
+#: ../finch/gntprefs.c:187
 msgid "Log status change events"
 msgstr "Записывать изменения статуса"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
-#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Беседы"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "Журналы"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
-#: ../gtk/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Настройки"
-
-#: ../console/gntrequest.c:495
+#: ../finch/gntrequest.c:530
 msgid "Not implemented yet."
 msgstr "Ещё не реализовано."
 
-#: ../console/gntstatus.c:135
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
+msgid "Save File..."
+msgstr "Сохранить файл..."
+
+#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
+msgid "Open File..."
+msgstr "Открыть файл..."
+
+#: ../finch/gntstatus.c:135
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Вы действительно хотите удалить \"%s\""
 
-#: ../console/gntstatus.c:138
+#: ../finch/gntstatus.c:138
 msgid "Delete Status"
 msgstr "Удалить статус"
 
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "Сохранённые статусы"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
-#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:937
-#: ../libgaim/protocols/novell/novell.c:1484
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "Название"
 
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "Тип"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
-#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
-#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
-#: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
-#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
-#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
-#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1232
-#: ../libgaim/protocols/jabber/jabber.c:1242
-#: ../libgaim/protocols/jabber/jabber.c:1252
-#: ../libgaim/protocols/jabber/jabber.c:1262
-#: ../libgaim/protocols/jabber/jabber.c:1272
-#: ../libgaim/protocols/jabber/jabber.c:1284
-#: ../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:5515
-#: ../libgaim/protocols/oscar/oscar.c:5743
-#: ../libgaim/protocols/oscar/oscar.c:5755
-#: ../libgaim/protocols/oscar/oscar.c:5768
-#: ../libgaim/protocols/oscar/oscar.c:5775
-#: ../libgaim/protocols/oscar/oscar.c:5782
-#: ../libgaim/protocols/sametime/sametime.c:3308
-#: ../libgaim/protocols/sametime/sametime.c:3314
-#: ../libgaim/protocols/sametime/sametime.c:3320
-#: ../libgaim/protocols/sametime/sametime.c:3399
-#: ../libgaim/protocols/silc/buddy.c:1544
-#: ../libgaim/protocols/simple/simple.c:246
-#: ../libgaim/protocols/yahoo/yahoo.c:3450
-#: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/zephyr/zephyr.c:2337
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:258
+#: ../libpurple/protocols/bonjour/bonjour.c:265
+#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1242
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1294
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5469
+#: ../libpurple/protocols/oscar/oscar.c:5687
+#: ../libpurple/protocols/oscar/oscar.c:5701
+#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5731
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
+#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Сообщение"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "Применить"
 
-#: ../console/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "Неверное название"
 
-#: ../console/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr ""
 
-#: ../console/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "Повторяющееся название"
 
-#: ../console/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "Введите другое название для статуса."
 
-#: ../console/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "Подстатус"
 
-#. Set up stuff for the account box
-#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
-msgid "Account:"
-msgstr "Учётная запись:"
-
-#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../console/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "Сообщение:"
 
-#: ../console/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "Изменить статус"
 
-#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
-#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
-#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
-#: ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:676
-#: ../libgaim/protocols/jabber/jabber.c:1200
-#: ../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/oscar/oscar.c:3769
-#: ../libgaim/protocols/sametime/sametime.c:3285
-#: ../libgaim/protocols/sametime/sametime.c:4170
-#: ../libgaim/protocols/yahoo/yahoo.c:3027
-msgid "Status"
-msgstr "Статус"
-
-#: ../console/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "Использовать отличающийся статус для следующих учётных записей"
 
 #. Save & Use
-#: ../console/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "Сохранить и применить"
 
-#: ../console/gntui.c:75
+#: ../finch/gntui.c:83
 msgid "Statuses"
 msgstr "Статусы"
 
-#: ../console/plugins/gntgf.c:209
+#: ../finch/plugins/gntclipboard.c:149
+msgid "GntClipboard"
+msgstr ""
+
+#: ../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:223
 #, c-format
 msgid "%s just signed on"
 msgstr "%s в сети"
 
-#: ../console/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:230
 #, c-format
 msgid "%s just signed off"
 msgstr "%s не в сети"
 
-#: ../console/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s отправил вам сообщение"
 
-#: ../console/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:257
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s произнёс ваше имя в %s"
 
-#: ../console/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:259
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s отправил сообщение в %s"
 
-#: ../console/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:297
 msgid "Buddy signs on/off"
 msgstr "Собеседник входит/выходит"
 
-#: ../console/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:298
 msgid "You receive an IM"
 msgstr "Вы принимаете мгновенное сообщение"
 
-#: ../console/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:299
 msgid "Someone speaks in a chat"
 msgstr "Кто-то говорит в чате"
 
-#: ../console/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:300
 msgid "Someone says your name in a chat"
 msgstr "Кто-то произносит ваше имя в чате"
 
-#: ../console/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:328
 msgid "Notify with a toaster when"
 msgstr ""
 
-#: ../console/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:343
 msgid "Beep too!"
 msgstr ""
 
-#: ../console/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:349
 msgid "Set URGENT for the terminal window."
 msgstr ""
 
-#: ../console/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:369
 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:371 ../finch/plugins/gntgf.c:372
+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"
@@ -1097,4618 +1415,267 @@
 "the same conversation type(s)."
 msgstr ""
 
-#: ../console/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "Gnt-история"
 
-#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Показывает записи недавних бесед в новых беседах."
 
-#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
 
-#: ../console/plugins/lastlog.c:69
+#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr ""
 
-#: ../console/plugins/lastlog.c:99
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../console/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr ""
 
-#: ../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 "_Псевдоним"
-
-#. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
-#: ../gtk/gtkroomlist.c:463
-msgid "_Join"
-msgstr "П_рисоединиться"
-
-#: ../gtk/gaimstock.c:139
-msgid "Close _tabs"
-msgstr "_Закрыть вкладки"
-
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
-msgid "I_M"
-msgstr "Сооб_щение"
-
-#: ../gtk/gaimstock.c:141
-msgid "_Get Info"
-msgstr "Получить _информацию"
-
-#: ../gtk/gaimstock.c:142
-msgid "_Invite"
-msgstr "П_ригласить"
-
-#: ../gtk/gaimstock.c:143
-msgid "_Modify"
-msgstr "_Изменить"
-
-#: ../gtk/gaimstock.c:144
-msgid "_Open Mail"
-msgstr "Открыть _почту"
-
-#. Pause button
-#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
-msgid "_Pause"
-msgstr "_Пауза"
-
-#. 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 "_Тип прокси:"
-
-#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
-msgid "_Host:"
-msgstr "_Узел:"
-
-#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
-msgid "_Port:"
-msgstr "П_орт:"
-
-#: ../gtk/gtkaccount.c:1010
-msgid "_Username:"
-msgstr "_Имя пользователя:"
-
-#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
-msgid "Pa_ssword:"
-msgstr "Па_роль:"
-
-#: ../gtk/gtkaccount.c:1428
-msgid "Add Account"
-msgstr "Добавить учётную запись"
-
-#: ../gtk/gtkaccount.c:1452
-msgid "_Basic"
-msgstr "_Основные"
-
-#: ../gtk/gtkaccount.c:1463
-msgid "_Advanced"
-msgstr "_Дополнительные"
-
-#. Register button
-#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:863
-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 ""
-
-#: ../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 "У_чётная запись:"
-
-#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "_Блокировать"
-
-#: ../gtk/gtkblist.c:1015
-msgid "Un_block"
-msgstr "Раз_блокировать"
-
-#: ../gtk/gtkblist.c:1066
-msgid "Get _Info"
-msgstr "_Информация"
-
-#: ../gtk/gtkblist.c:1075
-msgid "_Send File"
-msgstr "Отправить _файл"
-
-#: ../gtk/gtkblist.c:1082
-msgid "Add Buddy _Pounce"
-msgstr "Добавить п_равило"
-
-#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
-#: ../gtk/gtkblist.c:1213
-msgid "View _Log"
-msgstr "Просмотреть _журнал"
-
-#: ../gtk/gtkblist.c:1103
-msgid "Alias..."
-msgstr "Псевдоним..."
-
-#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
-msgid "_Alias..."
-msgstr "_Псевдоним..."
-
-#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
-msgid "_Remove"
-msgstr "_Удалить"
-
-#: ../gtk/gtkblist.c:1161
-msgid "Add a _Buddy"
-msgstr "Добавить _собеседника"
-
-#: ../gtk/gtkblist.c:1163
-msgid "Add a C_hat"
-msgstr "Добавить _чат"
-
-#: ../gtk/gtkblist.c:1166
-msgid "_Delete Group"
-msgstr "_Удалить группу"
-
-#: ../gtk/gtkblist.c:1168
-msgid "_Rename"
-msgstr "Пере_именовать"
-
-#: ../gtk/gtkblist.c:1188
-msgid "Auto-Join"
-msgstr "Присоединяться автоматически"
-
-#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
-msgid "_Collapse"
-msgstr "_Свернуть"
-
-#: ../gtk/gtkblist.c:1254
-msgid "_Expand"
-msgstr "Р_азвернуть"
-
-#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
-#: ../gtk/gtkblist.c:4384
-msgid "/Tools/Mute Sounds"
-msgstr "/Инструменты/Отключить звуки"
-
-#: ../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 "/_Собеседники"
-
-#: ../gtk/gtkblist.c:2568
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Собеседники/Новое мгновенное сооб_щение..."
-
-#: ../gtk/gtkblist.c:2569
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Собеседники/Присоединиться к _чату..."
-
-#: ../gtk/gtkblist.c:2570
-msgid "/Buddies/Get User _Info..."
-msgstr "/Собеседники/Получить пользовательскую _информацию..."
-
-#: ../gtk/gtkblist.c:2571
-msgid "/Buddies/View User _Log..."
-msgstr "/Собеседники/Просмотреть _журнал пользователя..."
-
-#: ../gtk/gtkblist.c:2573
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Собеседники/Показывать собеседников _не в сети"
-
-#: ../gtk/gtkblist.c:2574
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Собеседники/Показывать п_устые группы"
-
-#: ../gtk/gtkblist.c:2575
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Собеседники/Показывать _подробности о собеседнике"
-
-#: ../gtk/gtkblist.c:2576
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Собеседники/Показывать _время бездействия"
-
-#: ../gtk/gtkblist.c:2577
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Собеседники/_Сортировать собеседников"
-
-#: ../gtk/gtkblist.c:2579
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Собеседники/_Добавить собеседника..."
-
-#: ../gtk/gtkblist.c:2580
-msgid "/Buddies/Add C_hat..."
-msgstr "/Собеседники/Добавить ч_ат..."
-
-#: ../gtk/gtkblist.c:2581
-msgid "/Buddies/Add _Group..."
-msgstr "/Собеседники/Добавить _группу..."
-
-#: ../gtk/gtkblist.c:2583
-msgid "/Buddies/_Quit"
-msgstr "/Собеседники/В_ыйти"
-
-#. Accounts menu
-#: ../gtk/gtkblist.c:2586
-msgid "/_Accounts"
-msgstr "/_Учётные записи"
-
-#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6280
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Учётные записи/Добавить\\/Изменить"
-
-#. Tools
-#: ../gtk/gtkblist.c:2590
-msgid "/_Tools"
-msgstr "/_Инструменты"
-
-#: ../gtk/gtkblist.c:2591
-msgid "/Tools/Buddy _Pounces"
-msgstr "/Инструменты/_Слежение за собеседниками"
-
-#: ../gtk/gtkblist.c:2592
-msgid "/Tools/Plu_gins"
-msgstr "/Инструменты/_Модули"
-
-#: ../gtk/gtkblist.c:2593
-msgid "/Tools/Pr_eferences"
-msgstr "/Инструменты/_Настройки"
-
-#: ../gtk/gtkblist.c:2594
-msgid "/Tools/Pr_ivacy"
-msgstr "/Инструменты/К_онфиденциальность"
-
-#: ../gtk/gtkblist.c:2596
-msgid "/Tools/_File Transfers"
-msgstr "/Инструменты/Передача _файлов"
-
-#: ../gtk/gtkblist.c:2597
-msgid "/Tools/R_oom List"
-msgstr "/Инструменты/Список _комнат"
-
-#: ../gtk/gtkblist.c:2598
-msgid "/Tools/System _Log"
-msgstr "/Инструменты/Системный _журнал"
-
-#: ../gtk/gtkblist.c:2600
-msgid "/Tools/Mute _Sounds"
-msgstr "/Инструменты/Отключить _звуки"
-
-#. Help
-#: ../gtk/gtkblist.c:2603
-msgid "/_Help"
-msgstr "/_Помощь"
-
-#: ../gtk/gtkblist.c:2604
-msgid "/Help/Online _Help"
-msgstr "/Помощь/Помощь в _сети"
-
-#: ../gtk/gtkblist.c:2605
-msgid "/Help/_Debug Window"
-msgstr "/Помощь/Окно _отладки"
-
-#: ../gtk/gtkblist.c:2606
-msgid "/Help/_About"
-msgstr "/Помощь/О _программе"
-
-#: ../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:1407
-#: ../libgaim/protocols/novell/novell.c:2863
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:5565 ../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:943
-#: ../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 "/Собеседники/Новое мгновенное сообщение..."
-
-#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
-msgid "/Buddies/Join a Chat..."
-msgstr "/Собеседники/Присоединиться к чату..."
-
-#: ../gtk/gtkblist.c:3437
-msgid "/Buddies/Get User Info..."
-msgstr "/Собеседники/Получить пользовательскую информацию..."
-
-#: ../gtk/gtkblist.c:3438
-msgid "/Buddies/Add Buddy..."
-msgstr "/Собеседники/Добавить собеседника..."
-
-#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
-msgid "/Buddies/Add Chat..."
-msgstr "/Собеседники/Добавить чат..."
-
-#: ../gtk/gtkblist.c:3440
-msgid "/Buddies/Add Group..."
-msgstr "/Собеседники/Добавить группу..."
-
-#: ../gtk/gtkblist.c:3475
-msgid "/Tools/Buddy Pounces"
-msgstr "/Инструменты/Слежение за собеседниками"
-
-#: ../gtk/gtkblist.c:3478
-msgid "/Tools/Privacy"
-msgstr "/Инструменты/Конфиденциальность"
-
-#: ../gtk/gtkblist.c:3481
-msgid "/Tools/Room List"
-msgstr "/Инструменты/Список комнат"
-
-#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d непрочитанное сообщение от %s\n"
-msgstr[1] "%d непрочитанных сообщений от %s\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 ""
-
-#: ../gtk/gtkblist.c:4127
-msgid "/Accounts"
-msgstr "/Учётные записи"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../gtk/gtkblist.c:4141
-msgid ""
-"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
-msgstr ""
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../gtk/gtkblist.c:4368
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Собеседники/Показывать собеседников не в сети"
-
-#: ../gtk/gtkblist.c:4371
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Собеседники/Показывать пустые группы"
-
-#: ../gtk/gtkblist.c:4377
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Собеседники/Показывать подробности о собеседнике"
-
-#: ../gtk/gtkblist.c:4380
-msgid "/Buddies/Show Idle Times"
-msgstr "/Собеседники/Показывать время бездействия"
-
-#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97
-#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
-#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
-#: ../libgaim/protocols/jabber/roster.c:68
-msgid "Buddies"
-msgstr "Собеседники"
-
-#: ../gtk/gtkblist.c:5207
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Введите идентификатор пользователя персоны, которую вы хотели бы добавить в "
-"список собеседников. Вы можете ввести необязательный псевдоним для этого "
-"собеседника. Псевдоним будет показываться вместо идентификатора "
-"пользователя, когда это возможно.\n"
-
-#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
-#: ../gtk/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Группа:"
-
-#: ../gtk/gtkblist.c:5526
-msgid "This protocol does not support chat rooms."
-msgstr "Этот протокол не поддерживает чаты."
-
-#: ../gtk/gtkblist.c:5542
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "Вы не подключены по протоколам, имеющим поддержку чатов."
-
-#: ../gtk/gtkblist.c:5583
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Введите псевдоним и соответствующую информацию о чате, который вы хотели бы "
-"добавить в список собеседников.\n"
-
-#: ../gtk/gtkblist.c:5666
-msgid "Please enter the name of the group to be added."
-msgstr "Введите имя добавляемой группы."
-
-#: ../gtk/gtkblist.c:6301
-msgid "<GaimMain>/Accounts/"
-msgstr ""
-
-#: ../gtk/gtkblist.c:6326
-msgid "_Edit Account"
-msgstr "_Изменить учётную запись"
-
-#: ../gtk/gtkblist.c:6342 ../gtk/gtkconv.c:2858
-msgid "No actions available"
-msgstr "Нет доступных действий"
-
-#: ../gtk/gtkblist.c:6350
-msgid "_Disable"
-msgstr "_Выключить"
-
-#: ../gtk/gtkblist.c:6362
-msgid "Enable Account"
-msgstr "Включить учётную запись"
-
-#: ../gtk/gtkblist.c:6368
-msgid "<GaimMain>/Accounts/Enable Account"
-msgstr ""
-
-#: ../gtk/gtkblist.c:6417
-msgid "/Tools"
-msgstr "/Инструменты"
-
-#: ../gtk/gtkblist.c:6487
-msgid "/Buddies/Sort Buddies"
-msgstr "/Собеседники/Сортировать собеседников"
-
-#: ../gtk/gtkconn.c:179
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-
-#: ../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 "_Собеседник:"
-
-#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141
-#: ../gtk/gtksavedstatuses.c:1477
-msgid "_Message:"
-msgstr "Сооб_щение:"
-
-#: ../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 "_Искать:"
-
-#: ../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 "/_Беседа"
-
-#: ../gtk/gtkconv.c:2709
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Беседа/Новое мгновенное сооб_щение..."
-
-#: ../gtk/gtkconv.c:2714
-msgid "/Conversation/_Find..."
-msgstr "/Беседа/_Найти..."
-
-#: ../gtk/gtkconv.c:2716
-msgid "/Conversation/View _Log"
-msgstr "/Беседа/Просмотреть _журнал"
-
-#: ../gtk/gtkconv.c:2717
-msgid "/Conversation/_Save As..."
-msgstr "/Беседа/Со_хранить как..."
-
-#: ../gtk/gtkconv.c:2719
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Беседа/О_чистить"
-
-#: ../gtk/gtkconv.c:2723
-msgid "/Conversation/Se_nd File..."
-msgstr "/Беседа/Отправить _файл..."
-
-#: ../gtk/gtkconv.c:2724
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Беседа/Добавить п_равило..."
-
-#: ../gtk/gtkconv.c:2726
-msgid "/Conversation/_Get Info"
-msgstr "/Беседа/Получить _информацию"
-
-#: ../gtk/gtkconv.c:2728
-msgid "/Conversation/In_vite..."
-msgstr "/Беседа/Приг_ласить..."
-
-#: ../gtk/gtkconv.c:2730
-msgid "/Conversation/M_ore"
-msgstr "/Беседа/_Ещё"
-
-#: ../gtk/gtkconv.c:2734
-msgid "/Conversation/Al_ias..."
-msgstr "/Беседа/_Псевдоним..."
-
-#: ../gtk/gtkconv.c:2736
-msgid "/Conversation/_Block..."
-msgstr "/Беседа/_Блокировать..."
-
-#: ../gtk/gtkconv.c:2738
-msgid "/Conversation/_Add..."
-msgstr "/Беседа/_Добавить..."
-
-#: ../gtk/gtkconv.c:2740
-msgid "/Conversation/_Remove..."
-msgstr "/Беседа/_Удалить..."
-
-#: ../gtk/gtkconv.c:2745
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Беседа/Вставить _ссылку..."
-
-#: ../gtk/gtkconv.c:2747
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Беседа/Вставить из_ображение..."
-
-#: ../gtk/gtkconv.c:2752
-msgid "/Conversation/_Close"
-msgstr "/Беседа/_Закрыть"
-
-#. Options
-#: ../gtk/gtkconv.c:2756
-msgid "/_Options"
-msgstr "/_Параметры"
-
-#: ../gtk/gtkconv.c:2757
-msgid "/Options/Enable _Logging"
-msgstr "/Параметры/Вести _журнал"
-
-#: ../gtk/gtkconv.c:2758
-msgid "/Options/Enable _Sounds"
-msgstr "/Параметры/Воспроизводить _звуки"
-
-#: ../gtk/gtkconv.c:2759
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Параметры/Показывать з_начок собеседника"
-
-#: ../gtk/gtkconv.c:2761
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Параметры/Показывать _панели форматирования"
-
-#: ../gtk/gtkconv.c:2762
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Параметры/Показывать _время сообщений"
-
-#: ../gtk/gtkconv.c:2837
-msgid "/Conversation/More"
-msgstr "/Беседа/Ещё"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914
-msgid "/Conversation"
-msgstr "/Беседа"
-
-#: ../gtk/gtkconv.c:2922
-msgid "/Conversation/View Log"
-msgstr "/Беседа/Просмотреть журнал"
-
-#: ../gtk/gtkconv.c:2928
-msgid "/Conversation/Send File..."
-msgstr "/Беседа/Отправить файл..."
-
-#: ../gtk/gtkconv.c:2932
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Беседа/Добавить правило..."
-
-#: ../gtk/gtkconv.c:2938
-msgid "/Conversation/Get Info"
-msgstr "/Беседа/Получить информацию"
-
-#: ../gtk/gtkconv.c:2942
-msgid "/Conversation/Invite..."
-msgstr "/Беседа/Пригласить..."
-
-#: ../gtk/gtkconv.c:2948
-msgid "/Conversation/Alias..."
-msgstr "/Беседа/Псевдоним..."
-
-#: ../gtk/gtkconv.c:2952
-msgid "/Conversation/Block..."
-msgstr "/Беседа/Блокировать..."
-
-#: ../gtk/gtkconv.c:2956
-msgid "/Conversation/Add..."
-msgstr "/Беседа/Добавить..."
-
-#: ../gtk/gtkconv.c:2960
-msgid "/Conversation/Remove..."
-msgstr "/Беседа/Удалить..."
-
-#: ../gtk/gtkconv.c:2966
-msgid "/Conversation/Insert Link..."
-msgstr "/Беседа/Вставить ссылку..."
-
-#: ../gtk/gtkconv.c:2970
-msgid "/Conversation/Insert Image..."
-msgstr "/Беседа/Вставить изображение..."
-
-#: ../gtk/gtkconv.c:2976
-msgid "/Options/Enable Logging"
-msgstr "/Параметры/Вести журнал"
-
-#: ../gtk/gtkconv.c:2979
-msgid "/Options/Enable Sounds"
-msgstr "/Параметры/Воспроизводить звуки"
-
-#: ../gtk/gtkconv.c:2992
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Параметры/Показывать панели форматирования"
-
-#: ../gtk/gtkconv.c:2995
-msgid "/Options/Show Timestamps"
-msgstr "/Параметры/Показывать время сообщений"
-
-#: ../gtk/gtkconv.c:2998
-msgid "/Options/Show Buddy Icon"
-msgstr "/Параметры/Показывать значок собеседника"
-
-#: ../gtk/gtkconv.c:3074
-msgid "User is typing..."
-msgstr "Пользователь набирает сообщение..."
-
-#: ../gtk/gtkconv.c:3077
-msgid "User has typed something and stopped"
-msgstr "Пользователь что-то набрал и остановился"
-
-#. Build the Send To menu
-#: ../gtk/gtkconv.c:3260
-msgid "_Send To"
-msgstr "_Адресат"
-
-#: ../gtk/gtkconv.c:3967
-msgid "_Send"
-msgstr "_Отправить"
-
-#: ../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 "0 пользователей в комнате"
-
-#: ../gtk/gtkconv.c:5181 ../gtk/gtkconv.c:5302
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d пользователь в комнате"
-msgstr[1] "%d пользователей в комнате"
-
-#: ../gtk/gtkconv.c:5855 ../gtk/gtkstatusbox.c:567
-msgid "Typing"
-msgstr "Набирает сообщение"
-
-#: ../gtk/gtkconv.c:5861
-msgid "Stopped Typing"
-msgstr "Прекратил набор сообщения"
-
-#: ../gtk/gtkconv.c:5866
-msgid "Nick Said"
-msgstr "Произнесено имя"
-
-#: ../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 "Только _значки"
-
-#: ../gtk/gtkdebug.c:665
-msgid "_Text Only"
-msgstr "Только _текст"
-
-#: ../gtk/gtkdebug.c:666
-msgid "_Both Icon & Text"
-msgstr "Значки _и текст"
-
-#: ../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 ""
-
-#: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber-разработчик"
-
-#: ../gtk/gtkdialogs.c:109
-msgid "original author"
-msgstr "оригинальный автор"
-
-#: ../gtk/gtkdialogs.c:116
-msgid "Arabic"
-msgstr "Арабский"
-
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
-msgid "Bulgarian"
-msgstr "Болгарский"
-
-#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
-msgid "Bengali"
-msgstr "Бенгальский"
-
-#: ../gtk/gtkdialogs.c:121
-msgid "Bosnian"
-msgstr "Боснийский"
-
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
-msgid "Catalan"
-msgstr "Каталанский"
-
-#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
-msgid "Valencian-Catalan"
-msgstr "Валенсийский-каталанский"
-
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
-msgid "Czech"
-msgstr "Чешский"
-
-#: ../gtk/gtkdialogs.c:126
-msgid "Danish"
-msgstr "Датский"
-
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
-msgid "German"
-msgstr "Немецкий"
-
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
-msgid "Dzongkha"
-msgstr "Дзонг-кэ"
-
-#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
-msgid "Greek"
-msgstr "Греческий"
-
-#: ../gtk/gtkdialogs.c:134
-msgid "Australian English"
-msgstr "Австралийский английский"
-
-#: ../gtk/gtkdialogs.c:135
-msgid "Canadian English"
-msgstr "Канадский английский"
-
-#: ../gtk/gtkdialogs.c:136
-msgid "British English"
-msgstr "Британский английский"
-
-#: ../gtk/gtkdialogs.c:137
-msgid "Esperanto"
-msgstr "Эсперанто"
-
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
-#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
-msgid "Spanish"
-msgstr "Испанский"
-
-#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
-msgid "Euskera(Basque)"
-msgstr "Баскский"
-
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
-msgid "Persian"
-msgstr "Персидский"
-
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
-msgid "Finnish"
-msgstr "Финский"
-
-#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
-#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
-msgid "French"
-msgstr "Французский"
-
-#: ../gtk/gtkdialogs.c:146
-msgid "Galician"
-msgstr "Галисийский"
-
-#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
-msgid "Gujarati"
-msgstr "Гуджарати"
-
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
-msgid "Hebrew"
-msgstr "Иврит"
-
-#: ../gtk/gtkdialogs.c:150
-msgid "Hindi"
-msgstr "Хинди"
-
-#: ../gtk/gtkdialogs.c:151
-msgid "Hungarian"
-msgstr "Венгерский"
-
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
-msgid "Italian"
-msgstr "Итальянский"
-
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
-#: ../gtk/gtkdialogs.c:209
-msgid "Japanese"
-msgstr "Японский"
-
-#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
-msgid "Georgian"
-msgstr "Грузинский"
-
-#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
-msgid "Korean"
-msgstr "Корейский"
-
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
-msgid "Kurdish"
-msgstr "Курдский"
-
-#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
-msgid "Lithuanian"
-msgstr "Литовский"
-
-#: ../gtk/gtkdialogs.c:160
-msgid "Macedonian"
-msgstr "Македонский"
-
-#: ../gtk/gtkdialogs.c:161
-msgid "Nepali"
-msgstr "Непальский"
-
-#: ../gtk/gtkdialogs.c:162
-msgid "Dutch, Flemish"
-msgstr "Нидерландский, фламандский"
-
-#: ../gtk/gtkdialogs.c:163
-msgid "Norwegian"
-msgstr "Норвежский"
-
-#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
-msgid "Polish"
-msgstr "Польский"
-
-#: ../gtk/gtkdialogs.c:166
-msgid "Portuguese"
-msgstr "Португальский"
-
-#: ../gtk/gtkdialogs.c:167
-msgid "Portuguese-Brazil"
-msgstr "Португальский-бразильский"
-
-#: ../gtk/gtkdialogs.c:168
-msgid "Romanian"
-msgstr "Румынский"
-
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
-msgid "Russian"
-msgstr "Русский"
-
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
-msgid "Serbian"
-msgstr "Сербский"
-
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
-msgid "Slovak"
-msgstr "Словацкий"
-
-#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
-msgid "Slovenian"
-msgstr "Словенский"
-
-#: ../gtk/gtkdialogs.c:174
-msgid "Albanian"
-msgstr "Албанский"
-
-#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
-msgid "Swedish"
-msgstr "Шведский"
-
-#: ../gtk/gtkdialogs.c:176
-msgid "Tamil"
-msgstr "Тамильский"
-
-#: ../gtk/gtkdialogs.c:177
-msgid "Telugu"
-msgstr "Телугу"
-
-#: ../gtk/gtkdialogs.c:178
-msgid "Thai"
-msgstr "Тайский"
-
-#: ../gtk/gtkdialogs.c:179
-msgid "Turkish"
-msgstr "Турецкий"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "Vietnamese"
-msgstr "Вьетнамский"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh и команда Gnome-Vi"
-
-#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
-msgid "Simplified Chinese"
-msgstr "Упрощённый китайский"
-
-#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
-msgid "Traditional Chinese"
-msgstr "Традиционный китайский"
-
-#: ../gtk/gtkdialogs.c:189
-msgid "Amharic"
-msgstr "Амхарский"
-
-#: ../gtk/gtkdialogs.c:301
-msgid "About Gaim"
-msgstr "О Gaim"
-
-#: ../gtk/gtkdialogs.c:335
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
-"<BR><BR>You may modify and redistribute the program under the terms of the "
-"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
-"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
-"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"Gaim - модульный клиент обмена сообщениями, позволяющий использовать AIM, "
-"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
-"Sametime, Bonjour, Zephyr, Gadu-Gadu и QQ одновременно.  Написан с "
-"использованием GTK+.<BR><BR>Вы можете изменять и распространять программу по "
-"условиям GPL (версии 2 или более поздней).  Копия GPL содержится в файле "
-"'COPYING', распространяемом с Gaim.  Авторские права на Gaim принадлежат "
-"участникам проекта.  Полный список участников проекта смотрите в файле "
-"'COPYRIGHT'.  Мы не предоставляем никаких гарантий на эту программу.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:350
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim на irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:353
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim на irc.freenode.net<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 другого собеседника из списка "
-"собеседников. Хотите продолжить?"
-msgstr[1] ""
-"Вы удалите контакт, содержащий %s и %d других собеседников из списка "
-"собеседников. Хотите продолжить?"
-
-#: ../gtk/gtkdialogs.c:1016
-msgid "Remove Contact"
-msgstr "Удалить контакт"
-
-#: ../gtk/gtkdialogs.c:1017
-msgid "_Remove Contact"
-msgstr "_Удалить контакт"
-
-#: ../gtk/gtkdialogs.c:1047
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"Вы добавите содержимое группы %s к содержимому группы %s. Хотите продолжить?"
-
-#: ../gtk/gtkdialogs.c:1054
-msgid "Merge Groups"
-msgstr "Объединить группы"
-
-#: ../gtk/gtkdialogs.c:1055
-msgid "_Merge Groups"
-msgstr "_Объединить группы"
-
-#: ../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 "_Удалить группу"
-
-#: ../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 "_Удалить собеседника"
-
-#: ../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 "_Удалить чат"
-
-#: ../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:1409
-#: ../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:1413
-#: ../libgaim/protocols/novell/novell.c:2854
-#: ../libgaim/protocols/oscar/oscar.c:712
-#: ../libgaim/protocols/oscar/oscar.c:4512
-#: ../libgaim/protocols/oscar/oscar.c:5593 ../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/s"
-
-#: ../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:1403
-#: ../libgaim/protocols/jabber/buddy.c:1420
-#: ../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 "_Закрывать это окно по завершении всех передач"
-
-#: ../gtk/gtkft.c:796
-msgid "C_lear finished transfers"
-msgstr "О_чищать завершённые передачи"
-
-#. "Download Details" arrow
-#: ../gtk/gtkft.c:805
-msgid "File transfer _details"
-msgstr "_Подробности о передаче файлов"
-
-#. Resume button
-#: ../gtk/gtkft.c:845
-msgid "_Resume"
-msgstr "_Возобновить"
-
-#: ../gtk/gtkft.c:1058
-msgid "Failed"
-msgstr "Не удалось"
-
-#: ../gtk/gtkimhtml.c:793
-msgid "Paste as Plain _Text"
-msgstr "Вставить как простой _текст"
-
-#: ../gtk/gtkimhtml.c:810
-msgid "_Reset formatting"
-msgstr "Восстановить _форматирование"
-
-#: ../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 "_Скопировать адрес e-mail"
-
-#: ../gtk/gtkimhtml.c:1528
-msgid "_Open Link in Browser"
-msgstr "_Открыть ссылку в браузере"
-
-#: ../gtk/gtkimhtml.c:1538
-msgid "_Copy Link Location"
-msgstr "_Скопировать ссылку"
-
-#: ../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 "_Сохранить изображение..."
-
-#: ../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 "_Описание"
-
-#: ../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 "_Вставить"
-
-#: ../gtk/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Не удалось сохранить изображение: %s\n"
-
-#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "Вставить изображение"
-
-#: ../gtk/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr "Эта тема не имеет доступных смайликов."
-
-#. show everything
-#: ../gtk/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "Смайл!"
-
-#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
-msgid "Bold"
-msgstr "Жирный"
-
-#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
-msgid "Italic"
-msgstr "Наклонный"
-
-#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
-msgid "Underline"
-msgstr "Подчёркнутый"
-
-#: ../gtk/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Больший размер шрифта"
-
-#: ../gtk/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Меньший размер шрифта "
-
-#: ../gtk/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr "Облик шрифта"
-
-#: ../gtk/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Цвет шрифта"
-
-#: ../gtk/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Цвет фона"
-
-#: ../gtk/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "Восстановить форматирование"
-
-#: ../gtk/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Вставить ссылку"
-
-#: ../gtk/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Вставить изображение"
-
-#: ../gtk/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "Вставить смайлик"
-
-#: ../gtk/gtklog.c:234
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Беседа в %s на %s</span>"
-
-#: ../gtk/gtklog.c:237
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Беседа с %s на %s</span>"
-
-#: ../gtk/gtklog.c:284
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../gtk/gtklog.c:331
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:335
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:338
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:342
-msgid "No logs were found"
-msgstr "Журналы не найдены"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../gtk/gtklog.c:357
-msgid "_Browse logs folder"
-msgstr ""
-
-#: ../gtk/gtklog.c:425
-msgid "Total log size:"
-msgstr "Общий размер журналов:"
-
-#: ../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"
-"                      задаёт одну или несколько учётных записей,\n"
-"                      разделённых запятыми)\n"
-"  -v, --version       показать текущую версию и выйти\n"
-
-#: ../gtk/gtkmain.c:528
-#, c-format
-msgid ""
-"Gaim has segfaulted and attempted to dump a core file.\n"
-"This is a bug in the software and has happened through\n"
-"no fault of your own.\n"
-"\n"
-"If you can reproduce the crash, please notify the gaim\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-
-#: ../gtk/gtknotify.c:328
-msgid "Open All Messages"
-msgstr "Открыть все сообщения"
-
-#: ../gtk/gtknotify.c:380
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
-
-#: ../gtk/gtknotify.c:474
-msgid "Sender"
-msgstr "Отправитель"
-
-#: ../gtk/gtknotify.c:500
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s имеет %d новое сообщение."
-msgstr[1] "%s имеет %d новых сообщений."
-
-#: ../gtk/gtknotify.c:511
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../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\t%s\n"
-"<span weight=\"bold\">Веб-сайт:</span>\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 ""
-
-#: ../gtk/gtkplugin.c:533
-msgid "Configure Pl_ugin"
-msgstr "_Настроить модуль"
-
-#: ../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 "_Имя собеседника:"
-
-#. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:575
-msgid "Pounce When Buddy..."
-msgstr "Выполнять, когда собеседник..."
-
-#: ../gtk/gtkpounce.c:583
-msgid "Si_gns on"
-msgstr "_Входит"
-
-#: ../gtk/gtkpounce.c:585
-msgid "Signs o_ff"
-msgstr "В_ыходит"
-
-#: ../gtk/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "Отхо_дит"
-
-#: ../gtk/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "Во_звращается"
-
-#: ../gtk/gtkpounce.c:591
-msgid "Becomes _idle"
-msgstr "Начинает безде_йствовать"
-
-#: ../gtk/gtkpounce.c:593
-msgid "Is no longer i_dle"
-msgstr "Перестаёт бездействоват_ь"
-
-#: ../gtk/gtkpounce.c:595
-msgid "Starts _typing"
-msgstr "Начинает н_абор сообщения"
-
-#: ../gtk/gtkpounce.c:597
-msgid "P_auses while typing"
-msgstr "Приостанавливает на_бор сообщения"
-
-#: ../gtk/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "Прекращает набо_р сообщения"
-
-#: ../gtk/gtkpounce.c:601
-msgid "Sends a _message"
-msgstr "Отправляет сооб_щение"
-
-#. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:636
-msgid "Action"
-msgstr "Действие"
-
-#: ../gtk/gtkpounce.c:644
-msgid "Ope_n an IM window"
-msgstr "Открыть ок_но беседы"
-
-#: ../gtk/gtkpounce.c:646
-msgid "_Pop up a notification"
-msgstr "Вывести уведом_ление"
-
-#: ../gtk/gtkpounce.c:648
-msgid "Send a _message"
-msgstr "Отправить _сообщение"
-
-#: ../gtk/gtkpounce.c:650
-msgid "E_xecute a command"
-msgstr "Выполнить ко_манду"
-
-#: ../gtk/gtkpounce.c:652
-msgid "P_lay a sound"
-msgstr "Воспроизвести зв_ук"
-
-#: ../gtk/gtkpounce.c:657
-msgid "Brows_e..."
-msgstr "_Открыть..."
-
-#: ../gtk/gtkpounce.c:659
-msgid "Br_owse..."
-msgstr "От_крыть..."
-
-#: ../gtk/gtkpounce.c:660
-msgid "Pre_view"
-msgstr "Т_ест"
-
-#: ../gtk/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
-msgstr "Выполн_ять только при статусе, отличном от \"Доступен\""
-
-#: ../gtk/gtkpounce.c:789
-msgid "_Recurring"
-msgstr "_Повторение"
-
-#: ../gtk/gtkpounce.c:1095
-#, c-format
-msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Вы действительно хотите удалить правило %s для %s?"
-
-#: ../gtk/gtkpounce.c:1243
-msgid "Pounce Target"
-msgstr "Объект слежения"
-
-#: ../gtk/gtkpounce.c:1278
-msgid "Recurring"
-msgstr "Повторение"
-
-#: ../gtk/gtkpounce.c:1325
-msgid "Buddy Pounces"
-msgstr "Правила"
-
-#: ../gtk/gtkpounce.c:1452
-#, c-format
-msgid "%s has started typing to you (%s)"
-msgstr "%s начал набор сообщения для вас (%s)"
-
-#: ../gtk/gtkpounce.c:1454
-#, c-format
-msgid "%s has paused while typing to you (%s)"
-msgstr "%s приостановил набор сообщения для вас (%s)"
-
-#: ../gtk/gtkpounce.c:1456
-#, c-format
-msgid "%s has signed on (%s)"
-msgstr "%s в сети (%s)"
-
-#: ../gtk/gtkpounce.c:1458
-#, c-format
-msgid "%s has returned from being idle (%s)"
-msgstr "%s перестал бездействовать (%s)"
-
-#: ../gtk/gtkpounce.c:1460
-#, c-format
-msgid "%s has returned from being away (%s)"
-msgstr "%s вернулся (%s)"
-
-#: ../gtk/gtkpounce.c:1462
-#, c-format
-msgid "%s has stopped typing to you (%s)"
-msgstr "%s прекратил набор сообщения для вас (%s)"
-
-#: ../gtk/gtkpounce.c:1464
-#, c-format
-msgid "%s has signed off (%s)"
-msgstr "%s не в сети (%s)"
-
-#: ../gtk/gtkpounce.c:1466
-#, c-format
-msgid "%s has become idle (%s)"
-msgstr "%s начал бездействовать (%s)"
-
-#: ../gtk/gtkpounce.c:1468
-#, c-format
-msgid "%s has gone away. (%s)"
-msgstr "%s отошёл (%s)"
-
-#: ../gtk/gtkpounce.c:1470
-#, c-format
-msgid "%s has sent you a message. (%s)"
-msgstr "%s отправил вам сообщение (%s)"
-
-#: ../gtk/gtkpounce.c:1471
-msgid "Unknown pounce event. Please report this!"
-msgstr "Неизвестное событие слежения. Сообщите об этом!"
-
-#: ../gtk/gtkprefs.c:509
-msgid "Smiley theme failed to unpack."
-msgstr "Не удалось распаковать тему смайликов."
-
-#: ../gtk/gtkprefs.c:638
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Выберите тему смайликов, которую вы хотели бы использовать. Новые темы могут "
-"быть установлены перетаскиванием их в список тем."
-
-#: ../gtk/gtkprefs.c:673
-msgid "Icon"
-msgstr "Значок"
-
-#: ../gtk/gtkprefs.c:816
-msgid "System Tray Icon"
-msgstr "Значок системного лотка"
-
-#: ../gtk/gtkprefs.c:817
-msgid "_Show system tray icon:"
-msgstr "_Показывать значок системного лотка:"
-
-#: ../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 "_Скрывать новые беседы:"
-
-#: ../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 "Показывать мгновенные сообщения и чаты в окнах с _вкладками"
-
-#: ../gtk/gtkprefs.c:854
-msgid "Show close b_utton on tabs"
-msgstr "Показывать _кнопку закрытия на вкладках"
-
-#: ../gtk/gtkprefs.c:857
-msgid "_Placement:"
-msgstr "_Расположение:"
-
-#: ../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 "_Новые беседы:"
-
-#: ../gtk/gtkprefs.c:900
-msgid "Show _formatting on incoming messages"
-msgstr "Показывать _форматирование во входящих сообщениях"
-
-#: ../gtk/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "Показывать _значки собеседников"
-
-#: ../gtk/gtkprefs.c:905
-msgid "Enable buddy ic_on animation"
-msgstr "Разрешить _анимацию значков собеседников"
-
-#: ../gtk/gtkprefs.c:912
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Уведомлять собеседников, что вы набираете им сообщение"
-
-#: ../gtk/gtkprefs.c:915
-msgid "Highlight _misspelled words"
-msgstr "Подсвечивать слова с _ошибками"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Use smooth-scrolling"
-msgstr "Использовать плавную прокрутку"
-
-#: ../gtk/gtkprefs.c:922
-msgid "F_lash window when IMs are received"
-msgstr "_Мерцать окном при принятии мгновенных сообщений"
-
-#: ../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:3703
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
-msgid "IP Address"
-msgstr "IP-адрес"
-
-#: ../gtk/gtkprefs.c:1017
-msgid "ST_UN server:"
-msgstr "ST_UN-сервер:"
-
-#: ../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-адрес _автоматически"
-
-#: ../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 "Указать диапазон прослушиваемых портов _вручную"
-
-#: ../gtk/gtkprefs.c:1077
-msgid "_Start port:"
-msgstr "_Начальный порт:"
-
-#: ../gtk/gtkprefs.c:1084
-msgid "_End port:"
-msgstr "_Конечный порт:"
-
-#: ../gtk/gtkprefs.c:1092
-msgid "Proxy Server"
-msgstr "Прокси-сервер"
-
-#: ../gtk/gtkprefs.c:1096
-msgid "No proxy"
-msgstr "Нет прокси"
-
-#: ../gtk/gtkprefs.c:1152
-msgid "_User:"
-msgstr "_Пользователь:"
-
-#: ../gtk/gtkprefs.c:1216
-msgid "Seamonkey"
-msgstr ""
-
-#: ../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 "_Браузер:"
-
-#: ../gtk/gtkprefs.c:1299
-msgid "_Open link in:"
-msgstr "_Открывать ссылку в:"
-
-#: ../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 ""
-"_Вручную:\n"
-"(%s для URL)"
-
-#: ../gtk/gtkprefs.c:1358
-msgid "Log _format:"
-msgstr "_Формат журнала:"
-
-#: ../gtk/gtkprefs.c:1363
-msgid "Log all _instant messages"
-msgstr "Записывать все _мгновенные сообщения"
-
-#: ../gtk/gtkprefs.c:1365
-msgid "Log all c_hats"
-msgstr "Записывать все _чаты"
-
-#: ../gtk/gtkprefs.c:1367
-msgid "Log all _status changes to system log"
-msgstr "Записывать все изменения _статуса в системный журнал"
-
-#: ../gtk/gtkprefs.c:1513
-msgid "Sound Selection"
-msgstr "Выбор звука"
-
-#: ../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 "_Метод:"
-
-#: ../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 ""
-"_Команда воспроизведения звука:\n"
-"(%s для имени файла)"
-
-#: ../gtk/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "Параметры звука"
-
-#: ../gtk/gtkprefs.c:1640
-msgid "Sounds when conversation has _focus"
-msgstr "Звуки, когда окно беседы в _фокусе"
-
-#: ../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 "Сообщать _время бездействия:"
-
-#: ../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 "_Автоматический ответ:"
-
-#: ../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 "Менять статус при _бездействии"
-
-#: ../gtk/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
-msgstr "_Минут до изменения статуса:"
-
-#: ../gtk/gtkprefs.c:1847
-msgid "Change _status to:"
-msgstr "Менять _статус на:"
-
-#. 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 "Использовать при запуске статус, бывший до в_ыхода"
-
-#: ../gtk/gtkprefs.c:1876
-msgid "Status to a_pply at startup:"
-msgstr "_Применить при запуске статус:"
-
-#: ../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 "_Допустить"
-
-#: ../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 "_Добавить"
-
-#: ../gtk/gtkroomlist.c:376
-msgid "Room List"
-msgstr "Список комнат"
-
-#. list button
-#: ../gtk/gtkroomlist.c:446
-msgid "_Get List"
-msgstr "_Получить список"
-
-#. add button
-#: ../gtk/gtkroomlist.c:454
-msgid "_Add Chat"
-msgstr "_Добавить чат"
-
-#: ../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 "_Применить"
-
-#: ../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 "_Название:"
-
-#: ../gtk/gtksavedstatuses.c:1125 ../gtk/gtksavedstatuses.c:1446
-msgid "_Status:"
-msgstr "_Статус:"
-
-#. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1157
-msgid "Use a _different status for some accounts"
-msgstr "Использовать _отличающийся статус для некоторых учётных записей"
-
-#. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1221
-msgid "Sa_ve & Use"
-msgstr "Сохранить _и применить"
-
-#: ../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:1026
-#: ../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 ""
-
-#: ../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:2657
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-
-#: ../gtk/gtkutils.c:2659
-msgid "Icon Error"
-msgstr "Ошибка значка"
-
-#: ../gtk/gtkutils.c:2660
-msgid "Could not set icon"
-msgstr "Не удалось установить значок"
-
-#: ../gtk/gtkutils.c:2761
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Не удалось открыть файл '%s': %s"
-
-#: ../gtk/gtkutils.c:2810
-#, 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
-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 ""
-
-#: ../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 ""
-
-#: ../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 ""
-
-#: ../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/plugins/gaimrc.c:508
-msgid "Interface colors"
-msgstr "Цвета интерфейса"
-
-#: ../gtk/plugins/gaimrc.c:532
-msgid "Widget Sizes"
-msgstr "Размер виджетов"
-
-#: ../gtk/plugins/gaimrc.c:553
-msgid "Fonts"
-msgstr "Шрифты"
-
-#: ../gtk/plugins/gaimrc.c:576
-msgid "Tools"
-msgstr "Инструменты"
-
-#: ../gtk/plugins/gaimrc.c:581
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Записать настройки в %s%sgtkrc-2.0"
-
-#: ../gtk/plugins/gaimrc.c:589
-msgid "Re-read gtkrc files"
-msgstr "Повторно прочитать файлы gtkrc"
-
-#: ../gtk/plugins/gaimrc.c:616
-msgid "Gaim GTK+ Theme Control"
-msgstr "Управление темой GTK+ для Gaim"
-
-#: ../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 "_Визуальное отображение жестов"
-
-#. *< 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:1766
-#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:140
-#: ../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 "Подробности о пользователе"
-
-#. "Associate Buddy" button
-#: ../gtk/plugins/gevolution/assoc-buddy.c:486
-msgid "_Associate Buddy"
-msgstr "Соотнести собеседника"
-
-#: ../gtk/plugins/gevolution/eds-utils.c:73
-#: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1167
-msgid "None"
-msgstr "Нет"
-
-#: ../gtk/plugins/gevolution/gevolution.c:239
-#: ../gtk/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Не удаётся отправить e-mail"
-
-#: ../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 "Отправить e-mail"
-
-#. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:411
-msgid "Evolution Integration Configuration"
-msgstr "Настройка интеграции с Evolution"
-
-#. Label
-#: ../gtk/plugins/gevolution/gevolution.c:414
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Выберите все учётные записи, собеседники которых должны быть добавлены "
-"автоматически."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:521
-msgid "Evolution Integration"
-msgstr "Интеграция с Evolution"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:524
-#: ../gtk/plugins/gevolution/gevolution.c:526
-msgid "Provides integration with Evolution."
-msgstr "Предоставляет интеграцию с Evolution."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Ниже введите информацию о персоне."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-"Ниже введите идентификатор пользователя собеседника и тип учётной записи."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Тип учётной записи:"
-
-#. Optional Information section
-#: ../gtk/plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Необязательная информация:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Имя:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Фамилия:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#. *< 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 "Проверяет, все ли сигналы интерфейса пользователя работают исправно."
-
-#: ../gtk/plugins/history.c:188
-msgid "History"
-msgstr "История"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Сворачивание при отсутствии"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Сворачивает список собеседников и все беседы, когда вы отсутствуете."
-
-#: ../gtk/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Проверка почты"
-
-#: ../gtk/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Проверяет наличие новой локальной почты."
-
-#: ../gtk/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Добавляет небольшую область к списку собеседников, в которой сообщается о "
-"наличии новой почты."
-
-#: ../gtk/plugins/markerline.c:23
-msgid "Markerline"
-msgstr "Разделительная линия"
-
-#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Проводит линию, отделяющую новые сообщения в беседе."
-
-#: ../gtk/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr "Проводить разделительную линию в "
-
-#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:674
-msgid "_IM windows"
-msgstr "Окна _мгновенных сообщений"
-
-#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:681
-msgid "C_hat windows"
-msgstr "Окна _чатов"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "Произошёл конфликт при выполнении команды:"
-
-#: ../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 "_Применить"
-
-#. *< 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_Только тогда, когда кто-то произносит ваше имя"
-
-#: ../gtk/plugins/notify.c:699
-msgid "_Focused windows"
-msgstr "Окна в _фокусе"
-
-#. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:707
-msgid "Notification Methods"
-msgstr "Методы уведомления"
-
-#: ../gtk/plugins/notify.c:714
-msgid "Prepend _string into window title:"
-msgstr "Добавлять _строку в начало заголовка окна:"
-
-#. Count method button
-#: ../gtk/plugins/notify.c:733
-msgid "Insert c_ount of new messages into window title"
-msgstr "Вставлять _количество новых сообщений в заголовок окна"
-
-#. Count xprop method button
-#: ../gtk/plugins/notify.c:742
-msgid "Insert count of new message into _X property"
-msgstr "Вставлять количество новых сообщений в свойства _X"
-
-#. Urgent method button
-#: ../gtk/plugins/notify.c:750
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Установить подсказку \"С_РОЧНО\" оконного менеджера"
-
-#. Raise window method button
-#: ../gtk/plugins/notify.c:759
-msgid "R_aise conversation window"
-msgstr "_Поднимать окно беседы"
-
-#. ---------- "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 "Удалять, когда окно беседы оказывается в ф_окусе"
-
-#. Remove on click button
-#: ../gtk/plugins/notify.c:779
-msgid "Remove when conversation window _receives click"
-msgstr "Удалять, когда окно беседы получает _щелчок"
-
-#. Remove on type button
-#: ../gtk/plugins/notify.c:787
-msgid "Remove when _typing in conversation window"
-msgstr "Удалять при _наборе сообщения в окне беседы"
-
-#. Remove on message send button
-#: ../gtk/plugins/notify.c:795
-msgid "Remove when a _message gets sent"
-msgstr "Удалять при отпр_авке сообщения"
-
-#. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:804
-msgid "Remove on switch to conversation ta_b"
-msgstr "Удалять при переключении на _вкладку беседы"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/notify.c:893
-msgid "Message Notification"
-msgstr "Уведомление о сообщении"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/notify.c:896 ../gtk/plugins/notify.c:898
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr ""
-"Предоставляет множество способов уведомления вас о непрочтённых сообщениях."
-
-#: ../gtk/plugins/raw.c:175
-msgid "Raw"
-msgstr "Необработанный"
-
-#: ../gtk/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-"Позволяет вам отправлять необработанный ввод, используя протоколы, "
-"базирующиеся на тексте."
-
-#: ../gtk/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Позволяет вам отправлять необработанный ввод, используя протоколы, "
-"базирующиеся на тексте (Jabber, MSN, IRC, TOC). Для отправки нажмите 'Enter' "
-"в области ввода. Смотрите за окном отладки."
-
-#: ../gtk/plugins/relnot.c:69
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Вы используете 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 "Вы _набираете:"
-
-#: ../gtk/plugins/spellchk.c:2302
-msgid "You _send:"
-msgstr "Вы _отправляете:"
-
-#. 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 "Замещать только _целые слова"
-
-#: ../gtk/plugins/spellchk.c:2341
-msgid "General Text Replacement Options"
-msgstr "Основные параметры замещения текста"
-
-#: ../gtk/plugins/spellchk.c:2342
-msgid "Enable replacement of last word on send"
-msgstr "Разрешить замещение последнего слова при отправке"
-
-#: ../gtk/plugins/spellchk.c:2367
-msgid "Text replacement"
-msgstr "Замещение текста"
-
-#: ../gtk/plugins/spellchk.c:2369 ../gtk/plugins/spellchk.c:2370
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Замещает текст в исходящих сообщениях в соответствии с правилами, "
-"определёнными пользователем."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Лента собеседников"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Горизонтальная прокрутка списка собеседников."
-
-#: ../gtk/plugins/timestamp.c:136
-msgid "Display Timestamps Every"
-msgstr "Выводить отметки времени каждые"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp.c:195
-msgid "Timestamp"
-msgstr "Отметка времени"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp.c:198
-msgid "Display iChat-style timestamps"
-msgstr "Выводит отметки времени в стиле iChat."
-
-#. *  description
-#: ../gtk/plugins/timestamp.c:200
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "Выводит отметки времени в стиле iChat каждые N минут."
-
-#: ../gtk/plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Параметры формата времени"
-
-#: ../gtk/plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr ""
-"_Принудительно использовать (традиционный для Gaim) 24-часовой формат времени"
-
-#: ../gtk/plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Показывать дату..."
-
-#: ../gtk/plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "_Беседы:"
-
-#: ../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 "_Журналы сообщений:"
-
-#. *< 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 ""
-
-#. *< 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 ""
-
-#: ../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 ""
-
-#. *  description
-#: ../gtk/plugins/xmppconsole.c:865
-msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-
-#: ../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 "_Прозрачность окна беседы"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "Показывать _полосу прокрутки в окнах бесед"
-
-#: ../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 "Прозрачность окна _списка собеседников"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Убирать прозрачность окна списка собеседников в фокусе"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Прозрачность"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Варьируемая прозрачность для списка собеседников и бесед."
-
-#. *  description
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"Этот модуль включает варьируемую альфа-прозрачность окон бесед и списка "
-"собеседников.\n"
-"\n"
-"* Замечание: Этот модуль требует 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 "_Запускать Gaim при загрузке Windows"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:328
-msgid "_Dockable Buddy List"
-msgstr "Закреплённый _список собеседников"
-
-#. Blist On Top
-#: ../gtk/plugins/win32/winprefs/winprefs.c:332
-msgid "_Keep Buddy List window on top:"
-msgstr "Держать окно списка собеседников _наверху:"
-
-#. 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 "_Мерцать окном при принятии сообщений в чатах"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:366
-msgid "WinGaim Options"
-msgstr "Параметры WinGaim"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:368
-msgid "Options specific to Windows Gaim."
-msgstr "Специфичные для Windows параметры Gaim."
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:369
-msgid "Provides options specific to Windows Gaim, such as buddy list docking."
-msgstr ""
-"Специфичные для Windows параметры Gaim, такие как закрепление списка "
-"собеседников."
-
-#: ../libgaim/account.c:769
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr ""
+
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "учётные записи"
 
-#: ../libgaim/account.c:915
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "Для подключения требуется пароль."
 
-#: ../libgaim/account.c:940
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Введите пароль для %s (%s)"
 
-#: ../libgaim/account.c:947
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Введите пароль"
 
-#: ../libgaim/account.c:952
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../libgaim/account.c:986 ../libgaim/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Отсутствует модуль протокола для %s"
 
-#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1322
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1332
 msgid "New passwords do not match."
 msgstr "Новые пароли не совпадают."
 
-#: ../libgaim/account.c:1094
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Заполните все поля."
 
-#: ../libgaim/account.c:1117
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Исходный пароль"
 
-#: ../libgaim/account.c:1124
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Новый пароль"
 
-#: ../libgaim/account.c:1131
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Новый пароль (ещё раз)"
 
-#: ../libgaim/account.c:1137
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "Изменить пароль для %s"
 
-#: ../libgaim/account.c:1145
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Введите ваш текущий и ваш новый пароли."
 
-#: ../libgaim/account.c:1175
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Изменить пользовательскую информацию для %s"
 
-#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Установить пользовательскую информацию"
 
-#: ../libgaim/blist.c:548
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5200 ../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] ""
-"%d собеседник из группы %s не был удалён, так как он принадлежит учётной "
-"записи, которая в настоящий момент выключена или неактивна. Этот собеседник "
-"и группа не были удалены.\n"
-msgstr[1] ""
-"%d собеседников из группы %s не были удалены, так как они принадлежат "
-"учётным записям, которые в настоящий момент выключены или неактивны. Эти "
-"собеседники и группа не были удалены.\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:1687
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:321
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+#: ../libpurple/conversation.c:165
 msgid "Unable to send message: The message is too large."
 msgstr "Не удаётся отправить сообщение: Сообщение слишком велико."
 
-#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Не удаётся отправить сообщение для %s."
 
-#: ../libgaim/conversation.c:169
+#: ../libpurple/conversation.c:169
 msgid "The message is too large."
 msgstr "Сообщение слишком велико."
 
-#: ../libgaim/conversation.c:178
+#: ../libpurple/conversation.c:178
 msgid "Unable to send message."
 msgstr "Не удаётся отправить сообщение."
 
-#: ../libgaim/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "Отправить сообщение"
 
-#: ../libgaim/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "_Отправить сообщение"
 
-#: ../libgaim/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s вошёл в комнату."
 
-#: ../libgaim/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] вошёл в комнату."
 
-#: ../libgaim/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../libgaim/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
 
-#: ../libgaim/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s вышел из комнаты."
 
-#: ../libgaim/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s вышел из комнаты (%s)."
 
-#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
-msgid "No name"
-msgstr "Нет имени"
-
-#: ../libgaim/dbus-server.c:578
+#: ../libpurple/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Не удалось получить соединение: %s"
 
-#: ../libgaim/dbus-server.c:590
+#: ../libpurple/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Не удалось получить имя: %s"
 
-#: ../libgaim/dbus-server.c:603
+#: ../libpurple/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Не удалось получить имя сервера: %s"
 
-#: ../libgaim/dnsquery.c:491
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+
+#: ../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 ""
-
-#: ../libgaim/dnsquery.c:496
+msgstr "Не удаётся создать новый процесс разрешителя имён\n"
+
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
-msgstr ""
-
-#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
+msgstr "Не удаётся отправить запрос разрешителю имён\n"
+
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-
-#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
-#: ../libgaim/dnsquery.c:799
+"Ошибка разрешения имени %s:\n"
+"%s"
+
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-
-#: ../libgaim/dnsquery.c:554
+msgstr "Ошибка разрешения имени %s: %d"
+
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
-
-#: ../libgaim/dnsquery.c:558
+"Ошибка чтения из процесса разрешителя имён:\n"
+"%s"
+
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
-msgstr ""
-
-#: ../libgaim/dnsquery.c:735
+msgstr "EOF при чтении из процесса разрешителя имён"
+
+#: ../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:429
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5717,7 +1684,7 @@
 "Ошибка чтения %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:199
+#: ../libpurple/ft.c:208
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5726,7 +1693,7 @@
 "Ошибка записи %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:203
+#: ../libpurple/ft.c:212
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5735,39 +1702,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:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s хочет отправить вам %s (%s)"
 
-#: ../libgaim/ft.c:338
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s хочет отправить вам файл"
 
-#: ../libgaim/ft.c:379
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Удовлетворить запрос передачи файлов от %s?"
 
-#: ../libgaim/ft.c:383
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5778,245 +1745,245 @@
 "Удалённый узел: %s\n"
 "Удалённый порт: %d"
 
-#: ../libgaim/ft.c:416
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s предлагает отправку файла %s"
 
-#: ../libgaim/ft.c:468
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s не является допустимым именем файла.\n"
 
-#: ../libgaim/ft.c:489
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Предложение отправки %s для %s"
 
-#: ../libgaim/ft.c:501
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Запуск передачи %s от %s"
 
-#: ../libgaim/ft.c:655
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Передача файла %s завершена"
 
-#: ../libgaim/ft.c:658
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "Передача файлов завершена"
 
-#: ../libgaim/ft.c:1075
+#: ../libpurple/ft.c:1090
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Вы отменили передачу %s"
 
-#: ../libgaim/ft.c:1080
+#: ../libpurple/ft.c:1095
 msgid "File transfer cancelled"
 msgstr "Передача файлов отменена"
 
-#: ../libgaim/ft.c:1138
+#: ../libpurple/ft.c:1153
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s отменил передачу %s"
 
-#: ../libgaim/ft.c:1143
+#: ../libpurple/ft.c:1158
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s отменил передачу файлов"
 
-#: ../libgaim/ft.c:1200
+#: ../libpurple/ft.c:1215
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Не удалось произвести передачу файлов для %s."
 
-#: ../libgaim/ft.c:1202
+#: ../libpurple/ft.c:1217
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Не удалось произвести передачу файлов от %s."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Выполнить команду в терминале"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"aim\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"gg\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"icq\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"irc\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"msnim\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"sip\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"xmpp\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Команда, используемая для обработки \"ymsgr\" URL, если включено."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Обработчик для \"aim\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Обработчик для \"gg\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Обработчик для \"icq\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Обработчик для \"irc\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Обработчик для \"msnim\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Обработчик для \"sip\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Обработчик для \"xmpp\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Обработчик для \"ymsgr\" URL"
 
-#: ../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 "Должна ли указанная команда обрабатывать \"aim\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"gg\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"icq\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"irc\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"msnim\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"sip\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"xmpp\" URL"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Должна ли указанная команда обрабатывать \"ymsgr\" URL"
 
-#: ../libgaim/log.c:181
+#: ../libpurple/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">Служба ведения журнала не имеет функции чтения</"
 "font></b>"
 
-#: ../libgaim/log.c:562
+#: ../libpurple/log.c:593
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libgaim/log.c:573
+#: ../libpurple/log.c:607
 msgid "Plain text"
 msgstr "Простой текст"
 
-#: ../libgaim/log.c:584
-msgid "Old Gaim"
-msgstr "Старый Gaim"
-
-#: ../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
+msgstr "Не удалось выполнить ведение журнала этой беседы."
+
+#: ../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-"
@@ -6025,7 +1992,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1117
+#: ../libpurple/log.c:1253
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -6034,51 +2001,44 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
+#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Не удаётся найти путь к журналу!</b></font>"
 
-#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
+#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Не удалось прочитать файл: %s</b></font>"
 
-#: ../libgaim/log.c:1249
+#: ../libpurple/log.c:1385
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1691
-#: ../libgaim/protocols/msn/servconn.c:139
-#: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2719
-msgid "Unknown error"
-msgstr "Неизвестная ошибка"
-
-#: ../libgaim/plugin.c:365
+#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
-
-#: ../libgaim/plugin.c:380
+msgstr "Вы используете %s, а этот модуль требует %s."
+
+#: ../libpurple/plugin.c:380
 msgid "This plugin has not defined an ID."
-msgstr ""
-
-#: ../libgaim/plugin.c:448
+msgstr "Этот модуль не имеет ID."
+
+#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 
-#: ../libgaim/plugin.c:465
+#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Несоответствие версии ABI %d.%d.x (необходима %d.%d.x)"
 
-#: ../libgaim/plugin.c:482
+#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr ""
 
-#: ../libgaim/plugin.c:547
+#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -6087,92 +2047,91 @@
 "Требуемый модуль %s не был найден. Установите этот модуль и попытайтесь "
 "снова."
 
-#: ../libgaim/plugin.c:552
-msgid "Gaim encountered errors loading the plugin."
-msgstr "Gaim столкнулся с ошибками при загрузке модуля."
-
-#: ../libgaim/plugin.c:574
+#: ../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:578
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim не удалось загрузить ваш модуль."
-
-#: ../libgaim/plugin.c:678
+#: ../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:683
-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 "Автоматический приём файла \"%s\" от \"%s\" завершён."
 
-#: ../libgaim/plugins/autoaccept.c:82
+#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Автоматический приём завершён"
 
-#: ../libgaim/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "При поступлении запроса передачи файлов от %s"
 
-#: ../libgaim/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "Настроить автоматический приём"
 
-#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../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:5852
-#: ../libgaim/protocols/oscar/oscar.c:5904
-#: ../libgaim/protocols/oscar/oscar.c:6082
-#: ../libgaim/protocols/oscar/oscar.c:6138
-#: ../libgaim/protocols/oscar/oscar.c:6207 ../libgaim/request.h:1350
-#: ../libgaim/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:6082
+#: ../libpurple/protocols/oscar/oscar.c:6152 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "О_тменить"
 
-#: ../libgaim/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Спросить"
 
-#: ../libgaim/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Принять автоматически"
 
-#: ../libgaim/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Отвергнуть автоматически"
 
-#: ../libgaim/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "Автоматический приём файлов..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libgaim/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -6180,11 +2139,11 @@
 "Сохранять файлы в\n"
 "(укажите полный путь)"
 
-#: ../libgaim/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "Отвергать автоматически от пользователей не из списка собеседников"
 
-#: ../libgaim/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -6193,132 +2152,39 @@
 "файлов\n"
 "(только при отсутствии беседы с отправителем)"
 
-#: ../libgaim/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "Автоматический ответ"
-
-#: ../libgaim/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "Автоматический ответ для всех протоколов."
-
-#: ../libgaim/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libgaim/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "Установить автоматический ответ для %s"
-
-#: ../libgaim/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "Установить автоматический ответ"
-
-#: ../libgaim/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-
-#: ../libgaim/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "Установить _автоматический ответ"
-
-#: ../libgaim/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "Автоматический ответ"
-
-#: ../libgaim/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "Когда отвечать автоматически"
-
-#: ../libgaim/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "При _статусе учётной записи, отличном от \"Доступен\""
-
-#: ../libgaim/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "При _бездействии учётной записи"
-
-#: ../libgaim/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "_Ответ по умолчанию"
-
-#: ../libgaim/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "Статусное сообщение"
-
-#: ../libgaim/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "Отвечать статусным сообщением"
-
-#: ../libgaim/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "Всегда, при наличии статусного сообщения"
-
-#: ../libgaim/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "Только при отсутствии автоматического ответа"
-
-#: ../libgaim/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "Задержка между ответами"
-
-#: ../libgaim/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "_Минимальная задержка (минут)"
-
-#: ../libgaim/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "Количество отправляемых ответов"
-
-#: ../libgaim/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "М_аксимальное количество"
-
-#: ../libgaim/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr ""
-
-#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
-#: ../libgaim/protocols/msn/msn.c:1641
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1639
 msgid "Notes"
 msgstr "Заметки"
 
-#: ../libgaim/plugins/buddynote.c:47
+#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr ""
 
-#: ../libgaim/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr ""
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
 msgstr ""
 
-#. *  summary
-#: ../libgaim/plugins/buddynote.c:90
+#. *< summary
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 
@@ -6328,7 +2194,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ciphertest.c:264
+#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Проверка шифров"
 
@@ -6336,9 +2202,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr "Проверяет шифры, поставляемые с Gaim."
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
+msgstr "Проверяет шифры, поставляемые с libpurple."
 
 #. *< type
 #. *< ui_requirement
@@ -6346,7 +2212,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/dbus-example.c:155
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "Пример DBus"
 
@@ -6354,7 +2220,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"
 
@@ -6364,58 +2231,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:218
 msgid "Minutes"
 msgstr "Минуты"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
-#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Мастер бездействия"
 
-#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Установить время бездействия учётной записи"
 
-#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Установить"
 
-#: ../libgaim/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Ни одна из учётных записей не бездействует."
 
-#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Сбросить время бездействия учётной записи"
 
-#: ../libgaim/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Сбросить"
 
-#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Установить время бездействия для всех учётных записей"
 
-#: ../libgaim/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Сбросить время бездействия для всех бездействующих учётных записей"
 
-#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Позволяет настраивать время бездействия вручную."
 
@@ -6425,19 +2292,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."
@@ -6451,118 +2318,160 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-server.c:74
+#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Тестовый сервер IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-server.c:77
+#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Тестовый модуль поддержки IPC в качестве сервера."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-server.c:79
+#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "Тестовый модуль поддержки IPC в качестве сервера. Регистрирует команды IPC."
 
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:270
+msgid "Join/Part Hiding"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:273
+msgid "Hides extraneous join/part messages."
+msgstr ""
+
+#. *  description
+#: ../libpurple/plugins/joinpart.c:275
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libgaim/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:497
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libgaim/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "Пользователь не в сети."
 
-#: ../libgaim/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "Автоматический отклик отправлен:"
 
-#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
-#: ../libgaim/plugins/statenotify.c:80
+#: ../libpurple/plugins/log_reader.c:1568
+#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s не в сети."
 
-#: ../libgaim/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr "Одно или несколько сообщений могли быть недоставленными."
 
-#: ../libgaim/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "Вы были отсоединены от сервера."
 
-#: ../libgaim/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "Сообщение не может быть отправлено, так как был превышен максимальный размер."
 
-#: ../libgaim/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "Сообщение не может быть отправлено."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1976
+#: ../libpurple/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2090
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2001
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "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 "Каталог журнала"
 
@@ -6572,21 +2481,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "Система чтения журналов"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Включает журналы других клиентов обмена сообщениями в систему просмотра "
 "журналов."
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6595,12 +2504,12 @@
 "at your own risk!"
 msgstr ""
 
-#: ../libgaim/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Загрузчик модулей Mono"
 
-#: ../libgaim/plugins/mono/loader/mono.c:213
-#: ../libgaim/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr ""
 
@@ -6613,18 +2522,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "Новая строка"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "Добавляет новую строку к началу выводимого сообщения."
 
-#. *  summary
-#: ../libgaim/plugins/newline.c:71
+#. *< summary
+#: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -6632,40 +2541,60 @@
 "Добавляет новую строку к началу каждого сообщения, вследствие чего в окне "
 "беседы само сообщение выводится ниже идентификатора пользователя."
 
-#: ../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
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:539 ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
+#: ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "Да"
+
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:539 ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
+#: ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "Нет"
+
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -6675,48 +2604,48 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 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:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Предоставляет поддержку загрузки модулей perl."
 
-#: ../libgaim/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Включить только для пользователей из списка собеседников"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Выключать во время отсутствия"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Выводить уведомительное сообщение в беседах"
 
-#: ../libgaim/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr ""
 
@@ -6726,7 +2655,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Проверка сигналов"
 
@@ -6734,7 +2663,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 "Проверяет, все ли сигналы работают исправно."
 
@@ -6744,7 +2674,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Простой модуль"
 
@@ -6752,7 +2682,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 "Проверяет, всё ли работает."
 
@@ -6762,7 +2692,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -6770,7 +2700,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."
 
@@ -6780,7 +2710,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -6788,8 +2718,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "Предоставляет поддержку SSL посредством GNUTLS."
 
@@ -6799,7 +2729,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -6807,48 +2737,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Предоставляет поддержку SSL посредством Mozilla NSS."
 
-#: ../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
+msgstr "%s вернулся."
+
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
-msgstr "%s отходит."
-
-#: ../libgaim/plugins/statenotify.c:62
+msgstr "%s отошёл."
+
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
-msgstr "%s начинает бездействовать."
-
-#: ../libgaim/plugins/statenotify.c:64
+msgstr "%s начал бездействовать."
+
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s перестаёт бездействовать."
-
-#: ../libgaim/plugins/statenotify.c:73
+msgstr "%s перестал бездействовать."
+
+#: ../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 "Собеседник _отходит"
 
-#: ../libgaim/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Собеседник начинает _бездействовать"
 
-#: ../libgaim/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Собеседник _входит/выходит"
 
@@ -6858,7 +2789,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Уведомление о статусе собеседника"
 
@@ -6866,39 +2797,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
 "Уведомляет в окне беседы, когда собеседник отходит или возвращается, "
-"начинает или перестает бездействовать."
-
-#: ../libgaim/plugins/tcl/tcl.c:415
+"начинает или перестаёт бездействовать."
+
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Загрузчик модулей Tcl"
 
-#: ../libgaim/plugins/tcl/tcl.c:417 ../libgaim/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Предоставляет поддержку модулей на языке Tcl"
 
-#: ../libgaim/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 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 "Не удаётся прослушивать входящие соединения\n"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:146
+#: ../libpurple/protocols/bonjour/bonjour.c:148
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "Не удаётся установить соединение с локальным mDNS-сервером. Он работает?"
 
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4496
+#: ../libpurple/protocols/oscar/oscar.c:5547
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3384
+#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:159
+#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
+msgid "Away"
+msgstr "Отошёл"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6909,384 +2860,414 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:436
-#: ../libgaim/protocols/bonjour/bonjour.c:438
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 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:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
+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:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "Имя узла"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:820
 msgid "First name"
 msgstr "Имя"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:815
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:825
 msgid "Last name"
 msgstr "Фамилия"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:800
-#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/silc/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:591
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "Учётная запись AIM"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:594
+#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "Jabber Account"
 msgstr "Учётная запись Jabber"
 
-#: ../libgaim/protocols/bonjour/bonjour.h:35
+#: ../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
 msgid "Token Error"
 msgstr "Ошибка маркера"
 
-#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
-#: ../libgaim/protocols/gg/gg.c:181
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Не удаётся загрузить маркер.\n"
 
-#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Сохранить список собеседников..."
 
-#: ../libgaim/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Список собеседников пуст, в файл ничего не было записано."
 
-#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Не удалось открыть файл"
 
-#: ../libgaim/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Список собеседников сохранён успешно!"
 
-#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Не удалось загрузить список собеседников"
 
-#: ../libgaim/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Загрузить список собеседников..."
 
-#: ../libgaim/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Список собеседников загружен успешно!"
 
-#: ../libgaim/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Сохранить список собеседников..."
 
-#: ../libgaim/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Заполните поля регистрационной формы."
 
-#: ../libgaim/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: ../libgaim/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Не удаётся зарегистрировать новую учётную запись. Произошла ошибка.\n"
 
-#: ../libgaim/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Новая учётная запись Gadu-Gadu зарегистрирована"
 
-#: ../libgaim/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Регистрация завершена успешно!"
 
-#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:789
-#: ../libgaim/protocols/jabber/jabber.c:1357
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/jabber/jabber.c:1367
 msgid "Password"
 msgstr "Пароль"
 
-#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Пароль (наберите ещё раз)"
 
-#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Введите текущий маркер"
 
-#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Текущий маркер"
 
-#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Зарегистрировать новую учётную запись Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Заполните следующие поля"
 
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
-#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:825
-#: ../libgaim/protocols/oscar/oscar.c:3778
-#: ../libgaim/protocols/oscar/oscar.c:3791
-#: ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:835
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Город"
 
-#: ../libgaim/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Год рождения"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
-#: ../libgaim/protocols/oscar/oscar.c:3728
-#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
-#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
-#: ../libgaim/protocols/qq/qq.c:234
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Пол"
 
-#: ../libgaim/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Мужчина или женщина"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3728
-#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../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:3728
-#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Женщина"
 
-#: ../libgaim/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Только в сети"
 
-#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Найти собеседников"
 
-#: ../libgaim/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Заполните поля."
 
-#: ../libgaim/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Не удаётся изменить пароль. Произошла ошибка.\n"
 
-#: ../libgaim/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Изменить пароль для учётной записи Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "Пароль был успешно изменён!"
 
-#: ../libgaim/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: ../libgaim/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Введите текущий и новый пароли для UIN: "
 
-#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Изменить пароль Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Выберите чат для собеседника: %s"
 
-#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Добавить к чату..."
 
-#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
-#: ../libgaim/protocols/oscar/oscar.c:2654
-#: ../libgaim/protocols/oscar/oscar.c:3695
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5519
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:155
+#: ../pidgin/gtkblist.c:3036 ../pidgin/gtkblist.c:3360
+#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
+msgid "Offline"
+msgstr "Не в сети"
+
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
+msgid "Available"
+msgstr "Доступен"
+
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
-#: ../libgaim/protocols/jabber/buddy.c:1564
-#: ../libgaim/protocols/jabber/buddy.c:1740
-#: ../libgaim/protocols/oscar/oscar.c:3706
-#: ../libgaim/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1560
+#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Имя"
 
-#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "Год рождения"
 
-#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
-#: ../libgaim/protocols/oscar/oscar.c:3900
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "Не удаётся отобразить результаты поиска."
 
-#: ../libgaim/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Публичный каталог Gadu-Gadu"
 
-#: ../libgaim/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: ../libgaim/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "Пользователи не найдены"
 
-#: ../libgaim/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "Нет пользователей, соответствующих критериям поиска."
 
-#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "Не удаётся прочитать сокет"
 
-#: ../libgaim/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "Список собеседников загружен"
 
-#: ../libgaim/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "Список собеседников был загружен с сервера."
 
-#: ../libgaim/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "Список собеседников сохранён"
 
-#: ../libgaim/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "Список собеседников был сохранён на сервере."
 
-#: ../libgaim/protocols/gg/gg.c:1496 ../libgaim/protocols/gg/gg.c:1727
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "Не удалось установить соединение."
 
-#: ../libgaim/protocols/gg/gg.c:1633 ../libgaim/protocols/msn/msn.c:563
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:548
 msgid "Blocked"
 msgstr "Заблокирован"
 
-#: ../libgaim/protocols/gg/gg.c:1656
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "Добавить к чату"
 
-#: ../libgaim/protocols/gg/gg.c:1665
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "Разблокировать"
 
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "Блокировать"
 
-#: ../libgaim/protocols/gg/gg.c:1686
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "_Имя чата:"
 
-#: ../libgaim/protocols/gg/gg.c:1926
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "Ошибка чата"
 
-#: ../libgaim/protocols/gg/gg.c:1927
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "Это имя чата уже используется"
 
-#: ../libgaim/protocols/gg/gg.c:2010
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "Нет соединения с сервером."
 
-#: ../libgaim/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "Найти собеседников..."
 
-#: ../libgaim/protocols/gg/gg.c:2039
+#: ../libpurple/protocols/gg/gg.c:2024
 msgid "Change password..."
 msgstr "Изменить пароль..."
 
-#: ../libgaim/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2030
 msgid "Upload buddylist to Server"
 msgstr "Сохранить список собеседников на сервере"
 
-#: ../libgaim/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "Загрузить список собеседников с сервера"
 
-#: ../libgaim/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "Удалить список собеседников с сервера"
 
-#: ../libgaim/protocols/gg/gg.c:2057
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "Сохранить список собеседников в файл..."
 
-#: ../libgaim/protocols/gg/gg.c:2061
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "Загрузить список собеседников из файла..."
 
@@ -7301,122 +3282,147 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2159
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Модуль протокола Gadu-Gadu"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2160
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Пользователь Gadu-Gadu"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Неизвестная команда: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
-#: ../libgaim/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "текущая тема: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
-#: ../libgaim/protocols/silc/silc.c:1293
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "Тема не установлена"
 
-#: ../libgaim/protocols/irc/dcc_send.c:296
-#: ../libgaim/protocols/irc/dcc_send.c:337
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/irc/dcc_send.c:296
+#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Не удалось произвести передачу файлов"
 
-#: ../libgaim/protocols/irc/dcc_send.c:297
-#: ../libgaim/protocols/irc/dcc_send.c:338
-msgid "Gaim could not open a listening port."
-msgstr "Gaim не удалось открыть порт для прослушивания."
-
-#: ../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 "MOTD для %s"
 
-#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
 msgid "Server has disconnected"
 msgstr "Сервер разорвал соединение"
 
-#: ../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 "_Канал:"
 
-#: ../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 "_Пароль:"
 
-#: ../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:585
-#: ../libgaim/protocols/jabber/jabber.c:930
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1040
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1673
+#: ../libpurple/protocols/yahoo/yahoo.c:2749
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+msgid "Connecting"
+msgstr "Соединение"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:595
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "Поддержка SSL недоступна"
 
-#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
-#: ../libgaim/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1588
 msgid "Couldn't create socket"
 msgstr "Не удалось создать сокет"
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:460
-#: ../libgaim/protocols/oscar/oscar.c:1263
+#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Не удалось соединиться с узлом"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:484
+#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "Не удалось установить соединение"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:487
+#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "Не удалось выполнить согласование SSL"
 
-#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
+#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
 msgid "Read error"
 msgstr "Ошибка чтения"
 
-#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
-#: ../libgaim/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Пользователи"
 
-#: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3396
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
-#: ../libgaim/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
+#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Тема"
 
@@ -7428,204 +3434,212 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libpurple/protocols/irc/irc.c:901
 msgid "IRC Protocol Plugin"
 msgstr "Модуль протокола IRC"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:904
+#: ../libpurple/protocols/irc/irc.c:902
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Наименее плохой модуль протокола IRC"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
-#: ../libgaim/protocols/jabber/jabber.c:1989
-#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
-#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
-#: ../libgaim/protocols/sametime/sametime.c:5727
-#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
-#: ../libgaim/protocols/simple/simple.c:1836
-#: ../libgaim/protocols/toc/toc.c:2347
+#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/libxmpp.c:194
+#: ../libpurple/protocols/msn/msn.c:2131
+#: ../libpurple/protocols/oscar/oscar.c:6583
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Сервер"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
-#: ../libgaim/protocols/oscar/libaim.c:136
-#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
-#: ../libgaim/protocols/sametime/sametime.c:5732
-#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
+#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2136
+#: ../libpurple/protocols/oscar/oscar.c:6586
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Порт"
 
-#: ../libgaim/protocols/irc/irc.c:929
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Encodings"
 msgstr "Кодировки"
 
-#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
-#: ../libgaim/protocols/jabber/jabber.c:785
-#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
-#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
-#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
+#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:309
+#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1191
+#: ../libpurple/protocols/silc/ops.c:1194
+#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
-#: ../libgaim/protocols/silc/silc.c:933
+#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "Настоящее имя"
 
 #.
-#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:943
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Use SSL"
 msgstr "Использовать SSL"
 
-#: ../libgaim/protocols/irc/msgs.c:107
+#: ../libpurple/protocols/irc/msgs.c: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 ""
 
-#: ../libgaim/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:294
 msgid " <i>(ircop)</i>"
 msgstr " <i>(оператор IRC)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:295
 msgid " <i>(identified)</i>"
 msgstr " <i>(идентифицирован)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3696
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:296
+#: ../libpurple/protocols/oscar/oscar.c:3687
+#: ../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:322
+#: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Сейчас на"
 
-#: ../libgaim/protocols/irc/msgs.c:250
+#: ../libpurple/protocols/irc/msgs.c:327
 msgid "Idle for"
 msgstr "Бездействует"
 
-#: ../libgaim/protocols/irc/msgs.c:253
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "Online since"
 msgstr "В сети с"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "<b>Defining adjective:</b>"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Glorious"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:333
+#: ../libpurple/protocols/irc/msgs.c:410
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s сменил тему на: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:335
+#: ../libpurple/protocols/irc/msgs.c:412
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s очистил тему."
 
-#: ../libgaim/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Тема для %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:361
+#: ../libpurple/protocols/irc/msgs.c:438
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Неизвестное сообщение '%s'"
 
-#: ../libgaim/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/irc/msgs.c:439
 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:439
+msgid "The IRC server received a message it did not understand."
+msgstr "Сервер IRC не понял полученное сообщение."
+
+#: ../libpurple/protocols/irc/msgs.c:460
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Пользователи на %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:515
+#: ../libpurple/protocols/irc/msgs.c:557
 msgid "Time Response"
 msgstr "Отклик времени"
 
-#: ../libgaim/protocols/irc/msgs.c:516
+#: ../libpurple/protocols/irc/msgs.c:558
 msgid "The IRC server's local time is:"
 msgstr "Локальное время сервера IRC:"
 
-#: ../libgaim/protocols/irc/msgs.c:527
+#: ../libpurple/protocols/irc/msgs.c:569
 msgid "No such channel"
 msgstr "Нет такого канала"
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:538
+#: ../libpurple/protocols/irc/msgs.c:580
 msgid "no such channel"
 msgstr "нет такого канала"
 
-#: ../libgaim/protocols/irc/msgs.c:541
+#: ../libpurple/protocols/irc/msgs.c:583
 msgid "User is not logged in"
 msgstr "Пользователь не в сети"
 
-#: ../libgaim/protocols/irc/msgs.c:546
+#: ../libpurple/protocols/irc/msgs.c:588
 msgid "No such nick or channel"
 msgstr "Нет такого псевдонима или канала"
 
-#: ../libgaim/protocols/irc/msgs.c:566
+#: ../libpurple/protocols/irc/msgs.c:608
 msgid "Could not send"
 msgstr "Не удалось отправить"
 
-#: ../libgaim/protocols/irc/msgs.c:622
+#: ../libpurple/protocols/irc/msgs.c:664
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Присоединение к %s требует приглашения."
 
-#: ../libgaim/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:665
 msgid "Invitation only"
 msgstr "Только по приглашению"
 
-#: ../libgaim/protocols/irc/msgs.c:732
+#: ../libpurple/protocols/irc/msgs.c:777
 #, 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:782 ../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:805
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "режим (%s %s) установлен %s"
 
-#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
+#: ../libpurple/protocols/irc/msgs.c:890 ../libpurple/protocols/irc/msgs.c:891
 msgid "Invalid nickname"
 msgstr "Неверный псевдоним"
 
-#: ../libgaim/protocols/irc/msgs.c:847
+#: ../libpurple/protocols/irc/msgs.c:892
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7633,7 +3647,7 @@
 "Выбранный вами псевдоним был отвергнут сервером. Вероятно, он содержит "
 "недопустимые символы."
 
-#: ../libgaim/protocols/irc/msgs.c:852
+#: ../libpurple/protocols/irc/msgs.c:897
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7641,51 +3655,52 @@
 "Выбранное вами имя учётной записи было отвергнуто сервером. Вероятно, оно "
 "содержит недопустимые символы."
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:936
 msgid "Cannot change nick"
 msgstr "Не удаётся изменить псевдоним"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:936
 msgid "Could not change nick"
 msgstr "Не удалось изменить псевдоним"
 
-#: ../libgaim/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:957
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Вы покинули канал%s%s"
 
-#: ../libgaim/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:999
 msgid "Error: invalid PONG from server"
 msgstr "Ошибка: неверный PONG с сервера"
 
-#: ../libgaim/protocols/irc/msgs.c:956
+#: ../libpurple/protocols/irc/msgs.c:1001
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Ответ PING -- задержка: %lu секунд"
 
-#: ../libgaim/protocols/irc/msgs.c:1037
+#: ../libpurple/protocols/irc/msgs.c:1082
 #, 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:1083
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Не удаётся присоединиться к каналу"
 
-#: ../libgaim/protocols/irc/msgs.c:1072
+#: ../libpurple/protocols/irc/msgs.c:1117
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Псевдоним или канал временно недоступен."
 
-#: ../libgaim/protocols/irc/msgs.c:1084
+#: ../libpurple/protocols/irc/msgs.c:1129
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:116
+#: ../libpurple/protocols/irc/parse.c:121
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;действие для выполнения&gt;:  Выполнить действие."
 
-#: ../libgaim/protocols/irc/parse.c:117
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -7693,11 +3708,11 @@
 "away [сообщение]:  Установить сообщение об отсутствии. Если сообщение не "
 "задано, удалить сообщение об отсутствии."
 
-#: ../libgaim/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:123
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Послать команду для chanserv"
 
-#: ../libgaim/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -7705,7 +3720,7 @@
 "deop &lt;псевдоним1&gt; [псевдоним2] ...:  Забрать у пользователя статус "
 "оператора канала. Вы должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -7715,7 +3730,7 @@
 "голоса на канале, лишая его возможности говорить, если канал модерируемый "
 "(+m). Вы должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -7723,19 +3738,19 @@
 "invite &lt;псевдоним&gt; [комната]:  Пригласить пользователя присоединиться "
 "к вам на указанном или текущем канале."
 
-#: ../libgaim/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -7743,7 +3758,7 @@
 "kick &lt;псевдоним&gt; [сообщение]:  Удалить пользователя с канала. Вы "
 "должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -7751,15 +3766,15 @@
 "list:  Вывести список каналов в сети. <i>Имейте в виду, что некоторые "
 "серверы за это могут разорвать соединение с вами.</i>"
 
-#: ../libgaim/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:131
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;действие для выполнения&gt;:  Выполнить действие."
 
-#: ../libgaim/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Послать команду для memoserv"
 
-#: ../libgaim/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -7767,28 +3782,28 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;псевдоним|канал&gt;:  Установить или "
 "снять режим пользователя или канала."
 
-#: ../libgaim/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 "names [канал]:  Вывести список пользователей, присутствующих сейчас на "
 "канале."
 
-#: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1793
+#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним."
 
-#: ../libgaim/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Послать команду для nickserv"
 
-#: ../libgaim/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -7796,17 +3811,17 @@
 "op &lt;псевдоним1&gt; [псевдоним2] ...:  Дать пользователю статус оператора "
 "канала. Вы должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:140
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Послать команду для operserv"
 
-#: ../libgaim/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -7814,7 +3829,7 @@
 "part [комната] [сообщение]:  Покинуть указанный или текущий канал. Сообщение "
 "необязательно."
 
-#: ../libgaim/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -7822,22 +3837,22 @@
 "ping [псевдоним]:  Запросить величину задержки связи с пользователем (или с "
 "сервером, если пользователь не указан)."
 
-#: ../libgaim/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [сообщение]:  Разорвать соединение с сервером. Сообщение необязательно."
 
-#: ../libgaim/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Послать команду без обработки непосредственно серверу."
 
-#: ../libgaim/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -7845,24 +3860,24 @@
 "remove &lt;псевдоним&gt; [сообщение]:  Удалить пользователя из комнаты. Вы "
 "должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Выводит текущее локальное время на сервере IRC."
 
-#: ../libgaim/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему канала."
 
-#: ../libgaim/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Установить или снять режим пользователя."
 
-#: ../libgaim/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:151
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -7870,60 +3885,63 @@
 "voice &lt;псевдоним1&gt; [псевдоним2] ...:  Дать пользователю статус голоса "
 "на канале. Вы должны быть оператором канала для этого."
 
-#: ../libgaim/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:153
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [сервер] &lt;псевдоним&gt;:  Получить информацию о пользователе."
 
-#: ../libgaim/protocols/irc/parse.c:442
+#: ../libpurple/protocols/irc/parse.c:154
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+"whowas &lt;псевдоним&gt;:  Получить информацию о пользователе, вышедшем из "
+"сети."
+
+#: ../libpurple/protocols/irc/parse.c:448
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Время ответа от %s: %lu секунд"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:449
 msgid "CTCP PING reply"
 msgstr "Ответ CTCP PING"
 
-#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
-#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
-#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
+#: ../libpurple/protocols/irc/parse.c:560
+#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Соединение разорвано."
 
-#: ../libgaim/protocols/jabber/auth.c:49
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Сервер требует TLS/SSL для входа. Поддержка TLS/SSL не найдена."
 
-#: ../libgaim/protocols/jabber/auth.c:112
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Сервер требует аутентификацию простым текстом через нешифрованный поток"
 
-#: ../libgaim/protocols/jabber/auth.c:226
-msgid "Server couldn't authenticate you without a password"
-msgstr ""
-
-#: ../libgaim/protocols/jabber/auth.c:229
-#: ../libgaim/protocols/jabber/auth.c:230
-#: ../libgaim/protocols/jabber/auth.c:404
-#: ../libgaim/protocols/jabber/auth.c:405
-#: ../libgaim/protocols/jabber/auth.c:486
-#: ../libgaim/protocols/jabber/auth.c:487
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:295
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:481
+#: ../libpurple/protocols/jabber/auth.c:564
+#: ../libpurple/protocols/jabber/auth.c:565
 msgid "Plaintext Authentication"
 msgstr "Аутентификация простым текстом"
 
-#: ../libgaim/protocols/jabber/auth.c:231
-#: ../libgaim/protocols/jabber/auth.c:406
-#: ../libgaim/protocols/jabber/auth.c:488
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:482
+#: ../libpurple/protocols/jabber/auth.c:566
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -7931,825 +3949,860 @@
 "Этот сервер требует аутентификацию простым текстом через нешифрованное "
 "соединение. Позволить это и продолжить аутентификацию?"
 
-#: ../libgaim/protocols/jabber/auth.c:237
-#: ../libgaim/protocols/jabber/auth.c:414
-#: ../libgaim/protocols/jabber/auth.c:496
+#: ../libpurple/protocols/jabber/auth.c:306
+#: ../libpurple/protocols/jabber/auth.c:492
+#: ../libpurple/protocols/jabber/auth.c:576
 msgid "Server does not use any supported authentication method"
 msgstr "Сервер не использует ни одного поддерживаемого метода аутентификации"
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:327
-#: ../libgaim/protocols/jabber/auth.c:449
-#: ../libgaim/protocols/jabber/auth.c:617
-#: ../libgaim/protocols/jabber/auth.c:751
-#: ../libgaim/protocols/jabber/auth.c:776
-#: ../libgaim/protocols/jabber/auth.c:795
-#: ../libgaim/protocols/jabber/jabber.c:113
+#: ../libpurple/protocols/jabber/auth.c:434
+#: ../libpurple/protocols/jabber/auth.c:527
+#: ../libpurple/protocols/jabber/auth.c:708
+#: ../libpurple/protocols/jabber/auth.c:842
+#: ../libpurple/protocols/jabber/auth.c:867
+#: ../libpurple/protocols/jabber/auth.c:886
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Неверный отклик от сервера."
 
-#: ../libgaim/protocols/jabber/auth.c:638
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "Invalid challenge from server"
 msgstr "Неверный запрос с сервера"
 
-#: ../libgaim/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:817
 msgid "SASL error"
 msgstr "Ошибка SASL"
 
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:789
-#: ../libgaim/protocols/sametime/sametime.c:4148
-#: ../libgaim/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/buddy.c:802
-#: ../libgaim/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:806
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "Имя"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:855
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:858
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "Адрес"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:854
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "Дополнительный адрес"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:862
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "Населённый пункт"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:866
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "Регион"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:870
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "Почтовый код"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:875
-#: ../libgaim/protocols/silc/silc.c:939
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "Страна"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:886
-#: ../libgaim/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "Телефон"
 
-#: ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:904
-#: ../libgaim/protocols/jabber/buddy.c:912
-#: ../libgaim/protocols/jabber/buddy.c:1570
-#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1566
+#: ../libpurple/protocols/silc/ops.c:1075
+#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "E-mail"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:927
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "Название организации"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:931
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "Отдел"
 
-#: ../libgaim/protocols/jabber/buddy.c:287
-#: ../libgaim/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "Должность"
 
-#: ../libgaim/protocols/jabber/buddy.c:288
-#: ../libgaim/protocols/jabber/buddy.c:823 ../libgaim/protocols/msn/msn.c:1609
-#: ../libgaim/protocols/oscar/oscar.c:3745
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "Дата рождения"
 
-#: ../libgaim/protocols/jabber/buddy.c:582
-#: ../libgaim/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3047
+#: ../pidgin/gtkprefs.c:680
+msgid "Description"
+msgstr "Описание"
+
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
 msgid "Edit Jabber vCard"
 msgstr "Изменить Jabber vCard"
 
-#: ../libgaim/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "Все нижеследующие пункты необязательны. Заполняйте по своему усмотрению."
 
-#: ../libgaim/protocols/jabber/buddy.c:654
-#: ../libgaim/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "Клиент"
 
-#: ../libgaim/protocols/jabber/buddy.c:658
-#: ../libgaim/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "Операционная система"
 
-#: ../libgaim/protocols/jabber/buddy.c:668
-#: ../libgaim/protocols/jabber/jabber.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:197
 msgid "Resource"
 msgstr "Ресурс"
 
-#: ../libgaim/protocols/jabber/buddy.c:670
-#: ../libgaim/protocols/jabber/jabber.c:1231
-#: ../libgaim/protocols/jabber/jabber.c:1241
-#: ../libgaim/protocols/jabber/jabber.c:1251
-#: ../libgaim/protocols/jabber/jabber.c:1261
-#: ../libgaim/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/jabber.c:1251
+#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/jabber/jabber.c:1281
 msgid "Priority"
 msgstr "Приоритет"
 
-#: ../libgaim/protocols/jabber/buddy.c:810
-#: ../libgaim/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Отчество"
 
-#: ../libgaim/protocols/jabber/buddy.c:843
-#: ../libgaim/protocols/jabber/jabber.c:820
-#: ../libgaim/protocols/oscar/oscar.c:3777
-#: ../libgaim/protocols/oscar/oscar.c:3790
-#: ../libgaim/protocols/qq/buddy_info.c:56
-#: ../libgaim/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:830
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Адрес"
 
-#: ../libgaim/protocols/jabber/buddy.c:850
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "Индекс"
 
-#: ../libgaim/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "Фотография"
 
-#: ../libgaim/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "Логотип"
 
-#: ../libgaim/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1346
 msgid "Un-hide From"
 msgstr "Показаться для"
 
-#: ../libgaim/protocols/jabber/buddy.c:1354
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Temporarily Hide From"
 msgstr "Временно скрыться от"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:1358
 msgid "Cancel Presence Notification"
 msgstr "Отменить уведомление о присутствии"
 
-#: ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libpurple/protocols/jabber/buddy.c:1365
 msgid "(Re-)Request authorization"
 msgstr "(Повторно) Запросить авторизацию"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libpurple/protocols/jabber/buddy.c:1374
 msgid "Unsubscribe"
 msgstr "Отписаться"
 
-#: ../libgaim/protocols/jabber/buddy.c:1411
-#: ../libgaim/protocols/jabber/jabber.c:1240
+#: ../libpurple/protocols/jabber/buddy.c:1407
+#: ../libpurple/protocols/jabber/jabber.c:1250
 msgid "Chatty"
 msgstr "Готов пообщаться"
 
-#: ../libgaim/protocols/jabber/buddy.c:1415 ../libgaim/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:160
 msgid "Extended Away"
 msgstr "Расширенный \"Отошёл\""
 
-#: ../libgaim/protocols/jabber/buddy.c:1417
-#: ../libgaim/protocols/jabber/jabber.c:1270
-#: ../libgaim/protocols/oscar/oscar.c:706
-#: ../libgaim/protocols/oscar/oscar.c:5774
-#: ../libgaim/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5723
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Не беспокоить"
 
-#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1558
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1566
-#: ../libgaim/protocols/jabber/buddy.c:1745
-#: ../libgaim/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: ../libgaim/protocols/jabber/buddy.c:1598
+#: ../libpurple/protocols/jabber/buddy.c:1594
 msgid "The following are the results of your search"
 msgstr "Следующее является результатами вашего поиска"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1673
+#: ../libpurple/protocols/jabber/buddy.c:1669
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1693
+#: ../libpurple/protocols/jabber/buddy.c:1689
 msgid "Directory Query Failed"
 msgstr "Не удалось опросить каталог"
 
-#: ../libgaim/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1690
 msgid "Could not query the directory server."
 msgstr "Не удалось опросить сервер каталога."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1728
+#: ../libpurple/protocols/jabber/buddy.c:1724
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Инструкции сервера: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1735
+#: ../libpurple/protocols/jabber/buddy.c:1731
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1755
-#: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3710
-#: ../libgaim/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "Адрес e-mail"
 
-#: ../libgaim/protocols/jabber/buddy.c:1764
-#: ../libgaim/protocols/jabber/buddy.c:1765
+#: ../libpurple/protocols/jabber/buddy.c:1760
+#: ../libpurple/protocols/jabber/buddy.c:1761
 msgid "Search for Jabber users"
 msgstr "Искать пользователей Jabber"
 
-#: ../libgaim/protocols/jabber/buddy.c:1779
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+msgid "Search"
+msgstr "Искать"
+
+#: ../libpurple/protocols/jabber/buddy.c:1777
 msgid "Invalid Directory"
 msgstr "Неверный каталог"
 
-#: ../libgaim/protocols/jabber/buddy.c:1796
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Enter a User Directory"
 msgstr "Введите каталог пользователей"
 
-#: ../libgaim/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1795
 msgid "Select a user directory to search"
 msgstr "Выберите каталог пользователей для поиска"
 
-#: ../libgaim/protocols/jabber/buddy.c:1800
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Search Directory"
 msgstr "Поиск в каталоге"
 
-#: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5242
-#: ../libgaim/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Комната:"
 
-#: ../libgaim/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../libgaim/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Имя:"
 
-#: ../libgaim/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s не является допустимым именем комнаты"
 
-#: ../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:507
+#: ../libpurple/protocols/jabber/jabber.c:519
 msgid "Unable to create socket"
 msgstr "Не удаётся создать сокет"
 
-#: ../libgaim/protocols/jabber/jabber.c:555
-#: ../libgaim/protocols/jabber/jabber.c:898
+#: ../libpurple/protocols/jabber/jabber.c:565
+#: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:626
+#: ../libpurple/protocols/jabber/jabber.c:636
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Регистрация %s@%s завершена успешно"
 
-#: ../libgaim/protocols/jabber/jabber.c:628
-#: ../libgaim/protocols/jabber/jabber.c:629
+#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Registration Successful"
 msgstr "Регистрация завершена успешно"
 
-#: ../libgaim/protocols/jabber/jabber.c:635
-#: ../libgaim/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:645
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
 
-#: ../libgaim/protocols/jabber/jabber.c:637
-#: ../libgaim/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:648
 msgid "Registration Failed"
 msgstr "Регистрация завершилась неудачно"
 
-#: ../libgaim/protocols/jabber/jabber.c:753
-#: ../libgaim/protocols/jabber/jabber.c:754
+#: ../libpurple/protocols/jabber/jabber.c:763
+#: ../libpurple/protocols/jabber/jabber.c:764
 msgid "Already Registered"
 msgstr "Уже зарегистрировано"
 
-#: ../libgaim/protocols/jabber/jabber.c:830
-#: ../libgaim/protocols/oscar/oscar.c:3779
-#: ../libgaim/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/jabber/jabber.c:840
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "Область"
 
-#: ../libgaim/protocols/jabber/jabber.c:835
+#: ../libpurple/protocols/jabber/jabber.c:845
 msgid "Postal code"
 msgstr "Почтовый код"
 
-#: ../libgaim/protocols/jabber/jabber.c:840
-#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
-#: ../libgaim/protocols/silc/util.c:555
+#: ../libpurple/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../libgaim/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/jabber/jabber.c:860
 msgid "Date"
 msgstr "Дата"
 
-#: ../libgaim/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Please fill out the information below to register your new account."
 msgstr "Заполните нижеследующие поля для регистрации новой учётной записи."
 
-#: ../libgaim/protocols/jabber/jabber.c:861
-#: ../libgaim/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:871
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register New Jabber Account"
 msgstr "Зарегистрировать новую учётную запись Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1030
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1489
+msgid "Register"
+msgstr "Зарегистрировать"
+
+#: ../libpurple/protocols/jabber/jabber.c:1044
 msgid "Initializing Stream"
 msgstr "Инициализация потока"
 
-#: ../libgaim/protocols/jabber/jabber.c:1035
-#: ../libgaim/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1049
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Аутентификация"
 
-#: ../libgaim/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1058
 msgid "Re-initializing Stream"
 msgstr "Повторная инициализация потока"
 
-#: ../libgaim/protocols/jabber/jabber.c:1114
-#: ../libgaim/protocols/jabber/jabber.c:1484
-#: ../libgaim/protocols/jabber/jabber.c:1525
-#: ../libgaim/protocols/jabber/jabber.c:1559
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:5563
+#: ../libpurple/protocols/jabber/jabber.c:1124
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5517
 msgid "Not Authorized"
 msgstr "Не авторизован"
 
-#: ../libgaim/protocols/jabber/jabber.c:1156
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "Both"
 msgstr "Обе"
 
-#: ../libgaim/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1163
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "To"
 msgstr "Для"
 
-#: ../libgaim/protocols/jabber/jabber.c:1165
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "Нет"
+
+#: ../libpurple/protocols/jabber/jabber.c:1180
 msgid "Subscription"
 msgstr "Подписка"
 
-#: ../libgaim/protocols/jabber/jabber.c:1300
+#: ../libpurple/protocols/jabber/jabber.c:1310
 msgid "Password Changed"
 msgstr "Пароль изменён"
 
-#: ../libgaim/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1311
 msgid "Your password has been changed."
 msgstr "Пароль был изменён."
 
-#: ../libgaim/protocols/jabber/jabber.c:1305
-#: ../libgaim/protocols/jabber/jabber.c:1306
+#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1316
 msgid "Error changing password"
 msgstr "Ошибка изменения пароля"
 
-#: ../libgaim/protocols/jabber/jabber.c:1362
+#: ../libpurple/protocols/jabber/jabber.c:1372
 msgid "Password (again)"
 msgstr "Пароль (ещё раз)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1367
-#: ../libgaim/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Change Jabber Password"
 msgstr "Изменить пароль Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1378
 msgid "Please enter your new password"
 msgstr "Введите новый пароль"
 
-#: ../libgaim/protocols/jabber/jabber.c:1378
-#: ../libgaim/protocols/oscar/oscar.c:6369
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "Установить пользовательскую информацию..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1383
-#: ../libgaim/protocols/oscar/oscar.c:6380
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1395
+#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "Изменить пароль..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1400
 msgid "Search for Users..."
 msgstr "Искать пользователей..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1464
+#: ../libpurple/protocols/jabber/jabber.c:1478
 msgid "Bad Request"
 msgstr "Неверный запрос"
 
-#: ../libgaim/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1480
 msgid "Conflict"
 msgstr "Конфликт"
 
-#: ../libgaim/protocols/jabber/jabber.c:1468
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Feature Not Implemented"
 msgstr "Функция не реализована"
 
-#: ../libgaim/protocols/jabber/jabber.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Forbidden"
 msgstr "Запрещено"
 
-#: ../libgaim/protocols/jabber/jabber.c:1472
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Gone"
 msgstr "Ушёл"
 
-#: ../libgaim/protocols/jabber/jabber.c:1474
-#: ../libgaim/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Internal Server Error"
 msgstr "Внутренняя ошибка сервера"
 
-#: ../libgaim/protocols/jabber/jabber.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Item Not Found"
 msgstr "Элемент не найден"
 
-#: ../libgaim/protocols/jabber/jabber.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:1492
 msgid "Malformed Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1480
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Not Acceptable"
 msgstr "Недопустимо"
 
-#: ../libgaim/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Not Allowed"
 msgstr "Не разрешено"
 
-#: ../libgaim/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Payment Required"
 msgstr "Требуется плата"
 
-#: ../libgaim/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "Recipient Unavailable"
 msgstr "Получатель недоступен"
 
-#: ../libgaim/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Registration Required"
 msgstr "Требуется регистрация"
 
-#: ../libgaim/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1508
 msgid "Remote Server Not Found"
 msgstr "Удалённый сервер не найден"
 
-#: ../libgaim/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Remote Server Timeout"
 msgstr "Истекло время ожидания удалённого сервера"
 
-#: ../libgaim/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Server Overloaded"
 msgstr "Сервер перегружен"
 
-#: ../libgaim/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Service Unavailable"
 msgstr "Служба недоступна"
 
-#: ../libgaim/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Subscription Required"
 msgstr "Требуется подписка"
 
-#: ../libgaim/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Unexpected Request"
 msgstr "Непредвиденный запрос"
 
-#: ../libgaim/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Authorization Aborted"
 msgstr "Авторизация прервана"
 
-#: ../libgaim/protocols/jabber/jabber.c:1513
+#: ../libpurple/protocols/jabber/jabber.c:1527
 msgid "Incorrect encoding in authorization"
 msgstr "Неправильная кодировка в авторизации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Invalid authzid"
 msgstr "Неверный идентификатор авторизации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1533
 msgid "Invalid Authorization Mechanism"
 msgstr "Неверный механизм авторизации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Authorization mechanism too weak"
 msgstr "Механизм авторизации слишком слаб"
 
-#: ../libgaim/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Temporary Authentication Failure"
 msgstr "Временная ошибка аутентификации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Authentication Failure"
 msgstr "Ошибка аутентификации"
 
-#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Bad Format"
 msgstr "Неверный формат"
 
-#: ../libgaim/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Bad Namespace Prefix"
 msgstr "Неверный префикс пространства имён"
 
-#: ../libgaim/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1555
 msgid "Resource Conflict"
 msgstr "Конфликт ресурсов"
 
-#: ../libgaim/protocols/jabber/jabber.c:1541
-#: ../libgaim/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Истекло время ожидания соединения"
 
-#: ../libgaim/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Host Gone"
 msgstr "Узел ушёл"
 
-#: ../libgaim/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1561
 msgid "Host Unknown"
 msgstr "Узел неизвестен"
 
-#: ../libgaim/protocols/jabber/jabber.c:1547
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Improper Addressing"
 msgstr "Неправильная адресация"
 
-#: ../libgaim/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Invalid ID"
 msgstr "Неверный ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Invalid Namespace"
 msgstr "Неверное пространство имён"
 
-#: ../libgaim/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid XML"
 msgstr "Неверный XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Non-matching Hosts"
 msgstr "Несочетаемые узлы"
 
-#: ../libgaim/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Policy Violation"
 msgstr "Нарушение правил"
 
-#: ../libgaim/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Remote Connection Failed"
 msgstr "Не удалось установить удалённое соединение"
 
-#: ../libgaim/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Resource Constraint"
 msgstr "Недостаток ресурсов"
 
-#: ../libgaim/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Restricted XML"
 msgstr "Ограниченный XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "See Other Host"
 msgstr "Обратитесь к другому узлу"
 
-#: ../libgaim/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "System Shutdown"
 msgstr "Выключение системы"
 
-#: ../libgaim/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "Undefined Condition"
 msgstr "Неопределённое состояние"
 
-#: ../libgaim/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "Unsupported Encoding"
 msgstr "Неподдерживаемая кодировка"
 
-#: ../libgaim/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Unsupported Stanza Type"
 msgstr "Неподдерживаемый тип строфы"
 
-#: ../libgaim/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Version"
 msgstr "Неподдерживаемая версия"
 
-#: ../libgaim/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "XML Not Well Formed"
 msgstr "XML не сформирован должным образом"
 
-#: ../libgaim/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Stream Error"
 msgstr "Ошибка потока"
 
-#: ../libgaim/protocols/jabber/jabber.c:1650
+#: ../libpurple/protocols/jabber/jabber.c:1666
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Не удаётся выгнать пользователя %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1691
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1694
+#: ../libpurple/protocols/jabber/jabber.c:1710
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1717
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/jabber/jabber.c:1770
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Не удаётся удалить пользователя %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1785
+#: ../libpurple/protocols/jabber/jabber.c:1801
 msgid "config:  Configure a chat room."
 msgstr "config:  Настроить комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1789
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Настроить комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/jabber/jabber.c:1814
 msgid "part [room]:  Leave the room."
 msgstr "part [комната]:  Покинуть комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1819
 msgid "register:  Register with a chat room."
 msgstr "register:  Зарегистрировать комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1825
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [новая тема]:  Просмотреть или изменить тему."
 
-#: ../libgaim/protocols/jabber/jabber.c:1815
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;пользователь&gt; [комната]:  Выгнать пользователя из комнаты."
 
-#: ../libgaim/protocols/jabber/jabber.c:1821
+#: ../libpurple/protocols/jabber/jabber.c:1837
 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:1827
+#: ../libpurple/protocols/jabber/jabber.c:1843
 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:1833
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;пользователь&gt; [сообщение]:  Пригласить пользователя в комнату."
 
-#: ../libgaim/protocols/jabber/jabber.c:1839
+#: ../libpurple/protocols/jabber/jabber.c:1855
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;комната&gt; [сервер]:  Присоединиться к чату на этом сервере."
 
-#: ../libgaim/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;пользователь&gt; [комната]:  Удалить пользователя из комнаты."
 
-#: ../libgaim/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1866
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -8766,73 +4819,73 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1967
-#: ../libgaim/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
 msgid "Jabber Protocol Plugin"
 msgstr "Модуль протокола Jabber"
 
-#: ../libgaim/protocols/jabber/jabber.c:1995
+#: ../libpurple/protocols/jabber/libxmpp.c:200
 msgid "Force old (port 5223) SSL"
 msgstr "Принудительно использовать старый (порт 5223) SSL"
 
-#: ../libgaim/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:205
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
 
-#: ../libgaim/protocols/jabber/jabber.c:2005
-#: ../libgaim/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Connect port"
 msgstr "Соединяться на порт"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:2009
-#: ../libgaim/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "Соединяться с сервером"
 
-#: ../libgaim/protocols/jabber/message.c:117
+#: ../libpurple/protocols/jabber/message.c:155
 #, c-format
 msgid "Message from %s"
 msgstr "Сообщение от %s"
 
-#: ../libgaim/protocols/jabber/message.c:181
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s установил тему: %s"
 
-#: ../libgaim/protocols/jabber/message.c:183
+#: ../libpurple/protocols/jabber/message.c:221
 #, c-format
 msgid "The topic is: %s"
 msgstr "Тема: %s"
 
-#: ../libgaim/protocols/jabber/message.c:233
+#: ../libpurple/protocols/jabber/message.c:269
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Не удалось доставить сообщение для %s: %s"
 
-#: ../libgaim/protocols/jabber/message.c:236
+#: ../libpurple/protocols/jabber/message.c:272
 msgid "Jabber Message Error"
 msgstr "Ошибка сообщения Jabber"
 
-#: ../libgaim/protocols/jabber/message.c:316
+#: ../libpurple/protocols/jabber/message.c:352
 #, c-format
 msgid " (Code %s)"
 msgstr " (Код %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:192
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr "Ошибка разбора XML"
 
-#: ../libgaim/protocols/jabber/presence.c:280
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/presence.c:354
-#: ../libgaim/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "Создать новую комнату"
 
-#: ../libgaim/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -8840,40 +4893,41 @@
 "Вы создаёте новую комнату. Хотите настроить её или принять установки по "
 "умолчанию?"
 
-#: ../libgaim/protocols/jabber/presence.c:359
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "_Настроить комнату"
 
-#: ../libgaim/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "_Принять установки по умолчанию"
 
-#: ../libgaim/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "Ошибка в чате %s"
 
-#: ../libgaim/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Ошибка присоединения к чату %s"
 
-#: ../libgaim/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Не удаётся отправить файл для %s, пользователь не поддерживает приём файлов"
 
-#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:766
+#: ../libpurple/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Не удалось отправить файл"
 
-#: ../libgaim/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
 
-#: ../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. "
@@ -8882,7 +4936,7 @@
 "%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 "
@@ -8891,582 +4945,597 @@
 "%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)"
-
-#: ../libgaim/protocols/msn/error.c:42
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
+msgstr "Синтаксическая ошибка (вероятно, ошибка в клиенте)"
+
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Неверный адрес e-mail"
 
-#: ../libgaim/protocols/msn/error.c:45
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
 msgstr "Пользователь не существует"
 
-#: ../libgaim/protocols/msn/error.c:49
+#: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "Пропущено полное доменное имя"
 
-#: ../libgaim/protocols/msn/error.c:52
+#: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
 msgstr "Уже в сети"
 
-#: ../libgaim/protocols/msn/error.c:55
+#: ../libpurple/protocols/msn/error.c:59
 msgid "Invalid screen name"
 msgstr "Неверный идентификатор пользователя"
 
-#: ../libgaim/protocols/msn/error.c:58
+#: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
 msgstr "Неверное дружеское имя"
 
-#: ../libgaim/protocols/msn/error.c:61
+#: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
 msgstr "Список полон"
 
-#: ../libgaim/protocols/msn/error.c:64
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "Уже там"
 
-#: ../libgaim/protocols/msn/error.c:67
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
 msgstr "Отсутствует в списке"
 
-#: ../libgaim/protocols/msn/error.c:70
-#: ../libgaim/protocols/zephyr/zephyr.c:757
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
 msgstr "Пользователь не в сети"
 
-#: ../libgaim/protocols/msn/error.c:73
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr "Уже в этом режиме"
 
-#: ../libgaim/protocols/msn/error.c:76
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
 msgstr "Уже в противоположном списке"
 
-#: ../libgaim/protocols/msn/error.c:79
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
 msgstr "Слишком много групп"
 
-#: ../libgaim/protocols/msn/error.c:82
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
 msgstr "Неверная группа"
 
-#: ../libgaim/protocols/msn/error.c:85
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
 msgstr "Пользователь не в группе"
 
-#: ../libgaim/protocols/msn/error.c:88
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
 msgstr "Имя группы слишком велико"
 
-#: ../libgaim/protocols/msn/error.c:91
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Нельзя удалить нулевую группу"
 
-#: ../libgaim/protocols/msn/error.c:95
+#: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Попытка добавления пользователя в несуществующую группу"
 
-#: ../libgaim/protocols/msn/error.c:99
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
 msgstr "Ошибка коммутационной панели"
 
-#: ../libgaim/protocols/msn/error.c:102
+#: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
 msgstr "Не удалось передать уведомление"
 
-#: ../libgaim/protocols/msn/error.c:106
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr "Необходимые поля пропущены"
 
-#: ../libgaim/protocols/msn/error.c:109
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
 msgstr "Слишком много попаданий в FND"
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr "Не в сети"
 
-#: ../libgaim/protocols/msn/error.c:116
+#: ../libpurple/protocols/msn/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Служба временно недоступна"
 
-#: ../libgaim/protocols/msn/error.c:119
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
 msgstr "Ошибка сервера базы данных"
 
-#: ../libgaim/protocols/msn/error.c:122
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
 msgstr "Команда отключена"
 
-#: ../libgaim/protocols/msn/error.c:125
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
 msgstr "Ошибка файловой операции"
 
-#: ../libgaim/protocols/msn/error.c:128
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
 msgstr "Ошибка выделения памяти"
 
-#: ../libgaim/protocols/msn/error.c:131
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "На сервер отправлено неверное значение CHL"
 
-#: ../libgaim/protocols/msn/error.c:135
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
 msgstr "Сервер занят"
 
-#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
-#: ../libgaim/protocols/msn/error.c:206
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
 msgid "Server unavailable"
 msgstr "Сервер недоступен"
 
-#: ../libgaim/protocols/msn/error.c:141
+#: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:144
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
 msgstr "Ошибка соединения с базой данных"
 
-#: ../libgaim/protocols/msn/error.c:148
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
 msgstr "Ошибка создания соединения"
 
-#: ../libgaim/protocols/msn/error.c:159
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Параметры CVR неизвестны или недопустимы"
 
-#: ../libgaim/protocols/msn/error.c:162
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
 msgstr "Не удаётся записать"
 
-#: ../libgaim/protocols/msn/error.c:165
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
 msgstr "Перегрузка сессии"
 
-#: ../libgaim/protocols/msn/error.c:168
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
 msgstr "Пользователь слишком активен"
 
-#: ../libgaim/protocols/msn/error.c:171
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
 msgstr "Слишком много сессий"
 
-#: ../libgaim/protocols/msn/error.c:174
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
 msgstr "Паспорт не проверен"
 
-#: ../libgaim/protocols/msn/error.c:177
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:180
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr "Не предусмотрено"
 
-#: ../libgaim/protocols/msn/error.c:185
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:194
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
 msgstr "Сервер слишком занят"
 
-#: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1355
-#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
-#: ../libgaim/proxy.c:1340
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1363
+#: ../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 ""
 
-#: ../libgaim/protocols/msn/error.c:217
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Паспортная учётная запись ещё не проверена"
 
-#: ../libgaim/protocols/msn/error.c:220
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
 msgstr "Неверный билет"
 
-#: ../libgaim/protocols/msn/error.c:224
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Неизвестный код ошибки %d"
 
-#: ../libgaim/protocols/msn/error.c:236
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Ошибка MSN: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:111
+#: ../libpurple/protocols/msn/msn.c:112
 msgid "You have just sent a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:136
+#: ../libpurple/protocols/msn/msn.c:137
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше новое дружеское имя MSN слишком велико."
 
-#: ../libgaim/protocols/msn/msn.c:244
+#: ../libpurple/protocols/msn/msn.c:245
 msgid "Set your friendly name."
 msgstr "Введите ваше дружеское имя."
 
-#: ../libgaim/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:246
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Это имя, под которым вас будут видеть другие пользователи MSN."
 
-#: ../libgaim/protocols/msn/msn.c:261
+#: ../libpurple/protocols/msn/msn.c:264
 msgid "Set your home phone number."
 msgstr "Введите номер вашего домашнего телефона."
 
-#: ../libgaim/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:281
 msgid "Set your work phone number."
 msgstr "Введите номер вашего рабочего телефона."
 
-#: ../libgaim/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:298
 msgid "Set your mobile phone number."
 msgstr "Введите номер вашего мобильного телефона."
 
-#: ../libgaim/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:313
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:314
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:309
+#: ../libpurple/protocols/msn/msn.c:320
 msgid "Allow"
 msgstr "Разрешить"
 
-#: ../libgaim/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:321
 msgid "Disallow"
 msgstr "Запретить"
 
-#: ../libgaim/protocols/msn/msn.c:326
+#: ../libpurple/protocols/msn/msn.c:337
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:363
 msgid "Send a mobile message."
 msgstr "Отправить мобильное сообщение."
 
-#: ../libgaim/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:365
 msgid "Page"
 msgstr "Страница"
 
-#: ../libgaim/protocols/msn/msn.c:553
+#: ../libpurple/protocols/msn/msn.c:538
 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:568 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3491
 msgid "Be Right Back"
 msgstr "Скоро вернусь"
 
-#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2857
-#: ../libgaim/protocols/novell/novell.c:2987
-#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2858
-#: ../libgaim/protocols/yahoo/yahoo.c:3463
+#: ../libpurple/protocols/msn/msn.c:572 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
 msgid "Busy"
 msgstr "Занят"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libpurple/protocols/msn/msn.c:576
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "On the Phone"
 msgstr "Разговариваю по телефону"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/msn/msn.c:580
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo.c:3512
 msgid "Out to Lunch"
 msgstr "Пошёл перекусить"
 
-#: ../libgaim/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:608
 msgid "Set Friendly Name..."
 msgstr "Ввести дружеское имя..."
 
-#: ../libgaim/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:613
 msgid "Set Home Phone Number..."
 msgstr "Ввести номер домашнего телефона..."
 
-#: ../libgaim/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:617
 msgid "Set Work Phone Number..."
 msgstr "Ввести номер рабочего телефона..."
 
-#: ../libgaim/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:621
 msgid "Set Mobile Phone Number..."
 msgstr "Ввести номер мобильного телефона..."
 
-#: ../libgaim/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:627
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Разрешить/запретить мобильные устройства..."
 
-#: ../libgaim/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Разрешить/запретить мобильные страницы..."
 
-#: ../libgaim/protocols/msn/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:642
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:677
+#: ../libpurple/protocols/msn/msn.c:666
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3443
+#: ../libpurple/protocols/msn/msn.c:676
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Создать _чат"
 
-#: ../libgaim/protocols/msn/msn.c:725
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL. "
-"За дополнительной информацией обращайтесь на http://gaim.sf.net/faq-ssl.php."
-
-#: ../libgaim/protocols/msn/msn.c:752
+#: ../libpurple/protocols/msn/msn.c:714
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+"Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL."
+
+#: ../libpurple/protocols/msn/msn.c:739
 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:1459 ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Ошибка загрузки профиля"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3751
-#: ../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:1530 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:448
+msgid "General"
+msgstr "Основные"
+
+#: ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../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:1539
+#: ../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:1540
+#: ../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:1545 ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 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:1551 ../libpurple/protocols/msn/msn.c:1671
+#: ../libpurple/protocols/msn/msn.c:1677 ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1692 ../libpurple/protocols/msn/msn.c:1699
 msgid "A Little About Me"
 msgstr "Немного о себе"
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1568
 msgid "Social"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1572
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Брачный статус"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Interests"
 msgstr "Интересы"
 
-#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Pets"
 msgstr "Домашние животные"
 
-#: ../libgaim/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Hometown"
 msgstr "Родной город"
 
-#: ../libgaim/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Places Lived"
 msgstr "Места проживания"
 
-#: ../libgaim/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Fashion"
 msgstr "Мода"
 
-#: ../libgaim/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Humor"
 msgstr "Юмор"
 
-#: ../libgaim/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1577
 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:1578 ../libpurple/protocols/msn/msn.c:1759
+#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Любимая цитата"
 
-#: ../libgaim/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Contact Info"
 msgstr "Контактная информация"
 
-#: ../libgaim/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Personal"
 msgstr "Персональное"
 
-#: ../libgaim/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Significant Other"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: ../libgaim/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1601
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: ../libgaim/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Personal Mobile"
 msgstr "Персональный мобильный телефон"
 
-#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Home Fax"
 msgstr "Домашний факс"
 
-#: ../libgaim/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal E-Mail"
 msgstr "Персональный e-mail"
 
-#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1606
 msgid "Personal IM"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1608
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libgaim/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Work"
 msgstr "Работа"
 
-#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Название работы"
 
-#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "Компания"
 
-#: ../libgaim/protocols/msn/msn.c:1630
-#: ../libgaim/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Отдел"
 
-#: ../libgaim/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Profession"
 msgstr "Профессия"
 
-#: ../libgaim/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone"
 msgstr "Рабочий телефон"
 
-#: ../libgaim/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Work Phone 2"
 msgstr "Рабочий телефон 2"
 
-#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "Рабочий адрес"
 
-#: ../libgaim/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Mobile"
 msgstr "Рабочий мобильный телефон"
 
-#: ../libgaim/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Pager"
 msgstr "Рабочий пейджер"
 
-#: ../libgaim/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work Fax"
 msgstr "Рабочий факс"
 
-#: ../libgaim/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work E-Mail"
 msgstr "Рабочий e-mail"
 
-#: ../libgaim/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Work IM"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1638
 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:1708 ../libpurple/protocols/msn/msn.c:1714
+#: ../libpurple/protocols/msn/msn.c:1721 ../libpurple/protocols/msn/msn.c:1728
 msgid "Favorite Things"
 msgstr "Любимые вещи"
 
-#: ../libgaim/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1773
 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:1784
+#: ../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:1805
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1806
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1812
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-
-#: ../libgaim/protocols/msn/msn.c:1820
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1810
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1818
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "URL профиля"
 
@@ -9480,96 +5549,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
+#: ../libpurple/protocols/msn/msn.c:2104 ../libpurple/protocols/msn/msn.c:2106
 msgid "MSN Protocol Plugin"
 msgstr "Модуль протокола MSN"
 
-#: ../libgaim/protocols/msn/msn.c:2065
+#: ../libpurple/protocols/msn/msn.c:2140
 msgid "Use HTTP Method"
 msgstr "Использовать метод HTTP"
 
-#: ../libgaim/protocols/msn/msn.c:2070
+#: ../libpurple/protocols/msn/msn.c:2145
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:2078
+#: ../libpurple/protocols/msn/msn.c:2153
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../libgaim/protocols/msn/nexus.c:146
-#: ../libgaim/protocols/msn/servconn.c:133
-#: ../libgaim/protocols/qq/qq_proxy.c:242
-#: ../libgaim/protocols/qq/qq_proxy.c:321
-#: ../libgaim/protocols/qq/qq_proxy.c:366
-#: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "Не удаётся установить соединение"
 
-#: ../libgaim/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s не является допустимой группой."
 
-#: ../libgaim/protocols/msn/notification.c:184
-#: ../libgaim/protocols/msn/notification.c:532
-#: ../libgaim/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
-#: ../libgaim/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s на %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Не удаётся добавить пользователя на %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:1303
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -9587,16 +5656,17 @@
 "sign in."
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../libgaim/protocols/msn/servconn.c:135
+msgstr[2] ""
+
+#: ../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"
@@ -9605,217 +5675,213 @@
 "Ошибка соединения от сервера %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:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Вы подключены из другого места."
 
-#: ../libgaim/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Серверы MSN временно недоступны. Повторите попытку позже."
 
-#: ../libgaim/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Серверы MSN временно выключаются."
 
-#: ../libgaim/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Не удаётся аутентифицировать: %s"
 
-#: ../libgaim/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Ваш список собеседников MSN временно недоступен. Повторите попытку позже."
 
-#: ../libgaim/protocols/msn/session.c:345
-#: ../libgaim/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Согласование"
 
-#: ../libgaim/protocols/msn/session.c:346
-msgid "Transferring"
-msgstr "Передача"
-
-#: ../libgaim/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Запуск аутентификации"
 
-#: ../libgaim/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Получение данных"
 
-#: ../libgaim/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Отправка данных"
 
-#: ../libgaim/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Загрузка списка собеседников"
 
-#: ../libgaim/protocols/msn/state.c:34
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Отошёл от компьютера"
 
-#: ../libgaim/protocols/msn/state.c:35
+#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Разговариваю по телефону"
 
-#: ../libgaim/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Пошёл перекусить"
 
-#: ../libgaim/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Сообщение могло быть не отправлено, так как истекло время ожидания:"
 
-#: ../libgaim/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Сообщение не может быть отправлено, не разрешено при статусе \"Невидимый\":"
 
-#: ../libgaim/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Сообщение не может быть отправлено, так как пользователь не в сети:"
 
-#: ../libgaim/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "Сообщение не может быть отправлено, так как произошла ошибка соединения:"
 
-#: ../libgaim/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 "Сообщение не может быть отправлено, так как отправка происходит слишком "
 "быстро:"
 
-#: ../libgaim/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Сообщение не может быть отправлено, так как произошла ошибка коммутационной "
 "панели:"
 
-#: ../libgaim/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Сообщение могло быть не отправлено, так как произошла неизвестная ошибка:"
 
-#: ../libgaim/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s добавил вас в свой список собеседников."
 
-#: ../libgaim/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s удалил вас из своего списка собеседников."
 
-#: ../libgaim/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Не удаётся добавить \"%s\"."
 
-#: ../libgaim/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr "Указанный идентификатор пользователя недопустим."
 
-#: ../libgaim/protocols/novell/nmuser.c:1879
+#: ../libpurple/protocols/novell/nmuser.c:1878
 msgid "Required parameters not passed in"
 msgstr "Требуемые параметры не переданы"
 
-#: ../libgaim/protocols/novell/nmuser.c:1882
+#: ../libpurple/protocols/novell/nmuser.c:1881
 msgid "Unable to write to network"
 msgstr "Не удаётся писать в сеть"
 
-#: ../libgaim/protocols/novell/nmuser.c:1885
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "Unable to read from network"
 msgstr "Не удаётся читать из сети"
 
-#: ../libgaim/protocols/novell/nmuser.c:1888
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Error communicating with server"
 msgstr "Ошибка связи с сервером"
 
-#: ../libgaim/protocols/novell/nmuser.c:1892
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Conference not found"
 msgstr "Конференция не найдена"
 
-#: ../libgaim/protocols/novell/nmuser.c:1895
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Conference does not exist"
 msgstr "Конференция не существует"
 
-#: ../libgaim/protocols/novell/nmuser.c:1899
+#: ../libpurple/protocols/novell/nmuser.c:1898
 msgid "A folder with that name already exists"
 msgstr "Папка с таким именем уже существует"
 
-#: ../libgaim/protocols/novell/nmuser.c:1902
+#: ../libpurple/protocols/novell/nmuser.c:1901
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: ../libgaim/protocols/novell/nmuser.c:1906
+#: ../libpurple/protocols/novell/nmuser.c:1905
 msgid "Password has expired"
 msgstr "Срок действия пароля истёк"
 
-#: ../libgaim/protocols/novell/nmuser.c:1909
+#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
-#: ../libgaim/protocols/novell/nmuser.c:1912
+#: ../libpurple/protocols/novell/nmuser.c:1911
 msgid "User not found"
 msgstr "Пользователь не найден"
 
-#: ../libgaim/protocols/novell/nmuser.c:1915
+#: ../libpurple/protocols/novell/nmuser.c:1914
 msgid "Account has been disabled"
 msgstr "Учётная запись была отключена"
 
-#: ../libgaim/protocols/novell/nmuser.c:1918
+#: ../libpurple/protocols/novell/nmuser.c:1917
 msgid "The server could not access the directory"
 msgstr "Сервер не смог получить доступ к каталогу"
 
-#: ../libgaim/protocols/novell/nmuser.c:1921
+#: ../libpurple/protocols/novell/nmuser.c:1920
 msgid "Your system administrator has disabled this operation"
 msgstr "Ваш системный администратор отключил эту операцию"
 
-#: ../libgaim/protocols/novell/nmuser.c:1924
+#: ../libpurple/protocols/novell/nmuser.c:1923
 msgid "The server is unavailable; try again later"
 msgstr "Сервер недоступен; повторите попытку позже"
 
-#: ../libgaim/protocols/novell/nmuser.c:1927
+#: ../libpurple/protocols/novell/nmuser.c:1926
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Нельзя добавить контакт в ту же папку дважды"
 
-#: ../libgaim/protocols/novell/nmuser.c:1930
+#: ../libpurple/protocols/novell/nmuser.c:1929
 msgid "Cannot add yourself"
 msgstr "Нельзя добавить себя самого"
 
-#: ../libgaim/protocols/novell/nmuser.c:1933
+#: ../libpurple/protocols/novell/nmuser.c:1932
 msgid "Master archive is misconfigured"
 msgstr "Главный архив не настроен"
 
-#: ../libgaim/protocols/novell/nmuser.c:1937
+#: ../libpurple/protocols/novell/nmuser.c:1936
 msgid "Incorrect screen name or password"
 msgstr "Неправильный идентификатор пользователя или пароль"
 
-#: ../libgaim/protocols/novell/nmuser.c:1940
+#: ../libpurple/protocols/novell/nmuser.c:1939
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "Не удалось узнать узел введённого идентификатора пользователя"
 
-#: ../libgaim/protocols/novell/nmuser.c:1943
+#: ../libpurple/protocols/novell/nmuser.c:1942
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -9823,31 +5889,31 @@
 "Ваша учётная запись была отключена, так как было введено слишком много "
 "неправильных паролей"
 
-#: ../libgaim/protocols/novell/nmuser.c:1946
+#: ../libpurple/protocols/novell/nmuser.c:1945
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Вы не можете добавить одну и ту же персону в беседу дважды"
 
-#: ../libgaim/protocols/novell/nmuser.c:1950
+#: ../libpurple/protocols/novell/nmuser.c:1949
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Вы достигли предела допустимого количества контактов"
 
-#: ../libgaim/protocols/novell/nmuser.c:1953
+#: ../libpurple/protocols/novell/nmuser.c:1952
 msgid "You have entered an incorrect screen name"
 msgstr "Вы ввели неправильный идентификатор пользователя"
 
-#: ../libgaim/protocols/novell/nmuser.c:1956
+#: ../libpurple/protocols/novell/nmuser.c:1955
 msgid "An error occurred while updating the directory"
 msgstr "Произошла ошибка при обновлении каталога"
 
-#: ../libgaim/protocols/novell/nmuser.c:1959
+#: ../libpurple/protocols/novell/nmuser.c:1958
 msgid "Incompatible protocol version"
 msgstr "Несовместимая версия протокола"
 
-#: ../libgaim/protocols/novell/nmuser.c:1962
+#: ../libpurple/protocols/novell/nmuser.c:1961
 msgid "The user has blocked you"
 msgstr "Пользователь заблокировал вас"
 
-#: ../libgaim/protocols/novell/nmuser.c:1965
+#: ../libpurple/protocols/novell/nmuser.c:1964
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -9855,56 +5921,56 @@
 "Эта ознакомительная версия не позволяет входить одновременно более, чем "
 "десяти пользователям"
 
-#: ../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 "
@@ -9913,7 +5979,7 @@
 "Не удаётся переместить пользователя %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 "
@@ -9922,107 +5988,107 @@
 "Не удаётся добавить %s в список собеседников. Ошибка создания папки в списке "
 "на стороне сервера (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Не удалось получить подробности для пользователя %s (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:751
-#: ../libgaim/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Не удаётся добавить пользователя в список конфиденциальности (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Не удаётся добавить %s в список запрета (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Не удаётся добавить %s в список допуска (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Не удаётся удалить %s из списка конфиденциальности (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 "Не удаётся изменить установки конфиденциальности на стороне сервера (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Не удаётся создать конференцию (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Ошибка связи с сервером. Закрытие соединения."
 
-#: ../libgaim/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Номер телефона"
 
-#: ../libgaim/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Звание"
 
-#: ../libgaim/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1505
-#: ../libgaim/protocols/sametime/sametime.c:4142
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Пользовательский ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. gaim_notify_user_info_add_pair(user_info, tag, value);
+#. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libgaim/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Полное Имя"
 
-#: ../libgaim/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Конференция GroupWise %d"
 
-#: ../libgaim/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Не удаётся установить SSL-соединение с сервером."
 
-#: ../libgaim/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-#: ../libgaim/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Не удаётся соединиться с сервером."
 
-#: ../libgaim/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Ожидание отклика..."
 
-#: ../libgaim/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s был приглашён к этой беседе."
 
-#: ../libgaim/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Приглашение к беседе"
 
-#: ../libgaim/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -10033,16 +6099,16 @@
 "\n"
 "Отправлено: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Хотите присоединиться к беседе?"
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Вы были отключены, так как вошли с другой машины."
 
-#: ../libgaim/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -10051,10 +6117,10 @@
 "отправили."
 
 #. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
+#. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -10062,11 +6128,11 @@
 "Не удаётся соединиться с сервером. Введите адрес сервера, с которым вы "
 "хотите соединиться."
 
-#: ../libgaim/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Ошибка. Поддержка SSL не установлена."
 
-#: ../libgaim/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Эта конференция была закрыта. Больше не может быть отправлено ни одного "
@@ -10082,33 +6148,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3548
-#: ../libgaim/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Модуль протокола Novell GroupWise Messenger"
 
-#: ../libgaim/protocols/novell/novell.c:3569
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Адрес сервера"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Порт сервера"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:379
-#: ../libgaim/protocols/yahoo/yahoo.c:2263
-#: ../libgaim/protocols/yahoo/yahoo.c:2421
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
-#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
-#: ../libgaim/proxy.c:1413
+#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/yahoo/yahoo.c:2294
+#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
+#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
 msgid "Server closed the connection."
 msgstr "Сервер разорвал соединение."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:381
-#: ../libgaim/protocols/yahoo/yahoo.c:2257
-#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
-#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
-#: ../libgaim/proxy.c:1425
+#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/yahoo/yahoo.c:2288
+#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -10117,13 +6183,14 @@
 "Соединение с сервером потеряно:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
-#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
-#: ../libgaim/proxy.c:1438
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
+#: ../libpurple/proxy.c:1449
 msgid "Received invalid data on connection with server."
 msgstr "При соединении с сервером получены недопустимые данные."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/oscar/flap_connection.c:386
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -10142,19 +6209,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libaim.c:112
-#: ../libgaim/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Модуль протокола AIM"
 
-#: ../libgaim/protocols/oscar/libaim.c:140
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Всегда использовать прокси-сервер AIM/ICQ для передачи файлов\n"
-"(медленнее, но не раскрывает ваш IP-адрес)"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10165,152 +6224,144 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libicq.c:112
-#: ../libgaim/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Модуль протокола ICQ"
 
-#: ../libgaim/protocols/oscar/libicq.c:139
-#: ../libgaim/protocols/yahoo/yahoo.c:3945
-#: ../libgaim/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4098
+#: ../libpurple/protocols/zephyr/zephyr.c:2996
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: ../libgaim/protocols/oscar/libicq.c:143
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Всегда использовать прокси-сервер ICQ для передачи файлов\n"
-"(медленнее, но не раскрывает ваш IP-адрес)"
-
-#: ../libgaim/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "Удалённый пользователь разорвал соединение."
 
-#: ../libgaim/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "Удалённый пользователь отклонил ваш запрос."
 
-#: ../libgaim/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Соединение с удалённым пользователем потеряно:<br>%s"
 
-#: ../libgaim/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "При соединении с удалённым пользователем получены недопустимые данные."
 
-#: ../libgaim/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Не удалось установить соединение с удалённым пользователем."
 
-#: ../libgaim/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Прямое соединение установлено"
 
-#: ../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 ""
 
-#: ../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:330
 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 "
@@ -10318,7 +6369,7 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:436
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -10327,125 +6378,145 @@
 "(Произошла ошибка при приёме этого сообщения. Либо у вас и %s выбраны разные "
 "кодировки, либо клиент %s содержит ошибки.)"
 
-#: ../libgaim/protocols/oscar/oscar.c:621
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2346
+#: ../pidgin/gtkutils.c:2368
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+msgid "Buddy Icon"
+msgstr "Значок собеседника"
+
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "Голос"
 
-#: ../libgaim/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:627
 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:630
+#: ../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:5973
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5925
 msgid "Get File"
 msgstr "Получить файл"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "Игры"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "Дополнения"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "Отправить список собеседников"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "Прямое соединение ICQ"
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "Пользователь AP"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Нигилист"
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "Релейный сервер ICQ"
 
-#: ../libgaim/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "Старый ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Шифрование Trillian"
 
-#: ../libgaim/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "Безопасность включена"
 
-#: ../libgaim/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "Видеочат"
 
-#: ../libgaim/protocols/oscar/oscar.c:680
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "Живое видео"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "Камера"
 
-#: ../libgaim/protocols/oscar/oscar.c:704
-#: ../libgaim/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5695
 msgid "Free For Chat"
 msgstr "Готов пообщаться"
 
-#: ../libgaim/protocols/oscar/oscar.c:708
-#: ../libgaim/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5730
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: ../libgaim/protocols/oscar/oscar.c:710
-#: ../libgaim/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5716
 msgid "Occupied"
 msgstr "Занят"
 
-#: ../libgaim/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "Статус на веб-страницах"
 
-#: ../libgaim/protocols/oscar/oscar.c:718
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
+msgid "Invisible"
+msgstr "Невидимый"
+
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "В сети"
 
-#: ../libgaim/protocols/oscar/oscar.c:824
-#: ../libgaim/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+msgid "IP Address"
+msgstr "IP-адрес"
+
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "Уровень предупреждения"
 
-#: ../libgaim/protocols/oscar/oscar.c:834
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "Комментарий собеседника"
 
-#: ../libgaim/protocols/oscar/oscar.c:974
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -10454,7 +6525,7 @@
 "Не удалось установить соединение с сервером аутентификации:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:982
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -10463,20 +6534,20 @@
 "Не удалось установить соединение с BOS-сервером:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "Идентификатор пользователя отправлен"
 
-#: ../libgaim/protocols/oscar/oscar.c:1027
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "Соединение установлено, данные отправлены"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1056
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "Завершение установления соединения"
 
-#: ../libgaim/protocols/oscar/oscar.c:1240
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -10484,28 +6555,29 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1325
-#: ../libgaim/protocols/yahoo/yahoo.c:1900
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1936
 msgid "Invalid screen name."
 msgstr "Неверный идентификатор пользователя."
 
-#: ../libgaim/protocols/oscar/oscar.c:1332
-#: ../libgaim/protocols/qq/login_logout.c:483
-#: ../libgaim/protocols/simple/simple.c:1035
-#: ../libgaim/protocols/yahoo/yahoo.c:1923
+#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1954
 msgid "Incorrect password."
 msgstr "Неправильный пароль."
 
-#: ../libgaim/protocols/oscar/oscar.c:1337
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "Ваша учётная запись сейчас заблокирована."
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Служба AOL Instant Messenger временно недоступна."
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 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."
@@ -10513,45 +6585,44 @@
 "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
 "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
 
-#: ../libgaim/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, 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:1394
 msgid "Could Not Connect"
 msgstr "Не удалось установить соединение"
 
-#: ../libgaim/protocols/oscar/oscar.c:1391
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "Получена авторизация"
 
-#: ../libgaim/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
+#: ../libpurple/protocols/oscar/oscar.c:1437
 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:5851
-#: ../libgaim/protocols/oscar/oscar.c:6081
-#: ../libgaim/protocols/oscar/oscar.c:6137 ../libgaim/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/oscar/oscar.c:6081 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libgaim/protocols/oscar/oscar.c:1469
-#: ../libgaim/protocols/oscar/oscar.c:1512
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -10560,54 +6631,54 @@
 "Соединение с вами вскоре может быть разорвано. Возможно, вы захотите "
 "использовать 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:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
+msgid "Unable to get a valid AIM login hash."
+msgstr "Не удаётся получить допустимый хэш входа AIM."
+
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, 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:1613
+msgid "Unable to get a valid login hash."
+msgstr "Не удаётся получить допустимый хэш входа."
+
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "Пароль отправлен"
 
-#: ../libgaim/protocols/oscar/oscar.c:1686
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "Не удаётся инициализировать соединение"
 
-#: ../libgaim/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2200
 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:2228
 msgid "Authorization Request Message:"
 msgstr "Сообщение запроса авторизации:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2229
 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:5211
-#: ../libgaim/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/yahoo/yahoo.c:989
 msgid "No reason given."
 msgstr "Причина не указана."
 
-#: ../libgaim/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10618,18 +6689,18 @@
 "следующей причине:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "В авторизации ICQ отказано."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, 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:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10642,7 +6713,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10655,7 +6726,7 @@
 "От: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10668,36 +6739,43 @@
 "Сообщение:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, 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:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Хотите добавить этого собеседника в список собеседников?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "_Добавить"
+
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "_Отклонить"
 
-#: ../libgaim/protocols/oscar/oscar.c:2551
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Вы не получили %hu сообщение от %s, так как оно было некорректно."
-msgstr[1] "Вы не получили %hu сообщений от %s, так как они были некорректны."
-
-#: ../libgaim/protocols/oscar/oscar.c:2560
+msgstr[1] "Вы не получили %hu сообщения от %s, так как они были некорректны."
+msgstr[2] "Вы не получили %hu сообщений от %s, так как они были некорректны."
+
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 "Вы не получили %hu сообщение от %s, так как оно было слишком велико."
 msgstr[1] ""
+"Вы не получили %hu сообщения от %s, так как они были слишком велики."
+msgstr[2] ""
 "Вы не получили %hu сообщений от %s, так как они были слишком велики."
 
-#: ../libgaim/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -10706,94 +6784,96 @@
 msgstr[0] ""
 "Вы не получили %hu сообщение от %s, так как был превышен предел оценки."
 msgstr[1] ""
+"Вы не получили %hu сообщения от %s, так как был превышен предел оценки."
+msgstr[2] ""
 "Вы не получили %hu сообщений от %s, так как был превышен предел оценки."
 
-#: ../libgaim/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 "Вы не получили %hu сообщение от %s, потому что он слишком надоедлив."
 msgstr[1] ""
+"Вы не получили %hu сообщения от %s, потому что он слишком надоедлив."
+msgstr[2] ""
 "Вы не получили %hu сообщений от %s, потому что он слишком надоедлив."
 
-#: ../libgaim/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 "Вы не получили %hu сообщение от %s, потому что вы слишком надоедливы."
 msgstr[1] ""
+"Вы не получили %hu сообщения от %s, потому что вы слишком надоедливы."
+msgstr[2] ""
 "Вы не получили %hu сообщений от %s, потому что вы слишком надоедливы."
 
-#: ../libgaim/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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] "Вы не получили %hu сообщение от %s по неизвестной причине."
-msgstr[1] "Вы не получили %hu сообщений от %s по неизвестной причине."
-
-#: ../libgaim/protocols/oscar/oscar.c:2718
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr "SNAC вызвал ошибку: %s\n"
+msgstr[1] "Вы не получили %hu сообщения от %s по неизвестной причине."
+msgstr[2] "Вы не получили %hu сообщений от %s по неизвестной причине."
 
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, 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:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "Причина неизвестна."
 
-#: ../libgaim/protocols/oscar/oscar.c:2761
-#: ../libgaim/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../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:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "Пользовательская информация недоступна: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Пользовательская информация для %s недоступна:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "В сети с"
 
-#: ../libgaim/protocols/oscar/oscar.c:2862
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Член с"
 
-#: ../libgaim/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "Возможности"
 
-#: ../libgaim/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "Статусное сообщение"
 
-#: ../libgaim/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "Профиль"
 
-#: ../libgaim/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "Ваше соединение AIM может быть потеряно."
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -10801,11 +6881,7 @@
 "[Не удаётся отобразить сообщение от этого пользователя, так как оно содержит "
 "недопустимые символы.]"
 
-#: ../libgaim/protocols/oscar/oscar.c:3396
-msgid "Rate limiting error."
-msgstr "Ошибка ограничения предела."
-
-#: ../libgaim/protocols/oscar/oscar.c:3397
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -10813,84 +6889,86 @@
 "Последнее предпринятое вами действие не может быть выполнено, так как вы "
 "превысили предел. Подождите 10 секунд и попытайтесь снова."
 
-#: ../libgaim/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3456
 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:3469
+#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Вы были отсоединены от чата %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3725
-#: ../libgaim/protocols/silc/util.c:583
+#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: ../libgaim/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "Персональная Web-страница"
 
-#: ../libgaim/protocols/oscar/oscar.c:3772
-#: ../libgaim/protocols/qq/buddy_info.c:40
+#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Дополнительная информация"
 
-#: ../libgaim/protocols/oscar/oscar.c:3780
-#: ../libgaim/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "Индекс"
 
-#: ../libgaim/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "Отдел"
 
-#: ../libgaim/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "Должность"
 
-#: ../libgaim/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "Web-страница"
 
-#: ../libgaim/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "Информация о работе"
 
-#: ../libgaim/protocols/oscar/oscar.c:3866
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "Всплывающее сообщение"
 
-#: ../libgaim/protocols/oscar/oscar.c:3906
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Следующий идентификатор пользователя соотнесён с %s"
 msgstr[1] "Следующие идентификаторы пользователей соотнесены с %s"
-
-#: ../libgaim/protocols/oscar/oscar.c:3911
+msgstr[2] "Следующие идентификаторы пользователей соотнесены с %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "Идентификатор пользователя"
 
-#: ../libgaim/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ничего не найдено для адреса e-mail %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3960
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "Запрошено подтверждение учётной записи"
 
-#: ../libgaim/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "Ошибка изменения информации об учётной записи"
 
-#: ../libgaim/protocols/oscar/oscar.c:3994
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -10899,14 +6977,14 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя отличается от оригинального."
 
-#: ../libgaim/protocols/oscar/oscar.c:3997
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как он недопустим."
 
-#: ../libgaim/protocols/oscar/oscar.c:4000
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -10915,7 +6993,7 @@
 "Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
 "как запрошенный идентификатор пользователя слишком велик."
 
-#: ../libgaim/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -10924,7 +7002,7 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как для этого "
 "идентификатора пользователя уже есть ожидающий запрос."
 
-#: ../libgaim/protocols/oscar/oscar.c:4006
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -10933,7 +7011,7 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
 "соотнесено слишком много идентификаторов пользователей."
 
-#: ../libgaim/protocols/oscar/oscar.c:4009
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -10942,42 +7020,32 @@
 "Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
 "неверен."
 
-#: ../libgaim/protocols/oscar/oscar.c:4012
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Ошибка 0x%04x: Неизвестная ошибка."
 
-#: ../libgaim/protocols/oscar/oscar.c:4022
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"Сейчас ваш идентификатор пользователя отформатирован следующим образом:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:4023
-#: ../libgaim/protocols/oscar/oscar.c:4030
-msgid "Account Info"
-msgstr "Информация об учётной записи"
-
-#: ../libgaim/protocols/oscar/oscar.c:4028
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Адрес e-mail для %s: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4203
+#: ../libpurple/protocols/oscar/oscar.c:4022
+msgid "Account Info"
+msgstr "Информация об учётной записи"
+
+#: ../libpurple/protocols/oscar/oscar.c:4193
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ваше изображение не было отправлено. Вы должны иметь прямое соединение для "
 "отправки изображений."
 
-#: ../libgaim/protocols/oscar/oscar.c:4455
+#: ../libpurple/protocols/oscar/oscar.c:4438
 msgid "Unable to set AIM profile."
 msgstr "Не удаётся установить профиль AIM."
 
-#: ../libgaim/protocols/oscar/oscar.c:4456
+#: ../libpurple/protocols/oscar/oscar.c:4439
 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 "
@@ -10987,43 +7055,48 @@
 "входа. Ваш профиль остаётся неустановленным; попытайтесь установить его ещё "
 "раз, когда будете полностью подключены."
 
-#: ../libgaim/protocols/oscar/oscar.c:4470
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
+#: ../libpurple/protocols/oscar/oscar.c:4453
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
 msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] ""
-"Максимальный размер профиля в %d байт был превышен. Gaim урезал его для вас."
+"Максимальный размер профиля в %d байт был превышен. Профиль был урезан."
 msgstr[1] ""
-"Максимальный размер профиля в %d байт был превышен. Gaim урезал его для вас."
-
-#: ../libgaim/protocols/oscar/oscar.c:4475
+"Максимальный размер профиля в %d байта был превышен. Профиль был урезан."
+msgstr[2] ""
+"Максимальный размер профиля в %d байт был превышен. Профиль был урезан."
+
+#: ../libpurple/protocols/oscar/oscar.c:4458
 msgid "Profile too long."
 msgstr "Профиль слишком велик."
 
-#: ../libgaim/protocols/oscar/oscar.c:4519
-#, 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:4503
+#, 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."
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] ""
-"Максимальный размер сообщения об отсутствии в %d байт был превышен. Gaim "
-"урезал его для вас."
+"Максимальный размер сообщения об отсутствии в %d байт был превышен. "
+"Сообщение об отсутствии было урезано."
 msgstr[1] ""
-"Максимальный размер сообщения об отсутствии в %d байт был превышен. Gaim "
-"урезал его для вас."
-
-#: ../libgaim/protocols/oscar/oscar.c:4524
+"Максимальный размер сообщения об отсутствии в %d байта был превышен. "
+"Сообщение об отсутствии было урезано."
+msgstr[2] ""
+"Максимальный размер сообщения об отсутствии в %d байт был превышен. "
+"Сообщение об отсутствии было урезано."
+
+#: ../libpurple/protocols/oscar/oscar.c:4508
 msgid "Away message too long."
 msgstr "Сообщение об отсутствии слишком велико."
 
-#: ../libgaim/protocols/oscar/oscar.c:4593
+#: ../libpurple/protocols/oscar/oscar.c:4577
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -11031,36 +7104,35 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4595
-#: ../libgaim/protocols/oscar/oscar.c:5018
-#: ../libgaim/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:5016
 msgid "Unable To Add"
 msgstr "Не удаётся добавить"
 
-#: ../libgaim/protocols/oscar/oscar.c:4699
+#: ../libpurple/protocols/oscar/oscar.c:4683
 msgid "Unable To Retrieve Buddy List"
 msgstr "Не удаётся загрузить список собеседников"
 
-#: ../libgaim/protocols/oscar/oscar.c:4700
-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:4904
-#: ../libgaim/protocols/oscar/oscar.c:4905
-#: ../libgaim/protocols/oscar/oscar.c:4910
-#: ../libgaim/protocols/oscar/oscar.c:5086
-#: ../libgaim/protocols/oscar/oscar.c:5087
-#: ../libgaim/protocols/oscar/oscar.c:5092
+#: ../libpurple/protocols/oscar/oscar.c:4684
+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:4888
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4894
+#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5076
 msgid "Orphans"
 msgstr "Сироты"
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5000
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -11069,12 +7141,12 @@
 "Не удалось добавить собеседника %s, так как в списке собеседников слишком "
 "много собеседников. Удалите один и попытайтесь снова."
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
-#: ../libgaim/protocols/oscar/oscar.c:5030
+#: ../libpurple/protocols/oscar/oscar.c:5000
+#: ../libpurple/protocols/oscar/oscar.c:5014
 msgid "(no name)"
 msgstr "(нет имени)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5030
+#: ../libpurple/protocols/oscar/oscar.c:5014
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -11085,7 +7157,7 @@
 "причиной этого является то, что вы имеете максимальное количество допустимых "
 "собеседников в списке собеседников."
 
-#: ../libgaim/protocols/oscar/oscar.c:5123
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -11094,22 +7166,22 @@
 "Пользователь %s разрешил добавить его в ваш список собеседников. Хотите "
 "добавить его?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5129
+#: ../libpurple/protocols/oscar/oscar.c:5114
 msgid "Authorization Given"
 msgstr "Авторизация дана"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5194
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Пользователь %s разрешил добавить его в ваш список собеседников."
 
-#: ../libgaim/protocols/oscar/oscar.c:5208
+#: ../libpurple/protocols/oscar/oscar.c:5195
 msgid "Authorization Granted"
 msgstr "Авторизация дана"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5198
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -11120,48 +7192,53 @@
 "следующей причине:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5199
 msgid "Authorization Denied"
 msgstr "В авторизации отказано"
 
-#: ../libgaim/protocols/oscar/oscar.c:5248 ../libgaim/protocols/toc/toc.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:5235
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Обмен:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5275
 msgid "Invalid chat name specified."
 msgstr "Указано неверное имя чата."
 
-#: ../libgaim/protocols/oscar/oscar.c:5358
+#: ../libpurple/protocols/oscar/oscar.c:5345
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Изображение не было отправлено. Вы не можете отправлять изображения в чатах "
 "AIM."
 
-#: ../libgaim/protocols/oscar/oscar.c:5530
-#: ../libgaim/protocols/oscar/oscar.c:5535
+#: ../libpurple/protocols/oscar/oscar.c:5484
+#: ../libpurple/protocols/oscar/oscar.c:5489
 msgid "Away Message"
 msgstr "Сообщение об отсутствии"
 
-#: ../libgaim/protocols/oscar/oscar.c:5535
+#: ../libpurple/protocols/oscar/oscar.c:5489
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(загрузка)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5848
+#: ../libpurple/protocols/oscar/oscar.c:5689
+msgid "iTunes Music Store Link"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5797
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Комментарий собеседника для %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5798
 msgid "Buddy Comment:"
 msgstr "Комментарий собеседника:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5895
+#: ../libpurple/protocols/oscar/oscar.c:5845
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Вы выбрали открытие прямого соединения с %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:5899
+#: ../libpurple/protocols/oscar/oscar.c:5849
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -11169,69 +7246,65 @@
 "Так как это раскроет ваш IP-адрес, это можно считать угрозой безопасности. "
 "Хотите продолжить?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5903
+#: ../libpurple/protocols/oscar/oscar.c:5855
 msgid "C_onnect"
 msgstr "_Установить соединение"
 
-#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5890
 msgid "Get AIM Info"
 msgstr "Получить информацию AIM"
 
-#: ../libgaim/protocols/oscar/oscar.c:5944
+#: ../libpurple/protocols/oscar/oscar.c:5896
 msgid "Edit Buddy Comment"
 msgstr "Изменить комментарий собеседника"
 
-#: ../libgaim/protocols/oscar/oscar.c:5952
+#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Get Status Msg"
 msgstr "Получить сообщение о статусе"
 
-#: ../libgaim/protocols/oscar/oscar.c:5965
+#: ../libpurple/protocols/oscar/oscar.c:5917
 msgid "Direct IM"
 msgstr "Прямое соединение"
 
-#: ../libgaim/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/oscar/oscar.c:5939
 msgid "Re-request Authorization"
 msgstr "Повторный запрос авторизации"
 
-#: ../libgaim/protocols/oscar/oscar.c:6046
+#: ../libpurple/protocols/oscar/oscar.c:5998
 msgid "Require authorization"
 msgstr "Требовать авторизацию"
 
-#: ../libgaim/protocols/oscar/oscar.c:6049
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Статус на веб-страницах (вызывает появление СПАМА!)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6006
 msgid "ICQ Privacy Options"
 msgstr "Параметры конфиденциальности ICQ"
 
-#: ../libgaim/protocols/oscar/oscar.c:6071
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "The new formatting is invalid."
 msgstr "Новое форматирование недопустимо."
 
-#: ../libgaim/protocols/oscar/oscar.c:6072
+#: ../libpurple/protocols/oscar/oscar.c:6026
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Форматирование идентификатора пользователя может влиять только на регистр "
 "букв и пробелы."
 
-#: ../libgaim/protocols/oscar/oscar.c:6079
-msgid "New screen name formatting:"
-msgstr "Новое форматирование идентификатора пользователя:"
-
-#: ../libgaim/protocols/oscar/oscar.c:6135
+#: ../libpurple/protocols/oscar/oscar.c:6079
 msgid "Change Address To:"
 msgstr "Изменить адрес на:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6125
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>вы не ожидаете авторизацию</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6183
+#: ../libpurple/protocols/oscar/oscar.c:6128
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Вы ожидаете авторизацию от следующих собеседников"
 
-#: ../libgaim/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6129
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -11239,660 +7312,679 @@
 "Вы можете запросить авторизацию от этих собеседников повторно, щёлкнув на "
 "них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
 
-#: ../libgaim/protocols/oscar/oscar.c:6201
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "Find Buddy by E-Mail"
 msgstr "Найти собеседника по e-mail"
 
-#: ../libgaim/protocols/oscar/oscar.c:6202
+#: ../libpurple/protocols/oscar/oscar.c:6147
 msgid "Search for a buddy by e-mail address"
 msgstr "Искать собеседника по адресу e-mail"
 
-#: ../libgaim/protocols/oscar/oscar.c:6203
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Введите адрес e-mail собеседника, которого вы ищете."
 
-#: ../libgaim/protocols/oscar/oscar.c:6206
+#: ../libpurple/protocols/oscar/oscar.c:6151
 msgid "_Search"
 msgstr "_Искать"
 
-#: ../libgaim/protocols/oscar/oscar.c:6375
+#: ../libpurple/protocols/oscar/oscar.c:6309
 msgid "Set User Info (URL)..."
 msgstr "Установить пользовательскую информацию (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6320
 msgid "Change Password (URL)"
 msgstr "Изменить пароль (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6390
+#: ../libpurple/protocols/oscar/oscar.c:6324
 msgid "Configure IM Forwarding (URL)"
 msgstr "Настроить перенаправление сообщений (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "Set Privacy Options..."
 msgstr "Установить параметры конфиденциальности..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6407
-msgid "Format Screen Name..."
-msgstr "Форматировать идентификатор пользователя..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6411
+#: ../libpurple/protocols/oscar/oscar.c:6341
 msgid "Confirm Account"
 msgstr "Подтвердить учётную запись"
 
-#: ../libgaim/protocols/oscar/oscar.c:6415
+#: ../libpurple/protocols/oscar/oscar.c:6345
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Показать текущий зарегистрированный адрес e-mail"
 
-#: ../libgaim/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6349
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Изменить текущий зарегистрированный адрес e-mail..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6356
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Показать собеседников без авторизации"
 
-#: ../libgaim/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Искать собеседника по адресу e-mail..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6437
+#: ../libpurple/protocols/oscar/oscar.c:6367
 msgid "Search for Buddy by Information"
 msgstr "Искать собеседника по информации"
 
-#: ../libgaim/protocols/oscar/oscar.c:6505
+#: ../libpurple/protocols/oscar/oscar.c:6435
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6508
+#: ../libpurple/protocols/oscar/oscar.c:6438
 msgid "Show how long you have been idle"
 msgstr "Показывать, как долго вы бездействовали"
 
-#: ../libgaim/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/oscar.c:6590
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Всегда использовать прокси-сервер ICQ для передачи файлов\n"
+"(медленнее, но не раскрывает ваш IP-адрес)"
+
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: ../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 "
 "considered a privacy risk."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "_Установить соединение"
 
-#: ../libgaim/protocols/qq/buddy_info.c:39
+#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "Номер QQ"
 
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Страна/Регион"
 
-#: ../libgaim/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Область/Штат"
 
-#: ../libgaim/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Символ гороскопа"
 
-#: ../libgaim/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Знак зодиака"
 
-#: ../libgaim/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Группа крови"
 
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:55
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-mail"
 
-#: ../libgaim/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Индекс"
 
-#: ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Номер сотового телефона"
 
-#: ../libgaim/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Номер телефона"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Водолей"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Рыбы"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Овен"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Телец"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Близнецы"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Рак"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Лев"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Дева"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Весы"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Скорпион"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Стрелец"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Козерог"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Крыса"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Бык"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Тигр"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Кролик"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Дракон"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Змея"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Лошадь"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Коза"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Обезьяна"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Петух"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Собака"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Свинья"
 
-#: ../libgaim/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Другое"
 
-#: ../libgaim/protocols/qq/buddy_info.c:481
-#: ../libgaim/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "Изменить мою информацию"
 
-#: ../libgaim/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Обновить мою информацию"
 
-#: ../libgaim/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Ваша информация была обновлена"
 
-#: ../libgaim/protocols/qq/buddy_info.c:565
-msgid ""
-"You are attempting to set a custom face. Gaim currently only allows the "
-"standard faces. Please choose an image from "
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:582
-#: ../libgaim/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:207
-#: ../libgaim/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Вы отвергли запрос %d"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-#: ../libgaim/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:209
+#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Введите причину:"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Отвергнуть запрос"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:211
-#: ../libgaim/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "Извините, вы не в моём вкусе..."
 
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/group_im.c:137
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Отвергнуть"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "Введите запрос здесь"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:398
-#: ../libgaim/protocols/qq/group_join.c:135
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:399
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_opt.c:140
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "Отправить"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Вы добавили %d в список собеседников"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "Ошибка QQid"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "Неверный QQid"
 
-#: ../libgaim/protocols/qq/group.c:65
+#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libgaim/protocols/qq/group.c:98
+#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "ID группы"
 
-#: ../libgaim/protocols/qq/group.c:100
+#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Создатель"
 
-#: ../libgaim/protocols/qq/group.c:103
+#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Описание группы"
 
-#: ../libgaim/protocols/qq/group.c:109
+#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:119
+#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr ""
 
-#: ../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 ""
 
-#: ../libgaim/protocols/qq/group_im.c:123
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:124
-#: ../libgaim/protocols/qq/group_im.c:173
-#: ../libgaim/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Причина: %s"
 
-#: ../libgaim/protocols/qq/group_im.c:131
-#: ../libgaim/protocols/qq/group_im.c:175
-#: ../libgaim/protocols/qq/group_im.c:215
-#: ../libgaim/protocols/qq/group_im.c:250
-#: ../libgaim/protocols/qq/group_im.c:284
-#: ../libgaim/protocols/qq/group_join.c:229
-#: ../libgaim/protocols/qq/group_join.c:355
-#: ../libgaim/protocols/qq/group_opt.c:230
-#: ../libgaim/protocols/qq/group_opt.c:300
-#: ../libgaim/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:134
-#: ../libgaim/protocols/qq/group_opt.c:127
-#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/group_im.c:139
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:213
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:249
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:284
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "Эта группа была добавлена в список собеседников"
 
-#: ../libgaim/protocols/qq/group_internal.c:41
+#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:44
+#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:47
+#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:50
+#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:53
+#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Неизвестный статус"
 
-#: ../libgaim/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:80
 msgid "This group does not allow others to join"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:90
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Код [0x%02X]: %s"
 
-#: ../libgaim/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:91
 msgid "Group Operation Error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:124
-#: ../libgaim/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr ""
 
-#: ../libgaim/protocols/qq/im.c:429
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "Системное сообщение"
 
-#: ../libgaim/protocols/qq/im.c:573
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr ""
 
-#: ../libgaim/protocols/qq/im.c:573
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/keep_alive.c:85
 msgid "Keep alive error, seems connection lost!"
 msgstr ""
 
-#: ../libgaim/protocols/qq/login_logout.c:408
+#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
 msgstr ""
 
-#: ../libgaim/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2351
-#: ../libgaim/protocols/yahoo/yahoo.c:2378
-#: ../libgaim/protocols/yahoo/yahoo.c:2485
-#: ../libgaim/protocols/yahoo/yahoo.c:2506
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
+#. TODO: Include error_message in the message below
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2382
+#: ../libpurple/protocols/yahoo/yahoo.c:2410
+#: ../libpurple/protocols/yahoo/yahoo.c:2517
+#: ../libpurple/protocols/yahoo/yahoo.c:2538
+#: ../libpurple/protocols/yahoo/yahoo.c:2622
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Не удаётся установить соединение."
 
-#: ../libgaim/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Неизвестно-%d"
 
-#: ../libgaim/protocols/qq/qq.c:209
+#: ../libpurple/protocols/qq/qq.c:209
 #, c-format
 msgid "%s Address"
 msgstr "Адрес %s"
 
-#: ../libgaim/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:240
 msgid "Level"
 msgstr "Уровень"
 
-#: ../libgaim/protocols/qq/qq.c:294
+#: ../libpurple/protocols/qq/qq.c:278
 msgid "QQ: Available"
 msgstr "QQ: Доступен"
 
-#: ../libgaim/protocols/qq/qq.c:298
+#: ../libpurple/protocols/qq/qq.c:282
 msgid "QQ: Away"
 msgstr "QQ: Отошёл"
 
-#: ../libgaim/protocols/qq/qq.c:302
+#: ../libpurple/protocols/qq/qq.c:286
 msgid "QQ: Invisible"
 msgstr "QQ: Невидимый"
 
-#: ../libgaim/protocols/qq/qq.c:306
+#: ../libpurple/protocols/qq/qq.c:290
 msgid "QQ: Offline"
 msgstr "QQ: Не в сети"
 
-#: ../libgaim/protocols/qq/qq.c:383
+#: ../libpurple/protocols/qq/qq.c:371
 msgid "Invalid name"
 msgstr "Неверное имя"
 
-#: ../libgaim/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:462
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:463
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:464
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:468
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:543
+#: ../libpurple/protocols/qq/qq.c:531
 msgid "Modify My Information"
 msgstr "Изменить мою информацию"
 
-#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: ../libgaim/protocols/qq/qq.c:549
+#: ../libpurple/protocols/qq/qq.c:537
 msgid "Show Login Information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:570
+#: ../libpurple/protocols/qq/qq.c:558
 msgid "Exit this QQ Qun"
 msgstr ""
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -11903,273 +7995,275 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:755
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:497
+#: ../libpurple/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:500
+#: ../libpurple/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "Соединение отвергнуто"
 
-#: ../libgaim/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Ошибка сокета"
 
-#: ../libgaim/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "Не удаётся прочитать из сокета"
 
-#: ../libgaim/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:706
 #, c-format
 msgid "%d has declined the file %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:709
-#: ../libgaim/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:709
+#: ../libpurple/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d отменил передачу %s"
 
-#: ../libgaim/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:122
 msgid "Connection lost"
 msgstr "Соединение потеряно"
 
 #. cancel login progress
-#: ../libgaim/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:130
 msgid "Login failed, no reply"
 msgstr "Не удалось войти в сеть, нет ответа"
 
-#: ../libgaim/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "Хотите добавить этого собеседника?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Вы были добавлены %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "Хотите добавить его?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s добавил вас [%s]"
 
-#: ../libgaim/protocols/qq/sys_msg.c:179
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/sys_msg.c:194
+#, c-format
 msgid "User %s rejected your request"
 msgstr "Пользователь %s отверг ваш запрос"
 
-#: ../libgaim/protocols/qq/sys_msg.c:199
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/sys_msg.c:214
+#, c-format
 msgid "User %s has approved your request"
-msgstr "Удалённый пользователь отклонил ваш запрос."
-
-#: ../libgaim/protocols/qq/sys_msg.c:222
+msgstr "Пользователь %s удовлетворил ваш запрос"
+
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s хочет добавить вас [%s] в качестве друга"
 
-#: ../libgaim/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Сообщение: %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s отсутствует в списке собеседников"
 
-#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Хотите добавить его?"
 
-#: ../libgaim/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Соединение разорвано (запись)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Название группы:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""
 
-#: ../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 ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Запуск служб"
 
-#: ../libgaim/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1544
 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 ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Сброс соединения"
 
-#: ../libgaim/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Ошибка при чтении из сокета: %s"
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1732
-#: ../libgaim/protocols/sametime/sametime.c:3745
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Не удаётся соединиться с узлом"
 
-#: ../libgaim/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Объявление от %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Конференция закрыта"
 
-#: ../libgaim/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Не удаётся отправить сообщение: "
 
-#: ../libgaim/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Место закрыто"
 
-#: ../libgaim/protocols/sametime/sametime.c:3251
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Микрофон"
 
-#: ../libgaim/protocols/sametime/sametime.c:3252
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Колонки"
 
-#: ../libgaim/protocols/sametime/sametime.c:3253
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Видеокамера"
 
-#: ../libgaim/protocols/sametime/sametime.c:3257
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Передача файлов"
 
-#: ../libgaim/protocols/sametime/sametime.c:3291
-#: ../libgaim/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Поддерживается"
 
-#: ../libgaim/protocols/sametime/sametime.c:3296
-#: ../libgaim/protocols/sametime/sametime.c:4139
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Внешний пользователь"
 
-#: ../libgaim/protocols/sametime/sametime.c:3402
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Создать конференцию с пользователем"
 
-#: ../libgaim/protocols/sametime/sametime.c:3403
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3407
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Новая конференция"
 
-#: ../libgaim/protocols/sametime/sametime.c:3409
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Создать"
 
-#: ../libgaim/protocols/sametime/sametime.c:3473
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Доступные конференции"
 
-#: ../libgaim/protocols/sametime/sametime.c:3479
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Создать новую конференцию..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3486
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Пригласить пользователя в конференцию"
 
-#: ../libgaim/protocols/sametime/sametime.c:3487
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -12177,61 +8271,65 @@
 "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:3562
 msgid "Invite to Conference..."
 msgstr "Пригласить в конференцию..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3587
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3634
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+msgid "Topic:"
+msgstr "Тема:"
+
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3661
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3662
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4155
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Неизвестно (0x%04x)<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4157
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Последний известный клиент"
 
-#: ../libgaim/protocols/sametime/sametime.c:4321
-#: ../libgaim/protocols/sametime/sametime.c:5516
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5500
 msgid "User Name"
 msgstr "Имя пользователя"
 
-#: ../libgaim/protocols/sametime/sametime.c:4324
-#: ../libgaim/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libgaim/protocols/sametime/sametime.c:4348
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -12241,26 +8339,26 @@
 "Выберите из списка ниже одного из них для добавления его в список "
 "собеседников."
 
-#: ../libgaim/protocols/sametime/sametime.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Выберите пользователя"
 
-#: ../libgaim/protocols/sametime/sametime.c:4438
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Не удаётся добавить пользователя: пользователь не найден"
 
-#: ../libgaim/protocols/sametime/sametime.c:4440
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4445
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Не удаётся добавить пользователя"
 
-#: ../libgaim/protocols/sametime/sametime.c:5031
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12269,63 +8367,63 @@
 "Ошибка чтения файла %s: \n"
 "%s\n"
 
-#: ../libgaim/protocols/sametime/sametime.c:5166
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Сохраняемый удалённо список собеседников"
 
-#: ../libgaim/protocols/sametime/sametime.c:5171
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Режим хранения списка собеседников"
 
-#: ../libgaim/protocols/sametime/sametime.c:5174
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Только локальный список собеседников"
 
-#: ../libgaim/protocols/sametime/sametime.c:5176
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Объединить со списком с сервера"
 
-#: ../libgaim/protocols/sametime/sametime.c:5178
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Объединить и сохранить список на сервере"
 
-#: ../libgaim/protocols/sametime/sametime.c:5180
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Синхронизировать со списком с сервера"
 
-#: ../libgaim/protocols/sametime/sametime.c:5229
+#: ../libpurple/protocols/sametime/sametime.c:5209
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Импортировать список Sametime для учётной записи %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5268
+#: ../libpurple/protocols/sametime/sametime.c:5249
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Экспортировать список Sametime для учётной записи %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5321
+#: ../libpurple/protocols/sametime/sametime.c:5303
 msgid "Unable to add group: group exists"
 msgstr "Не удаётся добавить группу: группа существует"
 
-#: ../libgaim/protocols/sametime/sametime.c:5322
+#: ../libpurple/protocols/sametime/sametime.c:5304
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Группа с именем '%s' уже присутствует в списке собеседников."
 
-#: ../libgaim/protocols/sametime/sametime.c:5325
-#: ../libgaim/protocols/sametime/sametime.c:5454
+#: ../libpurple/protocols/sametime/sametime.c:5307
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group"
 msgstr "Не удаётся добавить группу"
 
-#: ../libgaim/protocols/sametime/sametime.c:5384
+#: ../libpurple/protocols/sametime/sametime.c:5366
 msgid "Possible Matches"
 msgstr "Вероятные совпадения"
 
-#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libpurple/protocols/sametime/sametime.c:5382
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5401
+#: ../libpurple/protocols/sametime/sametime.c:5383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12333,37 +8431,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5406
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5431
 msgid "Unable to add group: group not found"
 msgstr "Не удаётся добавить группу: группа не найдена"
 
-#: ../libgaim/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5433
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5491
+#: ../libpurple/protocols/sametime/sametime.c:5474
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5492
+#: ../libpurple/protocols/sametime/sametime.c:5475
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/sametime/sametime.c:5524
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Результаты поиска для '%s'"
 
-#: ../libgaim/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5525
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12374,106 +8472,117 @@
 "можете добавить этих пользователей в список собеседников или отправить им "
 "сообщения с помощью кнопок действия ниже."
 
-#: ../libgaim/protocols/sametime/sametime.c:5573
+#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+msgid "Search Results"
+msgstr "Результаты поиска"
+
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No matches"
 msgstr "Нет совпадений"
 
-#: ../libgaim/protocols/sametime/sametime.c:5574
+#: ../libpurple/protocols/sametime/sametime.c:5558
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5578
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "No Matches"
 msgstr "Нет совпадений"
 
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../libpurple/protocols/sametime/sametime.c:5599
 msgid "Search for a user"
 msgstr "Искать пользователя"
 
-#: ../libgaim/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5600
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5619
+#: ../libpurple/protocols/sametime/sametime.c:5603
 msgid "User Search"
 msgstr "Поиск пользователей"
 
-#: ../libgaim/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5616
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5620
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5639
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "User Search..."
 msgstr "Поиск пользователей..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5725
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5735
 msgid "Hide client identity"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
-#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
-#: ../libgaim/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Пользователь %s не присутствует в сети"
 
-#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
-#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
-#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
-#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:139
+#: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Согласование ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Не удаётся выполнить согласование ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Произошла ошибка во время согласования ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Не удалось выполнить согласование ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Истекло время ожидания во время согласования ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Согласование ключей было прервано"
 
-#: ../libgaim/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Согласование ключей уже начато"
 
-#: ../libgaim/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Согласование ключей не может быть начато с самим собой"
 
-#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
-#: ../libgaim/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:258
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Удалённый пользователь больше не присутствует в сети"
 
-#: ../libgaim/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -12482,7 +8591,7 @@
 "Получен запрос согласования ключей от %s. Хотите выполнить согласование "
 "ключей?"
 
-#: ../libgaim/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12493,60 +8602,69 @@
 "Удалённый узел: %s\n"
 "Удалённый порт: %d"
 
-#: ../libgaim/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Запрос согласования ключей"
 
-#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
-#: ../libgaim/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 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:513
+#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/ops.c:1494
+#: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Получить публичный ключ"
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
-#: ../libgaim/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:549
+#: ../libpurple/protocols/silc/ops.c:1495
+#: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Не удаётся загрузить публичный ключ"
 
-#: ../libgaim/protocols/silc/buddy.c:634
-#: ../libgaim/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Показать публичный ключ"
 
-#: ../libgaim/protocols/silc/buddy.c:635
-#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Не удалось загрузить публичный ключ"
 
-#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
-#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
-#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/ops.c:1087
+#: ../libpurple/protocols/silc/ops.c:1159
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Пользовательская информация"
 
-#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
-#: ../libgaim/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:714
+#: ../libpurple/protocols/silc/ops.c:1160
+#: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Не удаётся получить пользовательскую информацию"
 
-#: ../libgaim/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Собеседник %s не проверен"
 
-#: ../libgaim/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -12556,16 +8674,16 @@
 "для получения публичного ключа."
 
 #. Open file selector to select the public key.
-#: ../libgaim/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "Открыть..."
 
-#: ../libgaim/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Собеседник %s не присутствует в сети"
 
-#: ../libgaim/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -12573,15 +8691,15 @@
 "Чтобы добавить собеседника, вы должны импортировать его публичный ключ. "
 "Нажмите \"Импортировать...\" для импортирования публичного ключа."
 
-#: ../libgaim/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "_Импортировать..."
 
-#: ../libgaim/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "Выберите корректного пользователя"
 
-#: ../libgaim/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -12589,7 +8707,7 @@
 "Было найдено несколько пользователей с одинаковыми публичными ключами. "
 "Выберите из списка одного из них для добавления в список собеседников."
 
-#: ../libgaim/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -12597,213 +8715,238 @@
 "Было найдено несколько пользователей с одинаковыми именами. Выберите из "
 "списка одного из них для добавления в список собеседников."
 
-#: ../libgaim/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "Независимый"
 
-#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "Недомогающий"
 
-#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "Разбудите меня"
 
-#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Гиперактивный"
 
-#: ../libgaim/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "Робот"
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
-#: ../libgaim/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:662
+#: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Счастливый"
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
-#: ../libgaim/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "Печальный"
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
-#: ../libgaim/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:666
+#: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "Рассерженный"
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
-#: ../libgaim/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:668
+#: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "Ревнующий"
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
-#: ../libgaim/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:670
+#: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "Стыдящийся"
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
-#: ../libgaim/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:672
+#: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Непобедимый"
 
-#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "Влюблённый"
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
-#: ../libgaim/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:676
+#: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Сонный"
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
-#: ../libgaim/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:678
+#: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "Скучающий"
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
-#: ../libgaim/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "Возбуждённый"
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
-#: ../libgaim/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:682
+#: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "Озабоченный"
 
-#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Режимы пользователя"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Настроение"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Предпочитаемый контакт"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Предпочитаемый язык"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Устройство"
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
-#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc/silc.c:730
+#: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Часовой пояс"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Географическое положение"
 
-#: ../libgaim/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Получить публичный ключ..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1667
+#: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "Убить пользователя"
 
-#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Парольная фраза:"
 
-#: ../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 ""
 
-#: ../libgaim/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Добавить публичный ключ канала"
 
 #. Add new public key
-#: ../libgaim/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Открыть публичный ключ..."
 
-#: ../libgaim/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Парольная фраза канала"
 
-#: ../libgaim/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Список публичных ключей канала"
 
-#: ../libgaim/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -12812,319 +8955,333 @@
 "able to join."
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
-#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
-#: ../libgaim/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:422
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "Аутентификация канала"
 
-#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "Добавить / Удалить"
 
-#: ../libgaim/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "Имя группы"
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:944
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: ../libgaim/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Введите имя личной группы и парольную фразу канала %s."
 
-#: ../libgaim/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Добавить личную группу канала"
 
-#: ../libgaim/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "Предел количества пользователей"
 
-#: ../libgaim/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Установить предел количества пользователей на канале. Установите в ноль для "
 "сброса предела количества пользователей."
 
-#: ../libgaim/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "Список приглашённых"
 
-#: ../libgaim/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "Список изгнанных"
 
-#: ../libgaim/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "Добавить личную группу"
 
-#: ../libgaim/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "Сбросить перманентно"
 
-#: ../libgaim/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "Установить перманентно"
 
-#: ../libgaim/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "Установить предел количества пользователей"
 
-#: ../libgaim/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Сбросить ограничение темы"
 
-#: ../libgaim/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Установить ограничение темы"
 
-#: ../libgaim/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Сбросить личный канал"
 
-#: ../libgaim/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "Установить личный канал"
 
-#: ../libgaim/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Сбросить секретный канал"
 
-#: ../libgaim/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Установить секретный канал"
 
-#: ../libgaim/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Вы являетесь основателем канала на <I>%s</I>"
 
-#: ../libgaim/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Основателем канала на <I>%s</I> является <I>%s</I>"
 
-#: ../libgaim/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Вы сможете войти в личную группу после того, как войдёте на канал %s."
 
-#: ../libgaim/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "Присоединиться к личной группе"
 
-#: ../libgaim/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Не удаётся присоединиться к личной группе"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "Вызвать команду"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "Не удаётся вызвать команду"
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
-#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
-#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
-#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
-#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
+#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
+#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Безопасная передача файлов"
 
-#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
-#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
-#: ../libgaim/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
+#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Ошибка во время передачи файлов"
 
-#: ../libgaim/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Доступ запрещён"
 
-#: ../libgaim/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Не удалось выполнить согласование ключей"
 
-#: ../libgaim/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Сессия передачи файлов не существует"
 
-#: ../libgaim/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Нет активных сессий передачи файлов"
 
-#: ../libgaim/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Передача файлов уже начата"
 
-#: ../libgaim/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Не удалось выполнить согласование ключей для передачи файлов"
 
-#: ../libgaim/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Не удалось начать передачу файлов"
 
-#: ../libgaim/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Не удаётся отправить файл"
 
-#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
-#: ../libgaim/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
+#: ../libpurple/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s изменил тему <I>%s</I> на: %s"
 
-#: ../libgaim/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> установил режим канала <I>%s</I> в: %s"
 
-#: ../libgaim/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> снял все режимы канала <I>%s</I>"
 
-#: ../libgaim/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> установил режимы <I>%s</I> в: %s"
 
-#: ../libgaim/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> снял все режимы <I>%s</I>"
 
-#: ../libgaim/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Вы были удалены из <I>%s</I> оператором <I>%s</I> (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
-#: ../libgaim/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
+#: ../libpurple/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Вы были убиты оператором %s (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
-#: ../libgaim/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
+#: ../libpurple/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Убит оператором %s (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Отключиться от сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Персональная информация"
 
-#: ../libgaim/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "День рождения"
 
-#: ../libgaim/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Должность"
 
-#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
+#: ../libpurple/protocols/silc/ops.c:1052
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "Организация"
 
-#: ../libgaim/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Отдел"
 
-#: ../libgaim/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Заметки"
 
-#: ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Присоединиться к чату"
 
-#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1183
+#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr "Настоящее имя"
 
-#: ../libgaim/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr "Текст статуса"
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1285
+#: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1286
+#: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "_Ещё..."
 
-#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "Разорвать соединение с сервером"
 
-#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr "Не удаётся разорвать соединение"
 
-#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Не удаётся установить тему"
 
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Не удалось изменить псевдоним"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr "Список комнат"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Не удаётся получить список комнат"
 
-#: ../libgaim/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr "Не было получено публичных ключей"
 
-#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "Информация о сервере"
 
-#: ../libgaim/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Не удаётся получить информацию о сервере"
 
-#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "Статистика сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Не удаётся получить статистику сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1559
+#: ../libpurple/protocols/silc/ops.c:1559
 msgid "No server statistics available"
 msgstr "Нет доступной статистики сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -13144,103 +9301,105 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr "Не удалось убить пользователя"
 
-#: ../libgaim/protocols/silc/ops.c:1709
+#: ../libpurple/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr "Ошибка во время соединения с сервером SILC"
 
-#: ../libgaim/protocols/silc/ops.c:1714
+#: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
 msgstr "Не удалось выполнить обмен ключами"
 
-#: ../libgaim/protocols/silc/ops.c:1723
+#: ../libpurple/protocols/silc/ops.c:1723
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Не удалось возобновить прерванную сессию. Нажмите \"Пересоединение\" для "
 "создания нового соединения."
 
-#: ../libgaim/protocols/silc/ops.c:1758
+#: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr "Соединение разорвано сервером"
 
-#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
-#: ../libgaim/protocols/silc/silc.c:188
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1867
+#: ../libpurple/protocols/silc/silc.c:182
 msgid "Resuming session"
 msgstr "Возобновление сессии"
 
-#: ../libgaim/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "Аутентификация соединения"
 
-#: ../libgaim/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr "Проверка публичного ключа сервера"
 
-#: ../libgaim/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "Требуется парольная фраза"
 
-#: ../libgaim/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Ошибка: Несоответствие версии, обновите своего клиента"
 
-#: ../libgaim/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Ошибка: Удалённая система не признаёт/поддерживает ваш публичный ключ"
 
-#: ../libgaim/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Ошибка: Удалённая система не поддерживает предложенную группу KE"
 
-#: ../libgaim/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Ошибка: Удалённая система не поддерживает предложенный шифр"
 
-#: ../libgaim/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Ошибка: Удалённая система не поддерживает предложенный PKCS"
 
-#: ../libgaim/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Ошибка: Удалённая система не поддерживает предложенную хэш-функцию"
 
-#: ../libgaim/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Ошибка: Удалённая система не поддерживает предложенный HMAC"
 
-#: ../libgaim/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "Ошибка: Неправильная подпись"
 
-#: ../libgaim/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "Ошибка: Неверные данные"
 
-#: ../libgaim/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "Ошибка: Аутентификация завершилась неудачно"
 
-#: ../libgaim/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -13249,12 +9408,12 @@
 "Получен публичный ключ %s. Локальная копия не совпадает с этим ключом. Всё "
 "ещё хотите принять этот публичный ключ?"
 
-#: ../libgaim/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Получен публичный ключ %s. Хотите принять этот публичный ключ?"
 
-#: ../libgaim/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -13263,65 +9422,73 @@
 "%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "Проверить публичный ключ"
 
-#: ../libgaim/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "_Просмотреть..."
 
-#: ../libgaim/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Неподдерживаемый тип публичного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:159
+#: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
 msgstr "Не удалось установить соединение"
 
-#: ../libgaim/protocols/silc/silc.c:180
+#: ../libpurple/protocols/silc/silc.c:174
 msgid "Cannot initialize SILC Client connection"
 msgstr "Не удаётся инициализировать соединение клиента SILC"
 
-#: ../libgaim/protocols/silc/silc.c:191
+#: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
 msgstr "Выполнение обмена ключами"
 
-#: ../libgaim/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-#: ../libgaim/protocols/silc/silc.c:323
+#: ../libpurple/protocols/silc/silc.c:294
+msgid "John Noname"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "Не удаётся инициализировать протокол SILC"
 
-#: ../libgaim/protocols/silc/silc.c:330
+#: ../libpurple/protocols/silc/silc.c:324
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Не удаётся найти или получить доступ к каталогу ~/.silc"
 
 #. Progress
-#: ../libgaim/protocols/silc/silc.c:335
+#: ../libpurple/protocols/silc/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Соединение с сервером SILC"
 
-#: ../libgaim/protocols/silc/silc.c:344
+#: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Не удалось загрузить пару ключей SILC: %s"
 
-#: ../libgaim/protocols/silc/silc.c:365
+#: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
 msgstr "Не удаётся создать соединение"
 
-#: ../libgaim/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/silc.c:658
 msgid "Your Current Mood"
 msgstr "Ваше текущее настроение"
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+msgid "Normal"
+msgstr "Нормально"
+
+#: ../libpurple/protocols/silc/silc.c:674
 msgid "In love"
 msgstr "Влюблённый"
 
-#: ../libgaim/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/silc.c:685
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -13329,224 +9496,230 @@
 "\n"
 "Предпочитаемые вами способы контакта"
 
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:695
+#: ../libpurple/protocols/silc/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libgaim/protocols/silc/silc.c:703
+#: ../libpurple/protocols/silc/silc.c:697
 msgid "Video conferencing"
 msgstr "Видеоконференция"
 
-#: ../libgaim/protocols/silc/silc.c:708
+#: ../libpurple/protocols/silc/silc.c:702
 msgid "Your Current Status"
 msgstr "Ваш текущий статус"
 
-#: ../libgaim/protocols/silc/silc.c:715
+#: ../libpurple/protocols/silc/silc.c:709
 msgid "Online Services"
 msgstr "Сетевые службы"
 
-#: ../libgaim/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:712
 msgid "Let others see what services you are using"
 msgstr "Позволить другим видеть, какие службы вы используете"
 
-#: ../libgaim/protocols/silc/silc.c:724
+#: ../libpurple/protocols/silc/silc.c:718
 msgid "Let others see what computer you are using"
 msgstr "Позволить другим видеть, какой компьютер вы используете"
 
-#: ../libgaim/protocols/silc/silc.c:731
+#: ../libpurple/protocols/silc/silc.c:725
 msgid "Your VCard File"
 msgstr "Ваш файл VCard"
 
-#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:737
+#: ../libpurple/protocols/silc/silc.c:738
 msgid "User Online Status Attributes"
 msgstr "Атрибуты сетевого статуса пользователя"
 
-#: ../libgaim/protocols/silc/silc.c:745
-#, fuzzy
+#: ../libpurple/protocols/silc/silc.c:739
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
 "Вы можете позволить другим пользователям видеть информацию о вашем сетевом "
-"статусе и вашу персональную информацию. Введите информацию, которую вы "
-"хотели бы"
-
-#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
-#: ../libgaim/protocols/silc/silc.c:1430
+"статусе и вашу персональную информацию. Введите информацию о себе, которую "
+"вы хотели бы сделать доступной для просмотра другими пользователями."
+
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "Сообщение дня"
 
-#: ../libgaim/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "Нет доступного сообщения дня"
 
-#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Нет сообщения дня, соотнесённого с этим соединением"
 
-#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
-#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "Создать новую пару ключей SILC"
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "Парольные фразы не совпадают"
 
-#: ../libgaim/protocols/silc/silc.c:881
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "Не удалось выполнить генерацию пары ключей"
 
-#: ../libgaim/protocols/silc/silc.c:920
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "Длина ключа"
 
-#: ../libgaim/protocols/silc/silc.c:922
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "Файл публичного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "Файл личного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "Парольная фраза (наберите ещё раз)"
 
-#: ../libgaim/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "Сгенерировать пару ключей"
 
-#: ../libgaim/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "Сетевой статус"
 
-#: ../libgaim/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "Просмотреть сообщение дня"
 
-#: ../libgaim/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "Создать пару ключей SILC..."
 
-#: ../libgaim/protocols/silc/silc.c:1110
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Пользователь <I>%s</I> не присутствует в сети"
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "Тема слишком велика"
 
-#: ../libgaim/protocols/silc/silc.c:1382
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "Вы должны указать псевдоним"
 
-#: ../libgaim/protocols/silc/silc.c:1484
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "канал %s не найден"
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "режимы канала для %s: %s"
 
-#: ../libgaim/protocols/silc/silc.c:1491
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "нет установленных режимов канала на %s"
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Не удалось установить режимы канала для %s"
 
-#: ../libgaim/protocols/silc/silc.c:1534
-#, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "Неизвестная команда: %s, (возможно, ошибка Gaim)"
-
-#: ../libgaim/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1530
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Неизвестная команда: %s, (возможно, ошибка в клиенте)"
+
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [канал]:  Покинуть чат"
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [канал]:  Покинуть чат"
 
-#: ../libgaim/protocols/silc/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;новая тема&gt;]:  Просмотреть или изменить тему"
 
-#: ../libgaim/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;канал&gt; [&lt;пароль&gt;]:  Присоединиться к чату в этой сети"
 
-#: ../libgaim/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:  Вывести список каналов в этой сети"
 
-#: ../libgaim/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;псевдоним&gt;:  Просмотреть информацию о пользователе"
 
-#: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;псевдоним&gt; &lt;сообщение&gt;:  Отправить пользователю личное "
 "сообщение"
 
-#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;псевдоним&gt; [&lt;сообщение&gt;]:  Отправить пользователю личное "
 "сообщение"
 
-#: ../libgaim/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Просмотреть сообщение дня сервера"
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:  Прервать эту сессию"
 
-#: ../libgaim/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [сообщение]:  Разорвать соединение с сервером, сообщение необязательно"
 
-#: ../libgaim/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;команда&gt;:  Вызвать любую команду клиента silc"
 
-#: ../libgaim/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;псевдоним&gt; [-публичный ключ|&lt;причина&gt;]:  Убить пользователя"
 
-#: ../libgaim/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;новый псевдоним&gt;:  Изменить свой псевдоним"
 
-#: ../libgaim/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;псевдоним&gt;:  Просмотреть информацию о пользователе"
 
-#: ../libgaim/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -13554,57 +9727,57 @@
 "cumode &lt;канал&gt; +|-&lt;режимы&gt; &lt;псевдоним&gt;:  Изменить режимы "
 "пользователя на канале"
 
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;режимы пользователя&gt;:  Установить свои режимы в сети"
 
-#: ../libgaim/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;псевдоним&gt; [-публичный ключ]:  Получить привилегии оператора "
 "сервера"
 
-#: ../libgaim/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;канал&gt; &lt;псевдоним&gt; [комментарий]:  Удалить пользователя с "
 "канала"
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [сервер]:  Просмотреть административные подробности о сервере"
 
-#: ../libgaim/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;канал&gt; +|-&lt;псевдоним&gt;]:  Выгнать пользователя с канала"
 
-#: ../libgaim/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;псевдоним|сервер&gt;:  Загрузить публичный ключ пользователя или "
 "сервера"
 
-#: ../libgaim/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Просмотреть статистику сервера и сети"
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Послать PING серверу"
 
-#: ../libgaim/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;канал&gt;:  Вывести список пользователей, присутствующих на канале"
 
-#: ../libgaim/protocols/silc/silc.c:1709
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -13619,111 +9792,116 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1820
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "Модуль протокола SILC"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1822
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Протокол Secure Internet Live Conferencing (SILC)"
 
-#: ../libgaim/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+msgid "Network"
+msgstr "Сеть"
+
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "Файл публичного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "Файл личного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "Шифр"
 
-#: ../libgaim/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libgaim/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "Аутентификация публичного ключа"
 
-#: ../libgaim/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "Запретить просмотр другими пользователями"
 
-#: ../libgaim/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "Блокировать приглашения"
 
-#: ../libgaim/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "Блокировать сообщения без обмена ключами"
 
-#: ../libgaim/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "Отвергать запросы атрибута сетевого статуса"
 
-#: ../libgaim/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1907
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
 msgstr "Делать цифровую подпись и проверку всех сообщений"
 
-#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Создание пары ключей SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libgaim/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Настоящее имя: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Имя пользователя: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Имя узла: \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"
@@ -13731,79 +9909,80 @@
 "\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Информация о публичном ключе"
 
-#: ../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:1486
 msgid "Could not connect"
 msgstr "Не удалось установить соединение"
 
-#: ../libgaim/protocols/simple/simple.c:1516
-#: ../libgaim/protocols/simple/simple.c:1558
-#: ../libgaim/protocols/simple/simple.c:1571
-#: ../libgaim/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1520
+#: ../libpurple/protocols/simple/simple.c:1562
+#: ../libpurple/protocols/simple/simple.c:1575
+#: ../libpurple/protocols/simple/simple.c:1626
 msgid "Could not create listen socket"
 msgstr "Не удалось создать сокет для прослушивания"
 
-#: ../libgaim/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1543
 msgid "Couldn't resolve host"
-msgstr "Не удалось определить адрес узла"
-
-#: ../libgaim/protocols/simple/simple.c:1630
+msgstr "Не удалось разрешить имя узла"
+
+#: ../libpurple/protocols/simple/simple.c:1634
 msgid "Could not resolve hostname"
-msgstr "Не удалось определить адрес узла"
-
-#: ../libgaim/protocols/simple/simple.c:1647
+msgstr "Не удалось разрешить имя узла"
+
+#: ../libpurple/protocols/simple/simple.c:1651
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 "Идентификаторы пользователей SIP не могут содержать пробелы или символы @"
@@ -13816,158 +9995,158 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1826
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1827
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Модуль протокола SIP/SIMPLE"
 
-#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1855
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use UDP"
 msgstr "Использовать UDP"
 
-#: ../libgaim/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Use proxy"
 msgstr "Использовать прокси"
 
-#: ../libgaim/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../libgaim/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth User"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Auth Domain"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:139
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Поиск %s"
 
-#: ../libgaim/protocols/toc/toc.c:148
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Не удалось установить соединение с %s"
 
-#: ../libgaim/protocols/toc/toc.c:201
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Подключение: %s"
 
-#: ../libgaim/protocols/toc/toc.c:488
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Не удаётся записать файл %s."
 
-#: ../libgaim/protocols/toc/toc.c:491
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Не удаётся прочитать файл %s."
 
-#: ../libgaim/protocols/toc/toc.c:494
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Сообщение слишком велико, последние %s байт обрезаны."
 
-#: ../libgaim/protocols/toc/toc.c:497
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s сейчас не в сети."
 
-#: ../libgaim/protocols/toc/toc.c:500
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Предупреждение %s не разрешено."
 
-#: ../libgaim/protocols/toc/toc.c:503
+#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Сообщение было отброшено, вы превышаете предел скорости сервера."
 
-#: ../libgaim/protocols/toc/toc.c:506
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Чат в %s недоступен."
 
-#: ../libgaim/protocols/toc/toc.c:509
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Вы отправляете сообщения к %s слишком часто."
 
-#: ../libgaim/protocols/toc/toc.c:512
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Вы не получили сообщение от %s, так как оно было слишком велико."
 
-#: ../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 "Поиск e-mail запрещён."
 
-#: ../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."
@@ -13975,90 +10154,80 @@
 "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
 "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
 
-#: ../libgaim/protocols/toc/toc.c:560
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Произошла неизвестная ошибка подключения: %s."
 
-#: ../libgaim/protocols/toc/toc.c:563
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Произошла неизвестная ошибка %d. Информация: %s"
 
-#: ../libgaim/protocols/toc/toc.c:590
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Неверное имя группы"
 
-#: ../libgaim/protocols/toc/toc.c:674
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Соединение разорвано"
 
-#: ../libgaim/protocols/toc/toc.c:714
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Ожидание ответа..."
 
-#: ../libgaim/protocols/toc/toc.c:792
+#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: ../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 ""
-
-#: ../libgaim/protocols/toc/toc.c:1000
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-
-#: ../libgaim/protocols/toc/toc.c:1373
+#: ../libpurple/protocols/toc/toc.c:1366
 msgid "_Group:"
 msgstr "_Группа:"
 
-#: ../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] ""
 msgstr[1] ""
-
-#: ../libgaim/protocols/toc/toc.c:2236
+msgstr[2] ""
+
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s запрашивает передачу файла ему"
@@ -14073,34 +10242,34 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Модуль протокола TOC"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:793
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ваше сообщение Yahoo! не отправлено."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3732
-msgid "Buzz!!"
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:898
+#: ../libpurple/protocols/yahoo/yahoo.c:878
+#, c-format
+msgid "%s just sent you a Buzz!"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:928
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Системное сообщение Yahoo! для %s:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:958
+#: ../libpurple/protocols/yahoo/yahoo.c:988
 msgid "Authorization denied message:"
 msgstr "Сообщение отказа в авторизации:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1069
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s (повторно) не разрешил добавить его в ваш список."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1040
+#: ../libpurple/protocols/yahoo/yahoo.c:1072
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -14108,182 +10277,175 @@
 msgstr ""
 "%s (повторно) не разрешил добавить его в ваш список по следующей причине: %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1043
+#: ../libpurple/protocols/yahoo/yahoo.c:1075
 msgid "Add buddy rejected"
 msgstr "В добавлении собеседника отказано"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1794
+#: ../libpurple/protocols/yahoo/yahoo.c:1826
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1797
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1829
 msgid "Failed Yahoo! Authentication"
 msgstr "Аутентификация Yahoo! завершилась неудачно"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1863
+#: ../libpurple/protocols/yahoo/yahoo.c:1895
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1866
+#: ../libpurple/protocols/yahoo/yahoo.c:1898
 msgid "Ignore buddy?"
 msgstr "Игнорировать собеседника?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1914
-msgid "Normal authentication failed!"
-msgstr "Обычная аутентификация завершилась неудачно!"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1915
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1926
+#: ../libpurple/protocols/yahoo/yahoo.c:1957
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Ваша учётная запись заблокирована, войдите с веб-сайта Yahoo!."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/yahoo/yahoo.c:1960
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Неизвестная ошибка номер %d. Вход с веб-сайта Yahoo! может исправить это."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1983
+#: ../libpurple/protocols/yahoo/yahoo.c:2014
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не удалось добавить собеседника %s в группу %s в список на сервере учётной "
 "записи %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1986
+#: ../libpurple/protocols/yahoo/yahoo.c:2017
 msgid "Could not add buddy to server list"
 msgstr "Не удалось добавить собеседника в список на сервере"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2436
+#: ../libpurple/protocols/yahoo/yahoo.c:2468
 msgid "Received unexpected HTTP response from server."
 msgstr "Получен непредвиденный HTTP-отклик от сервера."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2460
-#: ../libgaim/protocols/yahoo/yahoo.c:2632
-#: ../libgaim/protocols/yahoo/yahoo.c:2735
-#: ../libgaim/protocols/yahoo/yahoo.c:2745
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
-#: ../libgaim/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2492
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
+#: ../libpurple/protocols/yahoo/yahoo.c:2774
+#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Проблема с соединением"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2860
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Not at Home"
 msgstr "Не дома"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2862
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
 msgid "Not at Desk"
 msgstr "Не за столом"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2864
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
 msgid "Not in Office"
 msgstr "Не в офисе"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2868
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
 msgid "On Vacation"
 msgstr "В отпуске"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2872
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Stepped Out"
 msgstr "Вышел"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2965
-#: ../libgaim/protocols/yahoo/yahoo.c:2995
+#: ../libpurple/protocols/yahoo/yahoo.c:2991
+#: ../libpurple/protocols/yahoo/yahoo.c:3021
 msgid "Not on server list"
 msgstr "Не в списке на сервере"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3012
-#: ../libgaim/protocols/yahoo/yahoo.c:3070
+#: ../libpurple/protocols/yahoo/yahoo.c:3038
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Online"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3015
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3041
+#: ../libpurple/protocols/yahoo/yahoo.c:3117
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3033
+#: ../libpurple/protocols/yahoo/yahoo.c:3059
 msgid "Presence"
 msgstr "Присутствие"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
 msgid "Appear Offline"
 msgstr "Вероятно не в сети"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3133
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Join in Chat"
 msgstr "Присоединиться в чате"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3139
+#: ../libpurple/protocols/yahoo/yahoo.c:3165
 msgid "Initiate Conference"
 msgstr "Создать конференцию"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3167
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Presence Settings"
 msgstr "Настройки присутствия"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3205
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
 msgid "Active which ID?"
 msgstr "Активировать какой ID?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
 msgid "Join who in chat?"
 msgstr "К кому присоединиться в чате?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3224
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Activate ID..."
 msgstr "Активировать ID..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "Присоединиться к пользователю в чате..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3791
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
+msgid "You have just sent a Buzz!"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3825
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Вывести список комнат в сети Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -14297,161 +10459,161 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3899
-#: ../libgaim/protocols/yahoo/yahoo.c:3901
+#: ../libpurple/protocols/yahoo/yahoo.c:4046
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Yahoo Protocol Plugin"
 msgstr "Модуль протокола Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3918
+#: ../libpurple/protocols/yahoo/yahoo.c:4071
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3921
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Pager server"
 msgstr "Сервер пейджера"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3924
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Japan Pager server"
 msgstr "Сервер пейджера Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3927
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Pager port"
 msgstr "Порт пейджера"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3930
+#: ../libpurple/protocols/yahoo/yahoo.c:4083
 msgid "File transfer server"
 msgstr "Сервер передачи файлов"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3933
+#: ../libpurple/protocols/yahoo/yahoo.c:4086
 msgid "Japan file transfer server"
 msgstr "Сервер передачи файлов Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3936
+#: ../libpurple/protocols/yahoo/yahoo.c:4089
 msgid "File transfer port"
 msgstr "Порт передачи файлов"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3939
+#: ../libpurple/protocols/yahoo/yahoo.c:4092
 msgid "Chat room locale"
 msgstr "Языковой формат чата"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3942
+#: ../libpurple/protocols/yahoo/yahoo.c:4095
 msgid "Ignore conference and chatroom invitations"
 msgstr "Игнорировать приглашения в конференции и чаты"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libpurple/protocols/yahoo/yahoo.c:4103
 msgid "Chat room list URL"
 msgstr "URL списка чатов"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4106
 msgid "Yahoo Chat server"
 msgstr "Сервер чата Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3956
+#: ../libpurple/protocols/yahoo/yahoo.c:4109
 msgid "Yahoo Chat port"
 msgstr "Порт чата Yahoo"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: ../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! Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Профиль Yahoo!"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 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:"
@@ -14459,74 +10621,74 @@
 "Если вы хотите просмотреть этот профиль, вам придётся открыть эту ссылку в "
 "вашем браузере:"
 
-#: ../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 "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "Профиль пользователя пуст."
 
-#: ../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"
@@ -14535,7 +10697,7 @@
 "Соединение с сервером потеряно\n"
 "%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:355
+#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -14543,105 +10705,105 @@
 "(Произошла ошибка при преобразовании этого сообщения.\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 "_Класс:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2359
 msgid "_Instance:"
 msgstr "_Инстанция:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2365
 msgid "_Recipient:"
 msgstr "_Получатель:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2376
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Попытка подписки к %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 ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2704
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2709
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2726
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2732
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2738
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2743
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2849
 msgid "Resubscribe"
 msgstr "Подписаться повторно"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2852
 msgid "Retrieve subscriptions from server"
 msgstr "Загрузить подписки с сервера"
 
@@ -14655,45 +10817,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2940
-#: ../libgaim/protocols/zephyr/zephyr.c:2942
+#: ../libpurple/protocols/zephyr/zephyr.c:2945
+#: ../libpurple/protocols/zephyr/zephyr.c:2947
 msgid "Zephyr Protocol Plugin"
 msgstr "Модуль протокола Zephyr"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Use tzc"
 msgstr "Использовать tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "tzc command"
 msgstr "Команда tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Export to .anyone"
 msgstr "Экспортировать в .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Export to .zephyr.subs"
 msgstr "Экспортировать в .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Import from .anyone"
 msgstr "Импортировать из .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2987
 msgid "Import from .zephyr.subs"
 msgstr "Импортировать из .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2990
 msgid "Realm"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2993
 msgid "Exposure"
 msgstr ""
 
-#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
-#: ../libgaim/proxy.c:1579
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1588
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -14702,66 +10864,66 @@
 "Не удаётся создать сокет:\n"
 "%s"
 
-#: ../libgaim/proxy.c:644
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
-#: ../libgaim/proxy.c:768
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Ошибка соединения с 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
-#, fuzzy, c-format
+#: ../libpurple/proxy.c:995
+#, c-format
 msgid "Error resolving %s"
-msgstr "Ошибка чтения %s"
-
-#: ../libgaim/proxy.c:1676
+msgstr "Ошибка разрешения имени %s"
+
+#: ../libpurple/proxy.c:1685
 msgid "Could not resolve host name"
-msgstr "Не удалось определить адрес узла"
+msgstr "Не удалось разрешить имя узла"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Да"
 
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_Нет"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Принять"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libgaim/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr ""
 
-#: ../libgaim/savedstatuses.c:525
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "сохранённые статусы"
 
-#: ../libgaim/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s теперь известен как %s.\n"
 
-#: ../libgaim/server.c:674
+#: ../libpurple/server.c:674
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14770,73 +10932,73 @@
 "%s приглашает %s в чат %s:\n"
 "%s"
 
-#: ../libgaim/server.c:679
+#: ../libpurple/server.c:679
 #, 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:683
 msgid "Accept chat invitation?"
 msgstr "Принять приглашение в чат?"
 
-#: ../libgaim/status.c:153
+#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "Не установлен"
 
-#: ../libgaim/status.c:156
+#: ../libpurple/status.c:157
 msgid "Unavailable"
 msgstr "Недоступен"
 
-#: ../libgaim/status.c:160
+#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr ""
 
-#: ../libgaim/status.c:611
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s изменил статус с %s на %s"
 
-#: ../libgaim/status.c:621
+#: ../libpurple/status.c:620
 #, c-format
 msgid "%s is now %s"
 msgstr "%s теперь %s"
 
-#: ../libgaim/status.c:626
+#: ../libpurple/status.c:625
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s больше не %s"
 
-#: ../libgaim/status.c:1293
+#: ../libpurple/status.c:1257
 #, c-format
 msgid "%s became idle"
 msgstr "%s начал бездействовать"
 
-#: ../libgaim/status.c:1310
+#: ../libpurple/status.c:1274
 #, c-format
 msgid "%s became unidle"
 msgstr "%s перестал бездействовать"
 
-#: ../libgaim/status.c:1376
+#: ../libpurple/status.c:1336
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s начал бездействовать"
 
-#: ../libgaim/status.c:1378
+#: ../libpurple/status.c:1338
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s перестал бездействовать"
 
-#: ../libgaim/util.c:680
+#: ../libpurple/util.c:681
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2434
+#: ../libpurple/util.c:2495
 #, c-format
 msgid "Error Reading %s"
 msgstr "Ошибка чтения %s"
 
-#: ../libgaim/util.c:2435
+#: ../libpurple/util.c:2496
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -14845,79 +11007,4230 @@
 "Произошла ошибка при чтении %s. Файл не был загружен, а старый файл был "
 "переименован в %s~."
 
-#: ../libgaim/util.c:2898
+#: ../libpurple/util.c:2970
 msgid "Calculating..."
 msgstr "Подсчёт..."
 
-#: ../libgaim/util.c:2901
+#: ../libpurple/util.c:2973
 msgid "Unknown."
 msgstr "Неизвестно."
 
-#: ../libgaim/util.c:2927
+#: ../libpurple/util.c:2999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d секунда"
-msgstr[1] "%d секунд"
-
-#: ../libgaim/util.c:2939
+msgstr[1] "%d секунды"
+msgstr[2] "%d секунд"
+
+#: ../libpurple/util.c:3011
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d день"
-msgstr[1] "%d дней"
-
-#: ../libgaim/util.c:2947
+msgstr[1] "%d дня"
+msgstr[2] "%d дней"
+
+#: ../libpurple/util.c:3019
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d час"
-msgstr[1] "%s, %d часов"
-
-#: ../libgaim/util.c:2953
+msgstr[1] "%s, %d часа"
+msgstr[2] "%s, %d часов"
+
+#: ../libpurple/util.c:3025
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d час"
-msgstr[1] "%d часов"
-
-#: ../libgaim/util.c:2961
+msgstr[1] "%d часа"
+msgstr[2] "%d часов"
+
+#: ../libpurple/util.c:3033
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d минута"
-msgstr[1] "%s, %d минут"
-
-#: ../libgaim/util.c:2967
+msgstr[1] "%s, %d минуты"
+msgstr[2] "%s, %d минут"
+
+#: ../libpurple/util.c:3039
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минута"
-msgstr[1] "%d минут"
-
-#: ../libgaim/util.c:3171 ../libgaim/util.c:3469
+msgstr[1] "%d минуты"
+msgstr[2] "%d минут"
+
+#: ../libpurple/util.c:3305 ../libpurple/util.c:3603
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Не удаётся соединиться с %s"
 
-#: ../libgaim/util.c:3297
+#: ../libpurple/util.c:3431
 #, 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:3332
+#: ../libpurple/util.c:3466
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Ошибка чтения из %s: %s"
 
-#: ../libgaim/util.c:3363
+#: ../libpurple/util.c:3497
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Ошибка записи в %s: %s"
 
-#: ../libgaim/util.c:3388
+#: ../libpurple/util.c:3522
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Не удаётся соединиться с %s: %s"
+
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "Клиент обмена мгновенными сообщениями"
+
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Клиент обмена мгновенными сообщениями Pidgin"
+
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Обмен мгновенными сообщениями с использованием множества протоколов"
+
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Ориентация"
+
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Ориентация лотка."
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:398
+msgid "Login Options"
+msgstr "Параметры входа"
+
+#: ../pidgin/gtkaccount.c:500
+msgid "Local alias:"
+msgstr "Локальный псевдоним:"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:562
+msgid "User Options"
+msgstr "Параметры пользователя"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:580
+msgid "Use this buddy icon for this account:"
+msgstr "Использовать этот значок собеседника для этой учётной записи:"
+
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:700
+#, c-format
+msgid "%s Options"
+msgstr "Параметры %s"
+
+#: ../pidgin/gtkaccount.c:897
+msgid "Use GNOME Proxy Settings"
+msgstr "Использовать настройки прокси GNOME"
+
+#: ../pidgin/gtkaccount.c:898
+msgid "Use Global Proxy Settings"
+msgstr "Использовать глобальные настройки прокси"
+
+#: ../pidgin/gtkaccount.c:904
+msgid "No Proxy"
+msgstr "Нет прокси"
+
+#: ../pidgin/gtkaccount.c:910
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../pidgin/gtkaccount.c:916
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../pidgin/gtkaccount.c:922
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+msgid "Use Environmental Settings"
+msgstr "Использовать настройки окружения"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../pidgin/gtkaccount.c:967
+msgid "If you look real closely"
+msgstr "Если приглядитесь"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:970
+msgid "you can see the butterflies mating"
+msgstr "вы можете увидеть спаривающихся бабочек"
+
+#: ../pidgin/gtkaccount.c:991
+msgid "Proxy Options"
+msgstr "Параметры прокси"
+
+#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "_Тип прокси:"
+
+#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "_Узел:"
+
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "П_орт:"
+
+#: ../pidgin/gtkaccount.c:1026
+msgid "_Username:"
+msgstr "_Имя пользователя:"
+
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "Па_роль:"
+
+#: ../pidgin/gtkaccount.c:1439
+msgid "Add Account"
+msgstr "Добавить учётную запись"
+
+#: ../pidgin/gtkaccount.c:1463
+msgid "_Basic"
+msgstr "_Основные"
+
+#: ../pidgin/gtkaccount.c:1474
+msgid "_Advanced"
+msgstr "_Дополнительные"
+
+#: ../pidgin/gtkaccount.c:1946 ../pidgin/gtkplugin.c:568
+msgid "Enabled"
+msgstr "Включено"
+
+#: ../pidgin/gtkaccount.c:1974
+msgid "Protocol"
+msgstr "Протокол"
+
+#: ../pidgin/gtkaccount.c:2168
+#, 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:722
+msgid "Join a Chat"
+msgstr "Присоединиться к чату"
+
+#: ../pidgin/gtkblist.c:743
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Введите соответствующую информацию о чате, к которому вы хотели бы "
+"присоединиться.\n"
+
+#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "У_чётная запись:"
+
+#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
+msgid "_Block"
+msgstr "_Блокировать"
+
+#: ../pidgin/gtkblist.c:1028
+msgid "Un_block"
+msgstr "Раз_блокировать"
+
+#: ../pidgin/gtkblist.c:1079
+msgid "Get _Info"
+msgstr "_Информация"
+
+#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:84
+msgid "I_M"
+msgstr "Мгновенное сооб_щение"
+
+#: ../pidgin/gtkblist.c:1088
+msgid "_Send File"
+msgstr "Отправить _файл"
+
+#: ../pidgin/gtkblist.c:1095
+msgid "Add Buddy _Pounce"
+msgstr "Добавить п_равило"
+
+#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
+#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
+msgid "View _Log"
+msgstr "Просмотреть _журнал"
+
+#: ../pidgin/gtkblist.c:1115
+msgid "Alias..."
+msgstr "Псевдоним..."
+
+#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1234
+msgid "_Alias..."
+msgstr "_Псевдоним..."
+
+#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1236
+msgid "_Remove"
+msgstr "_Удалить"
+
+#: ../pidgin/gtkblist.c:1175
+msgid "Add a _Buddy"
+msgstr "Добавить _собеседника"
+
+#: ../pidgin/gtkblist.c:1178
+msgid "Add a C_hat"
+msgstr "Добавить _чат"
+
+#: ../pidgin/gtkblist.c:1181
+msgid "_Delete Group"
+msgstr "_Удалить группу"
+
+#: ../pidgin/gtkblist.c:1183
+msgid "_Rename"
+msgstr "Пере_именовать"
+
+#. join button
+#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+msgid "_Join"
+msgstr "П_рисоединиться"
+
+#: ../pidgin/gtkblist.c:1203
+msgid "Auto-Join"
+msgstr "Присоединяться автоматически"
+
+#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
+msgid "_Collapse"
+msgstr "_Свернуть"
+
+#: ../pidgin/gtkblist.c:1269
+msgid "_Expand"
+msgstr "Р_азвернуть"
+
+#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
+#: ../pidgin/gtkblist.c:4490 ../pidgin/gtkblist.c:4500
+msgid "/Tools/Mute Sounds"
+msgstr "/Инструменты/Отключить звуки"
+
+#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkpounce.c:423
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Вы не подключены с учётной записью, позволяющей добавить этого собеседника."
+
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2815
+msgid "/_Buddies"
+msgstr "/_Собеседники"
+
+#: ../pidgin/gtkblist.c:2816
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Собеседники/Новое мгновенное сооб_щение..."
+
+#: ../pidgin/gtkblist.c:2817
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Собеседники/Присоединиться к _чату..."
+
+#: ../pidgin/gtkblist.c:2818
+msgid "/Buddies/Get User _Info..."
+msgstr "/Собеседники/Получить пользовательскую _информацию..."
+
+#: ../pidgin/gtkblist.c:2819
+msgid "/Buddies/View User _Log..."
+msgstr "/Собеседники/Просмотреть _журнал пользователя..."
+
+#: ../pidgin/gtkblist.c:2821
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Собеседники/Показывать собеседников _не в сети"
+
+#: ../pidgin/gtkblist.c:2822
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Собеседники/Показывать п_устые группы"
+
+#: ../pidgin/gtkblist.c:2823
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Собеседники/Показывать _подробности о собеседнике"
+
+#: ../pidgin/gtkblist.c:2824
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Собеседники/Показывать _время бездействия"
+
+#: ../pidgin/gtkblist.c:2825
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Собеседники/_Сортировать собеседников"
+
+#: ../pidgin/gtkblist.c:2827
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Собеседники/_Добавить собеседника..."
+
+#: ../pidgin/gtkblist.c:2828
+msgid "/Buddies/Add C_hat..."
+msgstr "/Собеседники/Добавить ч_ат..."
+
+#: ../pidgin/gtkblist.c:2829
+msgid "/Buddies/Add _Group..."
+msgstr "/Собеседники/Добавить _группу..."
+
+#: ../pidgin/gtkblist.c:2831
+msgid "/Buddies/_Quit"
+msgstr "/Собеседники/В_ыйти"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2834
+msgid "/_Accounts"
+msgstr "/_Учётные записи"
+
+#: ../pidgin/gtkblist.c:2835 ../pidgin/gtkblist.c:6413
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Учётные записи/Добавить\\/Изменить"
+
+#. Tools
+#: ../pidgin/gtkblist.c:2838
+msgid "/_Tools"
+msgstr "/_Инструменты"
+
+#: ../pidgin/gtkblist.c:2839
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Инструменты/_Слежение за собеседниками"
+
+#: ../pidgin/gtkblist.c:2840
+msgid "/Tools/Plu_gins"
+msgstr "/Инструменты/_Модули"
+
+#: ../pidgin/gtkblist.c:2841
+msgid "/Tools/Pr_eferences"
+msgstr "/Инструменты/_Настройки"
+
+#: ../pidgin/gtkblist.c:2842
+msgid "/Tools/Pr_ivacy"
+msgstr "/Инструменты/К_онфиденциальность"
+
+#: ../pidgin/gtkblist.c:2844
+msgid "/Tools/_File Transfers"
+msgstr "/Инструменты/Передача _файлов"
+
+#: ../pidgin/gtkblist.c:2845
+msgid "/Tools/R_oom List"
+msgstr "/Инструменты/Список _комнат"
+
+#: ../pidgin/gtkblist.c:2846
+msgid "/Tools/System _Log"
+msgstr "/Инструменты/Системный _журнал"
+
+#: ../pidgin/gtkblist.c:2848
+msgid "/Tools/Mute _Sounds"
+msgstr "/Инструменты/Отключить _звуки"
+
+#. Help
+#: ../pidgin/gtkblist.c:2851
+msgid "/_Help"
+msgstr "/_Помощь"
+
+#: ../pidgin/gtkblist.c:2852
+msgid "/Help/Online _Help"
+msgstr "/Помощь/Помощь в _сети"
+
+#: ../pidgin/gtkblist.c:2853
+msgid "/Help/_Debug Window"
+msgstr "/Помощь/Окно _отладки"
+
+#: ../pidgin/gtkblist.c:2854
+msgid "/Help/_About"
+msgstr "/Помощь/О _программе"
+
+#: ../pidgin/gtkblist.c:2882
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Учётная запись:</b> %s"
+
+#: ../pidgin/gtkblist.c:2960
+msgid "Buddy Alias"
+msgstr "Псевдоним собеседника"
+
+#: ../pidgin/gtkblist.c:2981
+msgid "Logged In"
+msgstr "В сети"
+
+#: ../pidgin/gtkblist.c:3027
+msgid "Last Seen"
+msgstr "Последнее появление"
+
+#: ../pidgin/gtkblist.c:3047
+msgid "Spooky"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3049
+msgid "Awesome"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3051
+msgid "Rockin'"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3376
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Бездействует %dч %02dм"
+
+#: ../pidgin/gtkblist.c:3378
+#, c-format
+msgid "Idle %dm"
+msgstr "Бездействует %dм"
+
+#: ../pidgin/gtkblist.c:3515
+msgid "/Buddies/New Instant Message..."
+msgstr "/Собеседники/Новое мгновенное сообщение..."
+
+#: ../pidgin/gtkblist.c:3516 ../pidgin/gtkblist.c:3549
+msgid "/Buddies/Join a Chat..."
+msgstr "/Собеседники/Присоединиться к чату..."
+
+#: ../pidgin/gtkblist.c:3517
+msgid "/Buddies/Get User Info..."
+msgstr "/Собеседники/Получить пользовательскую информацию..."
+
+#: ../pidgin/gtkblist.c:3518
+msgid "/Buddies/Add Buddy..."
+msgstr "/Собеседники/Добавить собеседника..."
+
+#: ../pidgin/gtkblist.c:3519 ../pidgin/gtkblist.c:3552
+msgid "/Buddies/Add Chat..."
+msgstr "/Собеседники/Добавить чат..."
+
+#: ../pidgin/gtkblist.c:3520
+msgid "/Buddies/Add Group..."
+msgstr "/Собеседники/Добавить группу..."
+
+#: ../pidgin/gtkblist.c:3555
+msgid "/Tools/Privacy"
+msgstr "/Инструменты/Конфиденциальность"
+
+#: ../pidgin/gtkblist.c:3558
+msgid "/Tools/Room List"
+msgstr "/Инструменты/Список комнат"
+
+#: ../pidgin/gtkblist.c:3655 ../pidgin/gtkdocklet.c:156
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d непрочитанное сообщение от %s\n"
+msgstr[1] "%d непрочитанных сообщения от %s\n"
+msgstr[2] "%d непрочитанных сообщений от %s\n"
+
+#: ../pidgin/gtkblist.c:3732
+msgid "Manually"
+msgstr "Вручную"
+
+#: ../pidgin/gtkblist.c:3734
+msgid "Alphabetically"
+msgstr "По алфавиту"
+
+#: ../pidgin/gtkblist.c:3735
+msgid "By status"
+msgstr "По статусу"
+
+#: ../pidgin/gtkblist.c:3736
+msgid "By log size"
+msgstr "По размеру журнала"
+
+#: ../pidgin/gtkblist.c:3938 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "Соединение с %s разорвано"
+
+#: ../pidgin/gtkblist.c:3948
+msgid "Re-enable Account"
+msgstr "Повторно включить учётную запись"
+
+#: ../pidgin/gtkblist.c:3969
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">Соединение с %s разорвано: %s</span>"
+
+#: ../pidgin/gtkblist.c:4122
+msgid "<b>Username:</b>"
+msgstr "<b>Имя пользователя:</b>"
+
+#: ../pidgin/gtkblist.c:4129
+msgid "<b>Password:</b>"
+msgstr "<b>Пароль:</b>"
+
+#: ../pidgin/gtkblist.c:4140
+msgid "_Login"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4225
+msgid "/Accounts"
+msgstr "/Учётные записи"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4239
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span weight='bold' size='larger'>Добро пожаловать в %s!</span>\n"
+"\n"
+"Не включено ни одной учётной записи. Включите ваши учётные записи из окна "
+"<b>Учётные записи</b>, доступного через меню <b>Учётные записи->Добавить/"
+"Изменить</b>. Сделав это, вы сможете войти в сеть, установить свой статус и "
+"начать общение с друзьями."
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4484
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/Собеседники/Показывать собеседников не в сети"
+
+#: ../pidgin/gtkblist.c:4487
+msgid "/Buddies/Show Empty Groups"
+msgstr "/Собеседники/Показывать пустые группы"
+
+#: ../pidgin/gtkblist.c:4493
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Собеседники/Показывать подробности о собеседнике"
+
+#: ../pidgin/gtkblist.c:4496
+msgid "/Buddies/Show Idle Times"
+msgstr "/Собеседники/Показывать время бездействия"
+
+#: ../pidgin/gtkblist.c:5334
+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:5394 ../pidgin/gtkblist.c:5755
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Группа:"
+
+#: ../pidgin/gtkblist.c:5653
+msgid "This protocol does not support chat rooms."
+msgstr "Этот протокол не поддерживает чаты."
+
+#: ../pidgin/gtkblist.c:5669
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "Вы не подключены по протоколам, имеющим поддержку чатов."
+
+#: ../pidgin/gtkblist.c:5710
+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:5793
+msgid "Please enter the name of the group to be added."
+msgstr "Введите имя добавляемой группы."
+
+#: ../pidgin/gtkblist.c:6433
+msgid "<PurpleMain>/Accounts/"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6457
+msgid "_Edit Account"
+msgstr "_Изменить учётную запись"
+
+#: ../pidgin/gtkblist.c:6470 ../pidgin/gtkconv.c:2900
+msgid "No actions available"
+msgstr "Нет доступных действий"
+
+#: ../pidgin/gtkblist.c:6478
+msgid "_Disable"
+msgstr "_Выключить"
+
+#: ../pidgin/gtkblist.c:6490
+msgid "Enable Account"
+msgstr "Включить учётную запись"
+
+#: ../pidgin/gtkblist.c:6496
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6545
+msgid "/Tools"
+msgstr "/Инструменты"
+
+#: ../pidgin/gtkblist.c:6615
+msgid "/Buddies/Sort Buddies"
+msgstr "/Собеседники/Сортировать собеседников"
+
+#: ../pidgin/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+
+#: ../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 "_Собеседник:"
+
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
+msgid "_Message:"
+msgstr "Сооб_щение:"
+
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "Не удаётся открыть файл."
+
+#: ../pidgin/gtkconv.c:989
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Беседа с %s</h1>\n"
+
+#: ../pidgin/gtkconv.c:1013
+msgid "Save Conversation"
+msgstr "Сохранить беседу"
+
+#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+msgid "Find"
+msgstr "Найти"
+
+#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "_Искать:"
+
+#: ../pidgin/gtkconv.c:1340
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Ведение журнала начато. Последующие сообщения в этой беседе будут записаны."
+
+#: ../pidgin/gtkconv.c:1348
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Ведение журнала остановлено. Последующие сообщения в этой беседе не будут "
+"записаны."
+
+#: ../pidgin/gtkconv.c:1596
+msgid "Un-Ignore"
+msgstr "Не игнорировать"
+
+#: ../pidgin/gtkconv.c:1599
+msgid "Ignore"
+msgstr "Игнорировать"
+
+#: ../pidgin/gtkconv.c:1619
+msgid "Get Away Message"
+msgstr "Получить сообщение об отсутствии"
+
+#: ../pidgin/gtkconv.c:1642
+msgid "Last said"
+msgstr "Последнее сказанное"
+
+#: ../pidgin/gtkconv.c:2484
+msgid "Unable to save icon file to disk."
+msgstr "Не удаётся сохранить файл значка на диск."
+
+#: ../pidgin/gtkconv.c:2535
+msgid "Save Icon"
+msgstr "Сохранить значок"
+
+#: ../pidgin/gtkconv.c:2587
+msgid "Animate"
+msgstr "Анимировать"
+
+#: ../pidgin/gtkconv.c:2592
+msgid "Hide Icon"
+msgstr "Скрыть значок"
+
+#: ../pidgin/gtkconv.c:2595
+msgid "Save Icon As..."
+msgstr "Сохранить значок как..."
+
+#: ../pidgin/gtkconv.c:2599
+msgid "Set Custom Icon..."
+msgstr "Установить собственный значок..."
+
+#: ../pidgin/gtkconv.c:2612
+msgid "Remove Custom Icon"
+msgstr "Удалить собственный значок"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2754
+msgid "/_Conversation"
+msgstr "/_Беседа"
+
+#: ../pidgin/gtkconv.c:2756
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Беседа/Новое мгновенное сооб_щение..."
+
+#: ../pidgin/gtkconv.c:2761
+msgid "/Conversation/_Find..."
+msgstr "/Беседа/_Найти..."
+
+#: ../pidgin/gtkconv.c:2763
+msgid "/Conversation/View _Log"
+msgstr "/Беседа/Просмотреть _журнал"
+
+#: ../pidgin/gtkconv.c:2764
+msgid "/Conversation/_Save As..."
+msgstr "/Беседа/Со_хранить как..."
+
+#: ../pidgin/gtkconv.c:2766
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Беседа/О_чистить"
+
+#: ../pidgin/gtkconv.c:2770
+msgid "/Conversation/Se_nd File..."
+msgstr "/Беседа/Отправить _файл..."
+
+#: ../pidgin/gtkconv.c:2771
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Беседа/Добавить п_равило..."
+
+#: ../pidgin/gtkconv.c:2773
+msgid "/Conversation/_Get Info"
+msgstr "/Беседа/Получить _информацию"
+
+#: ../pidgin/gtkconv.c:2775
+msgid "/Conversation/In_vite..."
+msgstr "/Беседа/Приг_ласить..."
+
+#: ../pidgin/gtkconv.c:2777
+msgid "/Conversation/M_ore"
+msgstr "/Беседа/_Ещё"
+
+#: ../pidgin/gtkconv.c:2781
+msgid "/Conversation/Al_ias..."
+msgstr "/Беседа/_Псевдоним..."
+
+#: ../pidgin/gtkconv.c:2783
+msgid "/Conversation/_Block..."
+msgstr "/Беседа/_Блокировать..."
+
+#: ../pidgin/gtkconv.c:2785
+msgid "/Conversation/_Unblock..."
+msgstr "/Беседа/Раз_блокировать..."
+
+#: ../pidgin/gtkconv.c:2787
+msgid "/Conversation/_Add..."
+msgstr "/Беседа/_Добавить..."
+
+#: ../pidgin/gtkconv.c:2789
+msgid "/Conversation/_Remove..."
+msgstr "/Беседа/_Удалить..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/_Close"
+msgstr "/Беседа/_Закрыть"
+
+#. Options
+#: ../pidgin/gtkconv.c:2798
+msgid "/_Options"
+msgstr "/_Параметры"
+
+#: ../pidgin/gtkconv.c:2799
+msgid "/Options/Enable _Logging"
+msgstr "/Параметры/Вести _журнал"
+
+#: ../pidgin/gtkconv.c:2800
+msgid "/Options/Enable _Sounds"
+msgstr "/Параметры/Воспроизводить _звуки"
+
+#: ../pidgin/gtkconv.c:2801
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Параметры/Показывать з_начок собеседника"
+
+#: ../pidgin/gtkconv.c:2803
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Параметры/Показывать _панели форматирования"
+
+#: ../pidgin/gtkconv.c:2804
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Параметры/Показывать _время сообщений"
+
+#: ../pidgin/gtkconv.c:2879
+msgid "/Conversation/More"
+msgstr "/Беседа/Ещё"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+msgid "/Conversation"
+msgstr "/Беседа"
+
+#: ../pidgin/gtkconv.c:2964
+msgid "/Conversation/View Log"
+msgstr "/Беседа/Просмотреть журнал"
+
+#: ../pidgin/gtkconv.c:2970
+msgid "/Conversation/Send File..."
+msgstr "/Беседа/Отправить файл..."
+
+#: ../pidgin/gtkconv.c:2974
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Беседа/Добавить правило..."
+
+#: ../pidgin/gtkconv.c:2980
+msgid "/Conversation/Get Info"
+msgstr "/Беседа/Получить информацию"
+
+#: ../pidgin/gtkconv.c:2984
+msgid "/Conversation/Invite..."
+msgstr "/Беседа/Пригласить..."
+
+#: ../pidgin/gtkconv.c:2990
+msgid "/Conversation/Alias..."
+msgstr "/Беседа/Псевдоним..."
+
+#: ../pidgin/gtkconv.c:2994
+msgid "/Conversation/Block..."
+msgstr "/Беседа/Блокировать..."
+
+#: ../pidgin/gtkconv.c:2998
+msgid "/Conversation/Unblock..."
+msgstr "/Беседа/Разблокировать..."
+
+#: ../pidgin/gtkconv.c:3002
+msgid "/Conversation/Add..."
+msgstr "/Беседа/Добавить..."
+
+#: ../pidgin/gtkconv.c:3006
+msgid "/Conversation/Remove..."
+msgstr "/Беседа/Удалить..."
+
+#: ../pidgin/gtkconv.c:3010
+msgid "/Options/Enable Logging"
+msgstr "/Параметры/Вести журнал"
+
+#: ../pidgin/gtkconv.c:3013
+msgid "/Options/Enable Sounds"
+msgstr "/Параметры/Воспроизводить звуки"
+
+#: ../pidgin/gtkconv.c:3026
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Параметры/Показывать панели форматирования"
+
+#: ../pidgin/gtkconv.c:3029
+msgid "/Options/Show Timestamps"
+msgstr "/Параметры/Показывать время сообщений"
+
+#: ../pidgin/gtkconv.c:3032
+msgid "/Options/Show Buddy Icon"
+msgstr "/Параметры/Показывать значок собеседника"
+
+#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+msgid "User is typing..."
+msgstr "Пользователь набирает сообщение..."
+
+#: ../pidgin/gtkconv.c:3159
+msgid "User has typed something and stopped"
+msgstr "Пользователь что-то набрал и остановился"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3341
+msgid "_Send To"
+msgstr "_Адресат"
+
+#: ../pidgin/gtkconv.c:4049
+msgid "_Send"
+msgstr "_Отправить"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4197
+msgid "0 people in room"
+msgstr "0 пользователей в комнате"
+
+#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d пользователь в комнате"
+msgstr[1] "%d пользователя в комнате"
+msgstr[2] "%d пользователей в комнате"
+
+#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+msgid "Typing"
+msgstr "Набирает сообщение"
+
+#: ../pidgin/gtkconv.c:6054
+msgid "Stopped Typing"
+msgstr "Прекратил набор сообщения"
+
+#: ../pidgin/gtkconv.c:6059
+msgid "Nick Said"
+msgstr "Произнесено имя"
+
+#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
+msgid "Unread Messages"
+msgstr "Непрочитанные сообщения"
+
+#: ../pidgin/gtkconv.c:6069
+msgid "New Event"
+msgstr "Новое событие"
+
+#: ../pidgin/gtkconv.c:7196
+msgid "Confirm close"
+msgstr "Подтвердить закрытие"
+
+#: ../pidgin/gtkconv.c:7228
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Есть непрочитанные сообщения. Вы действительно хотите закрыть окно?"
+
+#: ../pidgin/gtkconv.c:7763
+msgid "Close other tabs"
+msgstr "Закрыть другие вкладки"
+
+#: ../pidgin/gtkconv.c:7769
+msgid "Close all tabs"
+msgstr "Закрыть все вкладки"
+
+#: ../pidgin/gtkconv.c:7777
+msgid "Detach this tab"
+msgstr "Отделить эту вкладку"
+
+#: ../pidgin/gtkconv.c:7783
+msgid "Close this tab"
+msgstr "Закрыть эту вкладку"
+
+#: ../pidgin/gtkconv.c:8086
+msgid "Close conversation"
+msgstr "Закрыть беседу"
+
+#: ../pidgin/gtkconv.c:8550
+msgid "Last created window"
+msgstr "Последнее созданное окно"
+
+#: ../pidgin/gtkconv.c:8552
+msgid "Separate IM and Chat windows"
+msgstr "Отдельные окна мгновенных сообщений и чатов"
+
+#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+msgid "New window"
+msgstr "Новое окно"
+
+#: ../pidgin/gtkconv.c:8556
+msgid "By group"
+msgstr "По группе"
+
+#: ../pidgin/gtkconv.c:8558
+msgid "By account"
+msgstr "По учётной записи"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "Сохранить отладочную информацию в журнал"
+
+#: ../pidgin/gtkdebug.c:596
+msgid "Invert"
+msgstr "Инвертировать"
+
+#: ../pidgin/gtkdebug.c:599
+msgid "Highlight matches"
+msgstr "Подсветить совпадения"
+
+#: ../pidgin/gtkdebug.c:666
+msgid "_Icon Only"
+msgstr "Только _значки"
+
+#: ../pidgin/gtkdebug.c:667
+msgid "_Text Only"
+msgstr "Только _текст"
+
+#: ../pidgin/gtkdebug.c:668
+msgid "_Both Icon & Text"
+msgstr "Значки _и текст"
+
+#: ../pidgin/gtkdebug.c:804
+msgid "Filter"
+msgstr "Фильтр"
+
+#: ../pidgin/gtkdebug.c:823
+msgid "Right click for more options."
+msgstr "Щёлкните правой кнопкой мыши для доступа к другим параметрам."
+
+#: ../pidgin/gtkdebug.c:853
+msgid "Level "
+msgstr "Уровень "
+
+#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+msgid "Select the debug filter level."
+msgstr ""
+
+#: ../pidgin/gtkdebug.c:862
+msgid "All"
+msgstr "Все"
+
+#: ../pidgin/gtkdebug.c:863
+msgid "Misc"
+msgstr "Разное"
+
+#: ../pidgin/gtkdebug.c:865
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: ../pidgin/gtkdebug.c:866
+msgid "Error "
+msgstr "Ошибка "
+
+#: ../pidgin/gtkdebug.c:867
+msgid "Fatal Error"
+msgstr "Неисправимая ошибка"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+msgid "lead developer"
+msgstr "ведущий разработчик"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
+msgid "developer"
+msgstr "разработчик"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "разработчик и веб-мастер"
+
+#: ../pidgin/gtkdialogs.c:85
+msgid "support"
+msgstr "поддержка"
+
+#: ../pidgin/gtkdialogs.c:86
+msgid "support/QA"
+msgstr "поддержка и контроль качества"
+
+#: ../pidgin/gtkdialogs.c:109
+msgid "win32 port"
+msgstr "порт win32"
+
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+msgid "maintainer"
+msgstr "сопровождающий"
+
+#: ../pidgin/gtkdialogs.c:112
+msgid "libfaim maintainer"
+msgstr "сопровождающий libfaim"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:114
+msgid "hacker and designated driver [lazy bum]"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:115
+msgid "Jabber developer"
+msgstr "Jabber-разработчик"
+
+#: ../pidgin/gtkdialogs.c:116
+msgid "original author"
+msgstr "оригинальный автор"
+
+#: ../pidgin/gtkdialogs.c:123
+msgid "Afrikaans"
+msgstr "Африкаанс"
+
+#: ../pidgin/gtkdialogs.c:124
+msgid "Arabic"
+msgstr "Арабский"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "Болгарский"
+
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+msgid "Bengali"
+msgstr "Бенгальский"
+
+#: ../pidgin/gtkdialogs.c:131
+msgid "Bosnian"
+msgstr "Боснийский"
+
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
+msgid "Catalan"
+msgstr "Каталанский"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+msgid "Valencian-Catalan"
+msgstr "Валенсийский-каталанский"
+
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+msgid "Czech"
+msgstr "Чешский"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+msgid "Danish"
+msgstr "Датский"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
+msgid "German"
+msgstr "Немецкий"
+
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
+msgid "Dzongkha"
+msgstr "Дзонг-кэ"
+
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+msgid "Greek"
+msgstr "Греческий"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "Australian English"
+msgstr "Австралийский английский"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "Канадский английский"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "Британский английский"
+
+#: ../pidgin/gtkdialogs.c:148
+msgid "Esperanto"
+msgstr "Эсперанто"
+
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
+msgid "Spanish"
+msgstr "Испанский"
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+msgid "Euskera(Basque)"
+msgstr "Баскский"
+
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
+msgid "Persian"
+msgstr "Персидский"
+
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+msgid "Finnish"
+msgstr "Финский"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
+msgid "French"
+msgstr "Французский"
+
+#: ../pidgin/gtkdialogs.c:157
+msgid "Galician"
+msgstr "Галисийский"
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+msgid "Gujarati"
+msgstr "Гуджарати"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+msgid "Hebrew"
+msgstr "Иврит"
+
+#: ../pidgin/gtkdialogs.c:161
+msgid "Hindi"
+msgstr "Хинди"
+
+#: ../pidgin/gtkdialogs.c:162
+msgid "Hungarian"
+msgstr "Венгерский"
+
+#: ../pidgin/gtkdialogs.c:163
+msgid "Indonesian"
+msgstr "Индонезийский"
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+msgid "Italian"
+msgstr "Итальянский"
+
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+msgid "Japanese"
+msgstr "Японский"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+msgid "Georgian"
+msgstr "Грузинский"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada"
+msgstr "Каннада"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+msgid "Korean"
+msgstr "Корейский"
+
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
+msgid "Kurdish"
+msgstr "Курдский"
+
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
+msgid "Lithuanian"
+msgstr "Литовский"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Macedonian"
+msgstr "Македонский"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Bokmål Norwegian"
+msgstr "Букмол"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Nepali"
+msgstr "Непальский"
+
+#: ../pidgin/gtkdialogs.c:176
+msgid "Dutch, Flemish"
+msgstr "Нидерландский, фламандский"
+
+#: ../pidgin/gtkdialogs.c:177
+msgid "Norwegian"
+msgstr "Норвежский"
+
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+msgid "Polish"
+msgstr "Польский"
+
+#: ../pidgin/gtkdialogs.c:181
+msgid "Portuguese"
+msgstr "Португальский"
+
+#: ../pidgin/gtkdialogs.c:182
+msgid "Portuguese-Brazil"
+msgstr "Португальский-бразильский"
+
+#: ../pidgin/gtkdialogs.c:183
+msgid "Pashto"
+msgstr "Пашто"
+
+#: ../pidgin/gtkdialogs.c:184
+msgid "Romanian"
+msgstr "Румынский"
+
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+msgid "Russian"
+msgstr "Русский"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
+msgid "Slovak"
+msgstr "Словацкий"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+msgid "Slovenian"
+msgstr "Словенский"
+
+#: ../pidgin/gtkdialogs.c:189
+msgid "Albanian"
+msgstr "Албанский"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+msgid "Serbian"
+msgstr "Сербский"
+
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+msgid "Swedish"
+msgstr "Шведский"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Tamil"
+msgstr "Тамильский"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Telugu"
+msgstr "Телугу"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Thai"
+msgstr "Тайский"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "Турецкий"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "Vietnamese"
+msgstr "Вьетнамский"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh и команда Gnome-Vi"
+
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+msgid "Simplified Chinese"
+msgstr "Упрощённый китайский"
+
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "Гонконгский китайский"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
+msgid "Traditional Chinese"
+msgstr "Традиционный китайский"
+
+#: ../pidgin/gtkdialogs.c:208
+msgid "Amharic"
+msgstr "Амхарский"
+
+#: ../pidgin/gtkdialogs.c:327
+#, c-format
+msgid "About %s"
+msgstr "О %s"
+
+#: ../pidgin/gtkdialogs.c:363
+#, c-format
+msgid ""
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
+"may modify and redistribute the program under the terms of the GPL (version "
+"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
+"distributed with %s.  %s is copyrighted by its contributors.  See the "
+"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+msgstr ""
+"%s - модульный клиент обмена сообщениями, позволяющий использовать AIM, MSN, "
+"Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
+"Sametime, Bonjour, Zephyr, Gadu-Gadu и QQ одновременно.  Написан с "
+"использованием GTK+.<BR><BR>Вы можете изменять и распространять программу по "
+"условиям GPL (версии 2 или более поздней).  Копия GPL содержится в файле "
+"'COPYING', распространяемом с %s.  Авторские права на %s принадлежат "
+"участникам проекта.  Полный список участников проекта смотрите в файле "
+"'COPYRIGHT'.  Мы не предоставляем никаких гарантий на эту программу.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:378
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 на irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin на irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:387
+msgid "Current Developers"
+msgstr "Текущие разработчики"
+
+#: ../pidgin/gtkdialogs.c:402
+msgid "Crazy Patch Writers"
+msgstr "Одержимые писатели заплаток"
+
+#: ../pidgin/gtkdialogs.c:417
+msgid "Retired Developers"
+msgstr "Разработчики, отошедшие от дел"
+
+#: ../pidgin/gtkdialogs.c:432
+msgid "Artists"
+msgstr "Художники"
+
+#: ../pidgin/gtkdialogs.c:447
+msgid "Current Translators"
+msgstr "Текущие переводчики"
+
+#: ../pidgin/gtkdialogs.c:467
+msgid "Past Translators"
+msgstr "Предыдущие переводчики"
+
+#: ../pidgin/gtkdialogs.c:485
+msgid "Debugging Information"
+msgstr "Отладочная информация"
+
+#: ../pidgin/gtkdialogs.c:854
+msgid "Get User Info"
+msgstr "Получить пользовательскую информацию"
+
+#: ../pidgin/gtkdialogs.c:856
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Введите идентификатор пользователя или псевдоним персоны, информацию о "
+"которой вы хотели бы просмотреть."
+
+#: ../pidgin/gtkdialogs.c:946
+msgid "View User Log"
+msgstr "Просмотреть журнал пользователя"
+
+#: ../pidgin/gtkdialogs.c:948
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Введите идентификатор пользователя или псевдоним персоны, журнал которой вы "
+"хотели бы просмотреть."
+
+#: ../pidgin/gtkdialogs.c:968
+msgid "Alias Contact"
+msgstr "Псевдоним контакта"
+
+#: ../pidgin/gtkdialogs.c:969
+msgid "Enter an alias for this contact."
+msgstr "Введите псевдоним для этого контакта."
+
+#: ../pidgin/gtkdialogs.c:991
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Введите псевдоним для %s."
+
+#: ../pidgin/gtkdialogs.c:993
+msgid "Alias Buddy"
+msgstr "Псевдоним собеседника"
+
+#: ../pidgin/gtkdialogs.c:1014
+msgid "Alias Chat"
+msgstr "Псевдоним чата"
+
+#: ../pidgin/gtkdialogs.c:1015
+msgid "Enter an alias for this chat."
+msgstr "Введите псевдоним для этого чата."
+
+#: ../pidgin/gtkdialogs.c:1054
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"Вы удалите контакт, содержащий %s и %d другого собеседника из списка "
+"собеседников. Хотите продолжить?"
+msgstr[1] ""
+"Вы удалите контакт, содержащий %s и %d других собеседника из списка "
+"собеседников. Хотите продолжить?"
+msgstr[2] ""
+"Вы удалите контакт, содержащий %s и %d других собеседников из списка "
+"собеседников. Хотите продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1062
+msgid "Remove Contact"
+msgstr "Удалить контакт"
+
+#: ../pidgin/gtkdialogs.c:1065
+msgid "_Remove Contact"
+msgstr "_Удалить контакт"
+
+#: ../pidgin/gtkdialogs.c:1096
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"Вы добавите содержимое группы %s к содержимому группы %s. Хотите продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1103
+msgid "Merge Groups"
+msgstr "Объединить группы"
+
+#: ../pidgin/gtkdialogs.c:1106
+msgid "_Merge Groups"
+msgstr "_Объединить группы"
+
+#: ../pidgin/gtkdialogs.c:1156
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"Вы удалите группу %s и всех её членов из списка собеседников. Хотите "
+"продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1159
+msgid "Remove Group"
+msgstr "Удалить группу"
+
+#: ../pidgin/gtkdialogs.c:1162
+msgid "_Remove Group"
+msgstr "_Удалить группу"
+
+#: ../pidgin/gtkdialogs.c:1195
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "Вы удалите %s из списка собеседников. Хотите продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1198
+msgid "Remove Buddy"
+msgstr "Удалить собеседника"
+
+#: ../pidgin/gtkdialogs.c:1201
+msgid "_Remove Buddy"
+msgstr "_Удалить собеседника"
+
+#: ../pidgin/gtkdialogs.c:1222
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr "Вы удалите чат %s из списка собеседников. Хотите продолжить?"
+
+#: ../pidgin/gtkdialogs.c:1225
+msgid "Remove Chat"
+msgstr "Удалить чат"
+
+#: ../pidgin/gtkdialogs.c:1228
+msgid "_Remove Chat"
+msgstr "_Удалить чат"
+
+#: ../pidgin/gtkdocklet.c:153
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+"Щёлкните правой кнопкой мыши для чтения других непрочитанных сообщений...\n"
+
+#: ../pidgin/gtkdocklet.c:454
+msgid "Change Status"
+msgstr "Изменить статус"
+
+#: ../pidgin/gtkdocklet.c:506
+msgid "Show Buddy List"
+msgstr "Показывать список собеседников"
+
+#: ../pidgin/gtkdocklet.c:532
+msgid "New Message..."
+msgstr "Новое сообщение..."
+
+#: ../pidgin/gtkdocklet.c:547
+msgid "Mute Sounds"
+msgstr "Отключить звуки"
+
+#: ../pidgin/gtkdocklet.c:554
+msgid "Blink on new message"
+msgstr "Мерцать при наличии нового сообщения"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../pidgin/gtkdocklet.c:565
+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 "_Закрывать это окно по завершении всех передач"
+
+#: ../pidgin/gtkft.c:796
+msgid "C_lear finished transfers"
+msgstr "О_чищать завершённые передачи"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:805
+msgid "File transfer _details"
+msgstr "_Подробности о передаче файлов"
+
+#. Pause button
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+msgid "_Pause"
+msgstr "_Пауза"
+
+#. Resume button
+#: ../pidgin/gtkft.c:845
+msgid "_Resume"
+msgstr "_Возобновить"
+
+#: ../pidgin/gtkimhtml.c:792
+msgid "Paste as Plain _Text"
+msgstr "Вставить как простой _текст"
+
+#: ../pidgin/gtkimhtml.c:809
+msgid "_Reset formatting"
+msgstr "Восстановить _форматирование"
+
+#: ../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 "_Скопировать адрес e-mail"
+
+#: ../pidgin/gtkimhtml.c:1528
+msgid "_Open Link in Browser"
+msgstr "_Открыть ссылку в браузере"
+
+#: ../pidgin/gtkimhtml.c:1538
+msgid "_Copy Link Location"
+msgstr "_Скопировать ссылку"
+
+#: ../pidgin/gtkimhtml.c:3202
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>Нераспознанный тип файла</span>\n"
+"\n"
+"Принимается за PNG."
+
+#: ../pidgin/gtkimhtml.c:3205
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Нераспознанный тип файла\n"
+"\n"
+"Принимается за PNG."
+
+#: ../pidgin/gtkimhtml.c:3218
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>Ошибка сохранения изображения</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3221
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Ошибка сохранения изображения\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+msgid "Save Image"
+msgstr "Сохранить изображение"
+
+#: ../pidgin/gtkimhtml.c:3341
+msgid "_Save Image..."
+msgstr "_Сохранить изображение..."
+
+#: ../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 "_Описание"
+
+#: ../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 "_Вставить"
+
+#: ../pidgin/gtkimhtmltoolbar.c:487
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Не удалось сохранить изображение: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+msgid "Insert Image"
+msgstr "Вставить изображение"
+
+#: ../pidgin/gtkimhtmltoolbar.c:721
+msgid "This theme has no available smileys."
+msgstr "Эта тема не имеет доступных смайликов."
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:735
+msgid "Smile!"
+msgstr "Смайл!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Жирный"
+
+#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Наклонный"
+
+#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Подчёркнутый"
+
+#: ../pidgin/gtkimhtmltoolbar.c:960
+msgid "Larger font size"
+msgstr "Больший размер шрифта"
+
+#: ../pidgin/gtkimhtmltoolbar.c:972
+msgid "Smaller font size"
+msgstr "Меньший размер шрифта "
+
+#: ../pidgin/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "Облик шрифта"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1001
+msgid "Foreground font color"
+msgstr "Цвет шрифта"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1013
+msgid "Background color"
+msgstr "Цвет фона"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "Восстановить форматирование"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1044
+msgid "Insert link"
+msgstr "Вставить ссылку"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Insert image"
+msgstr "Вставить изображение"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "Insert smiley"
+msgstr "Вставить смайлик"
+
+#: ../pidgin/gtklog.c:267
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"Вы действительно хотите безвозвратно удалить журнал беседы с %s, начатый в %"
+"s?"
+
+#: ../pidgin/gtklog.c:278
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+"Вы действительно хотите безвозвратно удалить журнал беседы в %s, начатый в %"
+"s?"
+
+#: ../pidgin/gtklog.c:283
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+"Вы действительно хотите безвозвратно удалить системный журнал, начатый в %s?"
+
+#: ../pidgin/gtklog.c:427
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Беседа в %s на %s</span>"
+
+#: ../pidgin/gtklog.c:430
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Беседа с %s на %s</span>"
+
+#: ../pidgin/gtklog.c:477
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../pidgin/gtklog.c:524
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:528
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:531
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:535
+msgid "No logs were found"
+msgstr "Журналы не найдены"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:550
+msgid "_Browse logs folder"
+msgstr ""
+
+#: ../pidgin/gtklog.c:614
+msgid "Total log size:"
+msgstr "Общий размер журналов:"
+
+#: ../pidgin/gtklog.c:683
+#, c-format
+msgid "Conversations in %s"
+msgstr "Беседы в %s"
+
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#, c-format
+msgid "Conversations with %s"
+msgstr "Беседы с %s"
+
+#: ../pidgin/gtklog.c:778
+msgid "System Log"
+msgstr "Системный журнал"
+
+#: ../pidgin/gtkmain.c:373
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Наберите `%s -h' для получения дополнительной информации.\n"
+
+#: ../pidgin/gtkmain.c:375
+#, 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"
+"                      задаёт одну или несколько учётных записей,\n"
+"                      разделённых запятыми)\n"
+"  -v, --version       показать текущую версию и выйти\n"
+
+#: ../pidgin/gtkmain.c:498
+#, 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 новое сообщение."
+msgstr[1] "%s имеет %d новых сообщения."
+msgstr[2] "%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] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../pidgin/gtknotify.c:909
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Команда запуска браузера \"%s\" неверна."
+
+#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
+#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+msgid "Unable to open URL"
+msgstr "Не удаётся открыть URL"
+
+#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Ошибка запуска \"%s\": %s"
+
+#: ../pidgin/gtknotify.c:1065
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Был выбран браузер \"Другой\", но команда не была задана."
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "Следующие модули будут выгружены."
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "Несколько модулей будет выгружено."
+
+#: ../pidgin/gtkplugin.c:287
+msgid "Unload Plugins"
+msgstr "Выгрузить модули"
+
+#: ../pidgin/gtkplugin.c:399
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Автор:</span>\t\t%s\n"
+"<span weight=\"bold\">Веб-сайт:</span>\t%s\n"
+"<span weight=\"bold\">Имя файла:</span>\t%s"
+
+#: ../pidgin/gtkplugin.c:409
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:535
+msgid "Configure Pl_ugin"
+msgstr "_Настроить модуль"
+
+#: ../pidgin/gtkplugin.c:598
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Подробности о модуле</b>"
+
+#: ../pidgin/gtkpounce.c:155
+msgid "Select a file"
+msgstr "Выбрать файл"
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:524
+msgid "Pounce on Whom"
+msgstr "За кем следить"
+
+#: ../pidgin/gtkpounce.c:551
+msgid "_Buddy name:"
+msgstr "_Имя собеседника:"
+
+#: ../pidgin/gtkpounce.c:585
+msgid "Si_gns on"
+msgstr "_Входит"
+
+#: ../pidgin/gtkpounce.c:587
+msgid "Signs o_ff"
+msgstr "В_ыходит"
+
+#: ../pidgin/gtkpounce.c:589
+msgid "Goes a_way"
+msgstr "Отхо_дит"
+
+#: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "Во_звращается"
+
+#: ../pidgin/gtkpounce.c:593
+msgid "Becomes _idle"
+msgstr "Начинает безде_йствовать"
+
+#: ../pidgin/gtkpounce.c:595
+msgid "Is no longer i_dle"
+msgstr "Перестаёт бездействоват_ь"
+
+#: ../pidgin/gtkpounce.c:597
+msgid "Starts _typing"
+msgstr "Начинает н_абор сообщения"
+
+#: ../pidgin/gtkpounce.c:599
+msgid "P_auses while typing"
+msgstr "Приостанавливает на_бор сообщения"
+
+#: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "Прекращает набо_р сообщения"
+
+#: ../pidgin/gtkpounce.c:603
+msgid "Sends a _message"
+msgstr "Отправляет сооб_щение"
+
+#: ../pidgin/gtkpounce.c:646
+msgid "Ope_n an IM window"
+msgstr "Открыть ок_но мгновенных сообщений"
+
+#: ../pidgin/gtkpounce.c:648
+msgid "_Pop up a notification"
+msgstr "Вывести уведом_ление"
+
+#: ../pidgin/gtkpounce.c:650
+msgid "Send a _message"
+msgstr "Отправить _сообщение"
+
+#: ../pidgin/gtkpounce.c:652
+msgid "E_xecute a command"
+msgstr "Выполнить ко_манду"
+
+#: ../pidgin/gtkpounce.c:654
+msgid "P_lay a sound"
+msgstr "Воспроизвести зв_ук"
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Brows_e..."
+msgstr "_Открыть..."
+
+#: ../pidgin/gtkpounce.c:661
+msgid "Br_owse..."
+msgstr "От_крыть..."
+
+#: ../pidgin/gtkpounce.c:662
+msgid "Pre_view"
+msgstr "Т_ест"
+
+#: ../pidgin/gtkpounce.c:786
+msgid "P_ounce only when my status is not available"
+msgstr "Выполн_ять только при статусе, отличном от \"Доступен\""
+
+#: ../pidgin/gtkpounce.c:791
+msgid "_Recurring"
+msgstr "_Повторение"
+
+#: ../pidgin/gtkpounce.c:1247
+msgid "Pounce Target"
+msgstr "Объект слежения"
+
+#: ../pidgin/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr "Не удалось распаковать тему смайликов."
+
+#: ../pidgin/gtkprefs.c:638
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Выберите тему смайликов, которую вы хотели бы использовать. Новые темы могут "
+"быть установлены перетаскиванием их в список тем."
+
+#: ../pidgin/gtkprefs.c:673
+msgid "Icon"
+msgstr "Значок"
+
+#: ../pidgin/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Значок системного лотка"
+
+#: ../pidgin/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Показывать значок системного лотка:"
+
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "Всегда"
+
+#: ../pidgin/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "При наличии непрочитанных сообщений"
+
+#: ../pidgin/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "Скрытие окон бесед"
+
+#: ../pidgin/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "_Скрывать новые беседы:"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+msgid "When away"
+msgstr "Во время отсутствия"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Вкладки"
+
+#: ../pidgin/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Показывать мгновенные сообщения и чаты в окнах с _вкладками"
+
+#: ../pidgin/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "Показывать _кнопку закрытия на вкладках"
+
+#: ../pidgin/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "_Расположение:"
+
+#: ../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 "_Новые беседы:"
+
+#: ../pidgin/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "Показывать _форматирование во входящих сообщениях"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "Показывать _значки собеседников"
+
+#: ../pidgin/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "Разрешить _анимацию значков собеседников"
+
+#: ../pidgin/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Уведомлять собеседников, что вы набираете им сообщение"
+
+#: ../pidgin/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "Подсвечивать слова с _ошибками"
+
+#: ../pidgin/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "Использовать плавную прокрутку"
+
+#: ../pidgin/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "_Мерцать окном при принятии мгновенных сообщений"
+
+#: ../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 "ST_UN-сервер:"
+
+#: ../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-адрес _автоматически"
+
+#: ../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 "Указать диапазон прослушиваемых портов _вручную"
+
+#: ../pidgin/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "_Начальный порт:"
+
+#: ../pidgin/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "_Конечный порт:"
+
+#: ../pidgin/gtkprefs.c:1092
+msgid "Proxy Server"
+msgstr "Прокси-сервер"
+
+#: ../pidgin/gtkprefs.c:1096
+msgid "No proxy"
+msgstr "Нет прокси"
+
+#: ../pidgin/gtkprefs.c:1152
+msgid "_User:"
+msgstr "_Пользователь:"
+
+#: ../pidgin/gtkprefs.c:1216
+msgid "Seamonkey"
+msgstr ""
+
+#: ../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 "_Браузер:"
+
+#: ../pidgin/gtkprefs.c:1299
+msgid "_Open link in:"
+msgstr "_Открывать ссылку в:"
+
+#: ../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 ""
+"_Вручную:\n"
+"(%s для URL)"
+
+#: ../pidgin/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "_Формат журнала:"
+
+#: ../pidgin/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "Записывать все _мгновенные сообщения"
+
+#: ../pidgin/gtkprefs.c:1365
+msgid "Log all c_hats"
+msgstr "Записывать все _чаты"
+
+#: ../pidgin/gtkprefs.c:1367
+msgid "Log all _status changes to system log"
+msgstr "Записывать все изменения _статуса в системный журнал"
+
+#: ../pidgin/gtkprefs.c:1513
+msgid "Sound Selection"
+msgstr "Выбор звука"
+
+#: ../pidgin/gtkprefs.c:1523
+msgid "Quietest"
+msgstr "Очень тихо"
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Quieter"
+msgstr "Тихо"
+
+#: ../pidgin/gtkprefs.c:1527
+msgid "Quiet"
+msgstr "Ниже среднего"
+
+#: ../pidgin/gtkprefs.c:1531
+msgid "Loud"
+msgstr "Выше среднего"
+
+#: ../pidgin/gtkprefs.c:1533
+msgid "Louder"
+msgstr "Громко"
+
+#: ../pidgin/gtkprefs.c:1535
+msgid "Loudest"
+msgstr "Очень громко"
+
+#: ../pidgin/gtkprefs.c:1598
+msgid "Sound Method"
+msgstr "Метод воспроизведения звука"
+
+#: ../pidgin/gtkprefs.c:1599
+msgid "_Method:"
+msgstr "_Метод:"
+
+#: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "Сигнал динамиком"
+
+#: ../pidgin/gtkprefs.c:1603
+msgid "Automatic"
+msgstr "Автоматически"
+
+#: ../pidgin/gtkprefs.c:1606
+msgid "Command"
+msgstr "Команда"
+
+#: ../pidgin/gtkprefs.c:1607
+msgid "No sounds"
+msgstr "Нет звуков"
+
+#: ../pidgin/gtkprefs.c:1615
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"_Команда воспроизведения звука:\n"
+"(%s для имени файла)"
+
+#: ../pidgin/gtkprefs.c:1641
+msgid "Sound Options"
+msgstr "Параметры звука"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Sounds when conversation has _focus"
+msgstr "Звуки, когда окно беседы в _фокусе"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Enable sounds:"
+msgstr "Воспроизводить звуки:"
+
+#: ../pidgin/gtkprefs.c:1646
+msgid "Only when available"
+msgstr "Только во время присутствия"
+
+#: ../pidgin/gtkprefs.c:1647
+msgid "Only when not available"
+msgstr "Только во время отсутствия"
+
+#: ../pidgin/gtkprefs.c:1655
+msgid "Volume:"
+msgstr "Громкость:"
+
+#: ../pidgin/gtkprefs.c:1683
+msgid "Sound Events"
+msgstr "Звуковые события"
+
+#: ../pidgin/gtkprefs.c:1734
+msgid "Play"
+msgstr "Воспроизводить"
+
+#: ../pidgin/gtkprefs.c:1741
+msgid "Event"
+msgstr "Событие"
+
+#: ../pidgin/gtkprefs.c:1760
+msgid "Test"
+msgstr "Тест"
+
+#: ../pidgin/gtkprefs.c:1764
+msgid "Reset"
+msgstr "Сброс"
+
+#: ../pidgin/gtkprefs.c:1768
+msgid "Choose..."
+msgstr "Выбрать..."
+
+#: ../pidgin/gtkprefs.c:1811
+msgid "_Report idle time:"
+msgstr "Сообщать _время бездействия:"
+
+#: ../pidgin/gtkprefs.c:1816
+msgid "Based on keyboard or mouse use"
+msgstr "Основываясь на использовании клавиатуры или мыши"
+
+#: ../pidgin/gtkprefs.c:1825
+msgid "_Auto-reply:"
+msgstr "_Автоматический ответ:"
+
+#: ../pidgin/gtkprefs.c:1829
+msgid "When both away and idle"
+msgstr "Во время отсутствия и бездействия"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1835
+msgid "Auto-away"
+msgstr "Авто-\"Отошёл\""
+
+#: ../pidgin/gtkprefs.c:1837
+msgid "Change status when _idle"
+msgstr "Менять статус при _бездействии"
+
+#: ../pidgin/gtkprefs.c:1841
+msgid "_Minutes before changing status:"
+msgstr "_Минут до изменения статуса:"
+
+#: ../pidgin/gtkprefs.c:1849
+msgid "Change _status to:"
+msgstr "Менять _статус на:"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1870
+msgid "Status at Startup"
+msgstr "Статус при запуске"
+
+#: ../pidgin/gtkprefs.c:1872
+msgid "Use status from last _exit at startup"
+msgstr "Использовать при запуске статус, бывший до в_ыхода"
+
+#: ../pidgin/gtkprefs.c:1878
+msgid "Status to a_pply at startup:"
+msgstr "_Применить при запуске статус:"
+
+#: ../pidgin/gtkprefs.c:1916
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../pidgin/gtkprefs.c:1918
+msgid "Smiley Themes"
+msgstr "Темы смайликов"
+
+#: ../pidgin/gtkprefs.c:1919
+msgid "Sounds"
+msgstr "Звуки"
+
+#: ../pidgin/gtkprefs.c:1925
+msgid "Browser"
+msgstr "Браузер"
+
+#: ../pidgin/gtkprefs.c:1929
+msgid "Status / Idle"
+msgstr "Статус / Бездействие"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "Разрешить доступ всем пользователям"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "Разрешить доступ только пользователям из списка собеседников"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "Разрешить доступ только пользователям, указанным ниже"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Блокировать всех пользователей"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "Блокировать только пользователей, указанных ниже"
+
+#: ../pidgin/gtkprivacy.c:372
+msgid "Privacy"
+msgstr "Конфиденциальность"
+
+#: ../pidgin/gtkprivacy.c:385
+msgid "Changes to privacy settings take effect immediately."
+msgstr "Изменения настроек конфиденциальности вступают в силу немедленно."
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:397
+msgid "Set privacy for:"
+msgstr "Установить конфиденциальность для:"
+
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+msgid "Permit User"
+msgstr "Допустить пользователя"
+
+#: ../pidgin/gtkprivacy.c:561
+msgid "Type a user you permit to contact you."
+msgstr "Укажите пользователя, которого вы допускаете к общению с вами."
+
+#: ../pidgin/gtkprivacy.c:562
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+"Введите имя пользователя, которого вы хотите допустить к общению с вами."
+
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+msgid "_Permit"
+msgstr "_Допустить"
+
+#: ../pidgin/gtkprivacy.c:571
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "Позволить %s общаться с вами?"
+
+#: ../pidgin/gtkprivacy.c:573
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "Вы действительно хотите позволить %s общаться с вами?"
+
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+msgid "Block User"
+msgstr "Блокировать пользователя"
+
+#: ../pidgin/gtkprivacy.c:603
+msgid "Type a user to block."
+msgstr "Укажите блокируемого пользователя."
+
+#: ../pidgin/gtkprivacy.c:604
+msgid "Please enter the name of the user you wish to block."
+msgstr "Введите имя пользователя, которого вы хотите блокировать."
+
+#: ../pidgin/gtkprivacy.c:612
+#, c-format
+msgid "Block %s?"
+msgstr "Блокировать %s?"
+
+#: ../pidgin/gtkprivacy.c:614
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "Вы действительно хотите блокировать %s?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "Применить"
+
+#: ../pidgin/gtkrequest.c:1481
+msgid "That file already exists"
+msgstr "Такой файл уже существует"
+
+#: ../pidgin/gtkrequest.c:1482
+msgid "Would you like to overwrite it?"
+msgstr "Хотите перезаписать его?"
+
+#: ../pidgin/gtkrequest.c:1485
+msgid "Overwrite"
+msgstr "Перезаписать"
+
+#: ../pidgin/gtkrequest.c:1486
+msgid "Choose New Name"
+msgstr "Выбрать новое имя"
+
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+msgid "Select Folder..."
+msgstr "Выбрать папку..."
+
+#: ../pidgin/gtkroomlist.c:376
+msgid "Room List"
+msgstr "Список комнат"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:446
+msgid "_Get List"
+msgstr "_Получить список"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "_Добавить чат"
+
+#: ../pidgin/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Вы действительно хотите удалить выбранные сохранённые статусы?"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+msgid "_Use"
+msgstr "_Применить"
+
+#: ../pidgin/gtksavedstatuses.c:726
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Название уже используется. Вы должны выбрать уникальное название."
+
+#: ../pidgin/gtksavedstatuses.c:914
+msgid "Different"
+msgstr "Отличающийся"
+
+#: ../pidgin/gtksavedstatuses.c:1107
+msgid "_Title:"
+msgstr "_Название:"
+
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+msgid "_Status:"
+msgstr "_Статус:"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1158
+msgid "Use a _different status for some accounts"
+msgstr "Использовать _отличающийся статус для некоторых учётных записей"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1222
+msgid "Sa_ve & Use"
+msgstr "Сохранить _и применить"
+
+#: ../pidgin/gtksavedstatuses.c:1428
+#, c-format
+msgid "Status for %s"
+msgstr "Статус для %s"
+
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Собеседник входит в сеть"
+
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Собеседник выходит из сети"
+
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Принято сообщение"
+
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Принято сообщение, начинающее беседу"
+
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Сообщение отправлено"
+
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Пользователь входит в чат"
+
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Пользователь выходит из чата"
+
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Вы говорите в чате"
+
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Другие говорят в чате"
+
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Кто-то произносит ваше имя в чате"
+
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "Ошибка GStreamer"
+
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "Не удалось инициализировать GStreamer."
+
+#: ../pidgin/gtkstatusbox.c:661
+msgid "Waiting for network connection"
+msgstr "Ожидание сетевого соединения"
+
+#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "Произошла следующая ошибка при загрузке %s: %s"
+
+#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+msgid "Failed to load image"
+msgstr "Не удалось загрузить изображение"
+
+#: ../pidgin/gtkutils.c:1419
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "Нельзя отправить папку %s."
+
+#: ../pidgin/gtkutils.c:1420
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
+#: ../pidgin/gtkutils.c:1471
+msgid "You have dragged an image"
+msgstr "Вы перетащили изображение"
+
+#: ../pidgin/gtkutils.c:1453
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+msgid "Set as buddy icon"
+msgstr "Установить в качестве значка собеседника"
+
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+msgid "Send image file"
+msgstr "Отправить файл изображения"
+
+#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+msgid "Insert in message"
+msgstr "Вставить в сообщение"
+
+#: ../pidgin/gtkutils.c:1465
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr ""
+"Хотите установить это изображение в качестве значка собеседника для этого "
+"пользователя?"
+
+#: ../pidgin/gtkutils.c:1472
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1474
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: ../pidgin/gtkutils.c:1532
+msgid "Cannot send launcher"
+msgstr "Нельзя отправить ярлык"
+
+#: ../pidgin/gtkutils.c:1532
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2302
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Файл:</b> %s\n"
+"<b>Размер файла:</b> %s\n"
+"<b>Размер изображения:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2592
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2594
+msgid "Icon Error"
+msgstr "Ошибка значка"
+
+#: ../pidgin/gtkutils.c:2595
+msgid "Could not set icon"
+msgstr "Не удалось установить значок"
+
+#: ../pidgin/gtkutils.c:2695
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Не удалось открыть файл '%s': %s"
+
+#: ../pidgin/gtkutils.c:2744
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+msgid "Save File"
+msgstr "Сохранить файл"
+
+#: ../pidgin/gtkwhiteboard.c:867
+msgid "Select color"
+msgstr "Выбрать цвет"
+
+#: ../pidgin/pidginstock.c:81
+msgid "_Alias"
+msgstr "_Псевдоним"
+
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "_Закрыть вкладки"
+
+#: ../pidgin/pidginstock.c:85
+msgid "_Get Info"
+msgstr "Получить _информацию"
+
+#: ../pidgin/pidginstock.c:86
+msgid "_Invite"
+msgstr "П_ригласить"
+
+#: ../pidgin/pidginstock.c:87
+msgid "_Modify"
+msgstr "_Изменить"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Open Mail"
+msgstr "Открыть _почту"
+
+#: ../pidgin/plugins/cap/cap.c:449
+msgid "Display Statistics"
+msgstr "Вывести статистику"
+
+#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgid "Response Probability:"
+msgstr "Вероятность отклика:"
+
+#: ../pidgin/plugins/cap/cap.c:810
+msgid "Statistics Configuration"
+msgstr "Настройка статистики"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:813
+msgid "Maximum response timeout:"
+msgstr "Максимальное время ожидания отклика:"
+
+#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+msgid "minutes"
+msgstr "минут"
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:820
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. 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 ""
+
+#: ../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 ""
+
+#: ../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:187
+msgid "Contact Priority"
+msgstr "Приоритет контакта"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:190
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:192
+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:141
+msgid "ExtPlacement"
+msgstr "Экстра-расположение"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:143
+msgid "Extra conversation placement options."
+msgstr "Дополнительные параметры расположения бесед."
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:145
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Ограничивает количество бесед в окне, с возможностью разделения мгновенных "
+"сообщений и чатов."
+
+#. 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 "_Визуальное отображение жестов"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:295
+msgid "Mouse Gestures"
+msgstr "Жесты мышью"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:298
+msgid "Provides support for mouse gestures"
+msgstr "Предоставляет поддержку жестов мышью."
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:300
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Позволяет использовать жесты мышью в окнах бесед.\n"
+"Передвигайте мышь, удерживая нажатой среднюю кнопку, для выполнения "
+"следующих действий:\n"
+"\n"
+"Вниз и вправо для закрытия беседы.\n"
+"Вверх и влево для перехода к предыдущей беседе.\n"
+"Вверх и вправо для перехода к следующей беседе."
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Обмен мгновенными сообщениями"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "Ниже выберите персону из адресной книги или добавьте новую персону."
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Новая персона"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Выбрать собеседника"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Выберите персону из адресной книги, к которой следует добавить этого "
+"собеседника, или создайте новую персону."
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "Подробности о пользователе"
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "Соотнести собеседника"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "Не удаётся отправить e-mail"
+
+#: ../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 "Отправить e-mail"
+
+#. 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:526
+msgid "Evolution Integration"
+msgstr "Интеграция с Evolution"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
+msgid "Provides integration with Evolution."
+msgstr "Предоставляет интеграцию с Evolution."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Ниже введите информацию о персоне."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr ""
+"Ниже введите идентификатор пользователя собеседника и тип учётной записи."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Тип учётной записи:"
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Необязательная информация:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Имя:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Фамилия:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#. *< 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 "Проверяет, все ли сигналы интерфейса пользователя работают исправно."
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "История"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Сворачивание при отсутствии"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Сворачивает список собеседников и все беседы, когда вы отсутствуете."
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Проверка почты"
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Проверяет наличие новой локальной почты."
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+"Добавляет небольшую область к списку собеседников, в которой сообщается о "
+"наличии новой почты."
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "Разделительная линия"
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Проводит линию, отделяющую новые сообщения в беседе."
+
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr "Проводить разделительную линию в "
+
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+msgid "_IM windows"
+msgstr "Окна _мгновенных сообщений"
+
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+msgid "C_hat windows"
+msgstr "Окна _чатов"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+msgid "Music Messaging"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgid "There was a conflict in running the command:"
+msgstr "Произошёл конфликт при выполнении команды:"
+
+#: ../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 "_Применить"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:672
+msgid "Notify For"
+msgstr "Уведомление для"
+
+#: ../pidgin/plugins/notify.c:691
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Только тогда, когда кто-то произносит ваше имя"
+
+#: ../pidgin/plugins/notify.c:701
+msgid "_Focused windows"
+msgstr "Окна в _фокусе"
+
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:709
+msgid "Notification Methods"
+msgstr "Методы уведомления"
+
+#: ../pidgin/plugins/notify.c:716
+msgid "Prepend _string into window title:"
+msgstr "Добавлять _строку в начало заголовка окна:"
+
+#. Count method button
+#: ../pidgin/plugins/notify.c:735
+msgid "Insert c_ount of new messages into window title"
+msgstr "Вставлять _количество новых сообщений в заголовок окна"
+
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:744
+msgid "Insert count of new message into _X property"
+msgstr "Вставлять количество новых сообщений в свойства _X"
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Установить подсказку \"С_РОЧНО\" оконного менеджера"
+
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:761
+msgid "R_aise conversation window"
+msgstr "_Поднимать окно беседы"
+
+#. ---------- "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 "Удалять, когда окно беседы оказывается в ф_окусе"
+
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:781
+msgid "Remove when conversation window _receives click"
+msgstr "Удалять, когда окно беседы получает _щелчок"
+
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:789
+msgid "Remove when _typing in conversation window"
+msgstr "Удалять при _наборе сообщения в окне беседы"
+
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:797
+msgid "Remove when a _message gets sent"
+msgstr "Удалять при отпр_авке сообщения"
+
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:806
+msgid "Remove on switch to conversation ta_b"
+msgstr "Удалять при переключении на _вкладку беседы"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:901
+msgid "Message Notification"
+msgstr "Уведомление о сообщении"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+"Предоставляет множество способов уведомления вас о непрочтённых сообщениях."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Демонстрационный модуль Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr ""
+"Демонстрационный модуль, который делает всякие вещи - смотрите описание."
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Это действительно замечательный модуль, который делает множество вещей:\n"
+"- Сообщает вам, кто написал эту программу, когда вы входите\n"
+"- Переворачивает весь приходящий текст\n"
+"- Отправляет сообщение пользователям из вашего списка сразу после их "
+"подключения"
+
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr "Цвет курсора"
+
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Вторичный цвет курсора"
+
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "Цвет гиперссылки"
+
+#: ../pidgin/plugins/pidginrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "Размер расширителя GtkTreeView"
+
+#: ../pidgin/plugins/pidginrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "Горизонтальное разделение GtkTreeView"
+
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Conversation Entry"
+msgstr "Область ввода окна беседы"
+
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Conversation History"
+msgstr "История бесед"
+
+#: ../pidgin/plugins/pidginrc.c:78
+msgid "Log Viewer"
+msgstr "Система просмотра журналов"
+
+#: ../pidgin/plugins/pidginrc.c:79
+msgid "Request Dialog"
+msgstr "Диалог запроса"
+
+#: ../pidgin/plugins/pidginrc.c:80
+msgid "Notify Dialog"
+msgstr "Диалог уведомления"
+
+#: ../pidgin/plugins/pidginrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr ""
+
+#: ../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 ""
+
+#: ../pidgin/plugins/pidginrc.c:508
+msgid "Interface colors"
+msgstr "Цвета интерфейса"
+
+#: ../pidgin/plugins/pidginrc.c:532
+msgid "Widget Sizes"
+msgstr "Размер виджетов"
+
+#: ../pidgin/plugins/pidginrc.c:553
+msgid "Fonts"
+msgstr "Шрифты"
+
+#: ../pidgin/plugins/pidginrc.c:576
+msgid "Tools"
+msgstr "Инструменты"
+
+#: ../pidgin/plugins/pidginrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Записать настройки в %s%sgtkrc-2.0"
+
+#: ../pidgin/plugins/pidginrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Повторно прочитать файлы gtkrc"
+
+#: ../pidgin/plugins/pidginrc.c:622
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Управление темой GTK+ для Pidgin"
+
+#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Предоставляет доступ к часто используемым настройкам gtkrc."
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "Необработанный"
+
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+"Позволяет вам отправлять необработанный ввод, используя протоколы, "
+"базирующиеся на тексте."
+
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"Позволяет вам отправлять необработанный ввод, используя протоколы, "
+"базирующиеся на тексте (Jabber, MSN, IRC, TOC). Для отправки нажмите 'Enter' "
+"в области ввода. Смотрите за окном отладки."
+
+#: ../pidgin/plugins/relnot.c:71
+#, c-format
+msgid "You are using %s version %s.  The current version is %s.<hr>"
+msgstr "Вы используете %s версии %s. Последняя доступная версия %s.<hr>"
+
+#: ../pidgin/plugins/relnot.c:77
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Список изменений:</b>\n"
+"%s<br><br>"
+
+#: ../pidgin/plugins/relnot.c:82
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
+"im</a>."
+msgstr ""
+"Вы можете получить версию %s здесь:<br><a href=\"http://pidgin.im/\">http://"
+"pidgin.im</a>."
+
+#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid "New Version Available"
+msgstr "Доступна новая версия"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:145
+msgid "Release Notification"
+msgstr "Уведомление о выпуске"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:148
+msgid "Checks periodically for new releases."
+msgstr "Периодически проверяет наличие новых версий."
+
+#. *  description
+#: ../pidgin/plugins/relnot.c:150
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Периодически проверяет наличие новых версий и уведомляет о них пользователя, "
+"приводя список изменений."
+
+#: ../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 "Вы _набираете:"
+
+#: ../pidgin/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "Вы _отправляете:"
+
+#. 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 "Замещать только _целые слова"
+
+#: ../pidgin/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "Основные параметры замещения текста"
+
+#: ../pidgin/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr "Разрешить замещение последнего слова при отправке"
+
+#: ../pidgin/plugins/spellchk.c:2373
+msgid "Text replacement"
+msgstr "Замещение текста"
+
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+"Замещает текст в исходящих сообщениях в соответствии с правилами, "
+"определёнными пользователем."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Лента собеседников"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "Горизонтальная прокрутка списка собеседников."
+
+#: ../pidgin/plugins/timestamp.c:137
+msgid "Display Timestamps Every"
+msgstr "Выводить отметки времени каждые"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:202
+msgid "Timestamp"
+msgstr "Отметка времени"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:205
+msgid "Display iChat-style timestamps"
+msgstr "Выводит отметки времени в стиле iChat."
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:207
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Выводит отметки времени в стиле iChat каждые N минут."
+
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "Параметры формата времени"
+
+#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
+msgid "_Force (traditional %s) 24-hour time format"
+msgstr ""
+"_Принудительно использовать (традиционный для %s) 24-часовой формат времени"
+
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "Показывать дату..."
+
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "_Беседы:"
+
+#: ../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 "_Журналы сообщений:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:151
+msgid "Message Timestamp Formats"
+msgstr "Форматы времени сообщений"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:154
+msgid "Customizes the message timestamp formats."
+msgstr "Изменяет форматы времени сообщений."
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:156
+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 "_Прозрачность окна беседы"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "Показывать _полосу прокрутки в окнах бесед"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Убирать прозрачность окна беседы в фокусе"
+
+#: ../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 "Прозрачность окна _списка собеседников"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Убирать прозрачность окна списка собеседников в фокусе"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+msgid "Transparency"
+msgstr "Прозрачность"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Варьируемая прозрачность для списка собеседников и бесед."
+
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Этот модуль включает варьируемую альфа-прозрачность окон бесед и списка "
+"собеседников.\n"
+"\n"
+"* Замечание: Этот модуль требует 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 "_Запускать %s при загрузке Windows"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Dockable Buddy List"
+msgstr "Закреплённый _список собеседников"
+
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+msgid "_Keep Buddy List window on top:"
+msgstr "Держать окно списка собеседников _наверху:"
+
+#. 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 "_Мерцать окном при принятии сообщений в чатах"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Параметры Pidgin для Windows"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+msgid "Options specific to Pidgin for Windows."
+msgstr "Параметры, специфичные для Pidgin для Windows."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"Параметры, специфичные для Pidgin для Windows, такие как закрепление списка "
+"собеседников."
+
+#: ../pidgin/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "Консоль XMPP"
+
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "Учётная запись: "
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "Вставить станс <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 ""
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
diff -r 6ec8bae7d98a -r cb5bd3c045a9 po/tr.po
--- a/po/tr.po	Wed May 23 23:13:11 2007 +0000
+++ b/po/tr.po	Wed May 23 23:17:50 2007 +0000
@@ -1,1085 +1,2258 @@
+# translation of pidgin-new.po to
+# translation of pidgin.po to
+# translation of tr.po to
 # Gaim - Turkish Translation.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gaim package.
+#
 # Ahmet Alp Balkan ahmet4@gmail.com, 2006.
-# Onur K���ktun� onurcc@gmail.com, 2004.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Gaim\n"
+# Onur Küçüktunç onurcc@gmail.com, 2004.
+# Serdar Soytetir <tulliana@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin-new\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2006-01-27 18:10+0200\n"
-"Last-Translator: ahmet alp balkan <ahmet4@gmail.com>\n"
-"Language-Team: Turkish <tr@li.org>\n"
+"POT-Creation-Date: 2007-05-20 00:01-0400\n"
+"PO-Revision-Date: 2007-05-21 16:55+0300\n"
+"Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
+"Language-Team:  <tr@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-9\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Language: Turkish\n"
 "X-Poedit-Country: TURKEY\n"
-
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "Hatalara Kar��"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "Ba�lant� Hatalar�n� Gizle"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "Oturum A�ma Hatalar�n� Gizle"
-
-#: plugins/autorecon.c:313
-msgid "Hide Reconnecting Dialog"
-msgstr "Yeniden Ba�lanma Diyalogunu Dizle"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "Otomatik Ba�lanma"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/autorecon.c:340
-#: plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "�evrimd��� oldu�unuzda sizi tekrar ba�lar."
-
-#: plugins/contact_priority.c:84
-msgid "Point values to use when..."
-msgstr "Kullan�lacak de�erler..."
-
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "Ki�i �evrimd���:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "Ki�i d��ar�da!:"
-
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "Ki�i bo�ta:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "En son e�lenen ki�iyi kullan"
-
-#. Explanation
-#: plugins/contact_priority.c:141
-#, fuzzy
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"En az puanl� ki�i listede �nceli�e sahip olur.\n"
-"Varsay�lan de�erler (�evrimd��� = 4, d��ar�da! = 2, ve ba�l� = 1)\n"
-"kullan�lacak olup s�ralamas� aktif->ba�l�->d��ar�da!->d��ar�da!+ba�l�->�evrimd���d�r."
-
-#: plugins/contact_priority.c:144
-#, fuzzy
-msgid "Point values to use for account..."
-msgstr "Hesap i�in kullan�lacak de�erler..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/contact_priority.c:195
-msgid "Contact Priority"
-msgstr "Ba�lant� �nceli�i"
-
-#. *< name
-#. *< version
-#. *< summary
-#: plugins/contact_priority.c:198
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Farkl� durumlara farkl� puanlar vermenizi sa�lar."
-
-#. *< description
-#: plugins/contact_priority.c:200
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "�ncelik s�ralamas� hesaplamas�nda ba�l�/d��ar�da!/�evrimd��� durumlar�n�n puanlar�n� de�i�tirmenizi sa�lar."
-
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - Oturum kapand�"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - D��ar�da!"
-
-#: plugins/docklet/docklet.c:383
-msgid "Show Buddy List"
-msgstr "Ki�i Listesini G�r�nt�le"
-
-#: plugins/docklet/docklet.c:390
-msgid "New Message..."
-msgstr "Yeni Mesaj..."
-
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "Sohbete Ba�la..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "Sesi Kapat"
-
-#: plugins/docklet/docklet.c:406
-#: src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "Dosya Transferleri"
-
-#: plugins/docklet/docklet.c:407
-#: src/gtkaccount.c:2422
+"X-Generator: KBabel 1.11.4\n"
+
+#: ../finch/finch.c:180
+#, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s. Daha fazla bilgi için `%s -h' deneyin.\n"
+
+#: ../finch/finch.c:182
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Kullanım: %s [SEÇENEK]...\n"
+"\n"
+"  -c, --config=DIR    DIR yapılandırma dosyalarıın yerini gösterir\n"
+"  -d, --debug         hata ayıklama iletilerini göstermek için kullanılır\n"
+"  -h, --help          okuduğunuz bu yardım iletisini gösterir ve çıkar\n"
+"  -n, --nologin       otomatik olarak bağlanmanızı engeller\n"
+"  -v, --version       geçerli sürümü gösterir ve çıkar\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s ayararınızı %s konumundan %s konumuna taşırken hatalarla karşılaştı. "
+"Lütfen taşıma işini araştırarak kendiniz yapın. Lütfen bu hatayı http://"
+"developer.pidgin.im adresine bildirin."
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/silc/ops.c:1451
+msgid "Error"
+msgstr "Hata"
+
+#: ../finch/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Hesap eklenmedi"
+
+#: ../finch/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "Bir hesabın kayıtlı isim kısmı boş olmamalıdır."
+
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
+msgid "New mail notifications"
+msgstr "Yeni e-posta bildirimleri"
+
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
+msgid "Remember password"
+msgstr "Parolayı hatırla"
+
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
+msgid "Modify Account"
+msgstr "Hesabı Düzenle"
+
+#: ../finch/gntaccount.c:474
+msgid "New Account"
+msgstr "Yeni Hesap"
+
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Kayıtlı İsim:"
+
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
+msgid "Password:"
+msgstr "Parola:"
+
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
+msgid "Alias:"
+msgstr "Görünen İsim:"
+
+#. Cancel button
+#. Cancel
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
+#: ../libpurple/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+msgid "Cancel"
+msgstr "İptal"
+
+#. Save button
+#. Save
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
+#: ../pidgin/gtkrequest.c:276
+msgid "Save"
+msgstr "Kaydet"
+
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
+#: ../pidgin/gtksavedstatuses.c:328
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "%s hesabını silmek istediğinize emin misiniz?"
+
+#: ../finch/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Hesabı Sil"
+
+#. Delete button
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
+msgid "Delete"
+msgstr "Sil"
+
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#: plugins/docklet/docklet.c:408
-#: src/gtkprefs.c:1763
+#: ../finch/gntaccount.c:652
+msgid "You can enable/disable accounts from the following list."
+msgstr ""
+"Aşağıdaki listede bulunan hesapları etkinleştirebilir ya da "
+"pasifleştirebilirsiniz."
+
+#. Add button
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1639
+#: ../pidgin/gtkrequest.c:274
+msgid "Add"
+msgstr "Ekle"
+
+#. Modify button
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+msgid "Modify"
+msgstr "Düzenle"
+
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s kullanıcısı %s kişisini kişi listesine eklemek istiyor%s%s"
+
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
+msgid "Add buddy to your list?"
+msgstr "Kişiyi listenize eklemek istiyor musunuz?"
+
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s kullanıcısı %s kişisini kişi listesine eklemek istiyor %s%s"
+
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
+msgid "Authorize buddy?"
+msgstr "İzin vermek istiyor musunuz?"
+
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
+msgid "Authorize"
+msgstr "İzin Ver"
+
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
+msgid "Deny"
+msgstr "İzin Verme"
+
+#: ../finch/gntblist.c:278
+msgid "You must provide a screename for the buddy."
+msgstr "Kişi için bir kayıtlı isim belirtmelisiniz."
+
+#: ../finch/gntblist.c:280
+msgid "You must provide a group."
+msgstr "Bir grup belirtmelisiniz."
+
+#: ../finch/gntblist.c:282
+msgid "You must select an account."
+msgstr "Bir hesap seçmelisiniz."
+
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "Seçilen hesap çevrimiçi değil."
+
+#: ../finch/gntblist.c:288
+msgid "Error adding buddy"
+msgstr "Kişi ekleme hatası"
+
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
+msgid "Screen Name"
+msgstr "Kayıtlı İsim"
+
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1358
+#: ../libpurple/protocols/silc/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkrequest.c:277
+msgid "Alias"
+msgstr "Görünen İsim"
+
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
+msgid "Group"
+msgstr "Grup"
+
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+msgid "Account"
+msgstr "Hesap"
+
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+msgid "Add Buddy"
+msgstr "Kişi Ekle"
+
+#: ../finch/gntblist.c:329
+msgid "Please enter buddy information."
+msgstr "Lütfen kişi bilgilerini girin."
+
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
+msgid "Chats"
+msgstr "Sohbetler"
+
+#. Extract their Name and put it in
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+msgid "Name"
+msgstr "İsim"
+
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
+msgid "Add Chat"
+msgstr "Sohbet Ekle"
+
+#: ../finch/gntblist.c:400
+msgid "You can edit more information from the context menu later."
+msgstr "Daha sonra menüden başka bilgiler ekleyebilirsiniz."
+
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
+msgid "Error adding group"
+msgstr "Grup ekleme hatası"
+
+#: ../finch/gntblist.c:414
+msgid "You must give a name for the group to add."
+msgstr "Lütfen eklemek istediğiniz grup için bir isim girin."
+
+#: ../finch/gntblist.c:427
+msgid "A group with the name already exists."
+msgstr "Bu adı taşıyan bir grup zaten var."
+
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
+msgid "Add Group"
+msgstr "Grup Ekle"
+
+#: ../finch/gntblist.c:434
+msgid "Enter the name of the group"
+msgstr "Lütfen grubun ismini girin"
+
+#: ../finch/gntblist.c:767
+msgid "Edit Chat"
+msgstr "Sohbet Düzenle"
+
+#: ../finch/gntblist.c:767
+msgid "Please Update the necessary fields."
+msgstr "Lütfen gerekli alanları Güncelleyin."
+
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
+msgid "Edit"
+msgstr "Düzenle"
+
+#: ../finch/gntblist.c:784
+msgid "Auto-join"
+msgstr "Otomatik-katıl"
+
+#: ../finch/gntblist.c:793
+msgid "Edit Settings"
+msgstr "Ayarları Düzenle"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "Kullanıcı Bilgileri"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "Alınıyor..."
+
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
+msgid "Get Info"
+msgstr "Kişi Bilgilerini Al"
+
+#: ../finch/gntblist.c:868
+msgid "Add Buddy Pounce"
+msgstr "Kişi için Uyarıcı Ekle"
+
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1587
+msgid "Send File"
+msgstr "Kişiye Dosya Gönder"
+
+#: ../finch/gntblist.c:879
+msgid "View Log"
+msgstr "Kayıtları Göster"
+
+#: ../finch/gntblist.c:960
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Lütfen %s için yeni ismi girin"
+
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
+msgid "Rename"
+msgstr "Yeniden Adlandır"
+
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "Görünen İsmi Ayarla"
+
+#: ../finch/gntblist.c:963
+msgid "Enter empty string to reset the name."
+msgstr "İsmi yeniden ayarlamak için boş bırakın."
+
+#: ../finch/gntblist.c:1039
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+"Bu bağlantıyı silmek aynı zamanda bu bağlantı içerisindeki tüm kişileri de "
+"silecektir"
+
+#: ../finch/gntblist.c:1047
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Bu grubu silmek aynı zamanda bu grup içerisindeki tüm kişileri de silecektir"
+
+#: ../finch/gntblist.c:1052
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "%s ögesini kaldırmak istediğinizden emin misiniz ?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../finch/gntblist.c:1055
+msgid "Confirm Remove"
+msgstr "Kaldırmayı Onayla"
+
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1636
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+msgid "Remove"
+msgstr "Kaldır"
+
+#. Buddy List
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+msgid "Buddy List"
+msgstr "Pidgin - Kişi Listesi"
+
+#: ../finch/gntblist.c:1216
+msgid "Place tagged"
+msgstr ""
+
+#: ../finch/gntblist.c:1221
+msgid "Toggle Tag"
+msgstr ""
+
+#. General
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1366 ../libpurple/protocols/msn/msn.c:1534
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1036
+#: ../libpurple/protocols/silc/ops.c:1179
+#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
+msgid "Nickname"
+msgstr "Takma ad"
+
+#. Idle stuff
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
+#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
+msgid "Idle"
+msgstr "Boşta"
+
+#: ../finch/gntblist.c:1363
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Çevrimiçi: %d\n"
+"Toplam: %d"
+
+#: ../finch/gntblist.c:1372
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Hesap: %s (%s)"
+
+#: ../finch/gntblist.c:1384
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Son Görülme Zamanı: %s önce"
+
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1064
+msgid "New..."
+msgstr "Yeni..."
+
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1065
+msgid "Saved..."
+msgstr "Kaydedilmiş..."
+
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
+msgid "Plugins"
+msgstr "Eklentiler"
+
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
+msgid "_Name"
+msgstr "_İsim"
+
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
+msgid "_Account"
+msgstr "_Hesap"
+
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
+msgid "New Instant Message"
+msgstr "Yeni Anlık İleti"
+
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Lütfen anlık ileti göndermek istediğiniz kişinin görünen adını veya takma "
+"adını giriniz."
+
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
+msgid "OK"
+msgstr "Tamam"
+
+#. Create the "Options" frame.
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+msgid "Options"
+msgstr "Seçenekler"
+
+#: ../finch/gntblist.c:2180
+msgid "Send IM..."
+msgstr "Anlık İleti Gönder..."
+
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "Çevrimdışı kişileri göster"
+
+#: ../finch/gntblist.c:2190
+msgid "Sort by status"
+msgstr "Duruma göre sırala"
+
+#: ../finch/gntblist.c:2194
+msgid "Sort alphabetically"
+msgstr "Alfabetik olarak sırala"
+
+#: ../finch/gntblist.c:2198
+msgid "Sort by log size"
+msgstr "Kayıt büyüklüğüne göre sırala"
+
+#: ../finch/gntconn.c:38
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../finch/gntconn.c:41
+#, c-format
+msgid "%s disconnected."
+msgstr "%s kullanıcısının bağlantısı kesildi."
+
+#: ../finch/gntconn.c:42
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"%s kullanıcısının bağlantısı şu hatadan dolayı kesildi:\n"
+"%s"
+
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
+msgid "Connection Error"
+msgstr "Bağlantı Hatası"
+
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3966
+msgid "Connect"
+msgstr "Bağlan"
+
+#: ../finch/gntconv.c:116
+msgid "No such command."
+msgstr "Böyle bir komut yok."
+
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "Söz Dizimi Hatası: Komut için yanlış sayıda parametre verdiniz."
+
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
+msgid "Your command failed for an unknown reason."
+msgstr "Bilinmeyen bir sebepten dolayı verdiğiniz komut başarısız oldu."
+
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
+msgid "That command only works in chats, not IMs."
+msgstr "Bu komut anlık iletiler için değildir, sadece sohbetlerde çalışır."
+
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
+msgid "That command only works in IMs, not chats."
+msgstr "Bu komut sohbet için değildir, sadece anlık iletilerde çalışır."
+
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
+msgid "That command doesn't work on this protocol."
+msgstr "Bu komut, bu protokol üzerinde çalışmaz."
+
+#: ../finch/gntconv.c:144
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Komutlar henüz desteklenmiyor. İleti gönerilemedi."
+
+#: ../finch/gntconv.c:230
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../finch/gntconv.c:253
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s ileti yazıyor..."
+
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "Sobetten ayrıldınız."
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "Gönder"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "Yazışma"
+
+#: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "Yazışma/Temi_zle"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "Zaman Etiketlerini Göster"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "Kişi için Uyarıcı Ekle..."
+
+#: ../finch/gntconv.c:586
+msgid "<AUTO-REPLY> "
+msgstr "<OTOMATİK-YANIT> "
+
+#. Print the list of users in the room
+#: ../finch/gntconv.c:702
+msgid "List of users:\n"
+msgstr "Kullanıcı listesi:\n"
+
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
+msgid "Supported debug options are:  version"
+msgstr "Desteklenen hata ayıklama seçenekleri:  versiyon"
+
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
+msgid "No such command (in this context)."
+msgstr "Böyle bir komut yok (burada)."
+
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
+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;komut&gt;\" yazarak belirtilen komutla ilgili yardım "
+"alabilirsiniz.\n"
+"Aşağıdakiler burada geçerli olan komutlardır:\n"
+
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7073
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr "say &lt;mesaj&gt;:  Komut kullanmıyormuşunuz gibi ileti göndermenizi sağlar."
+
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7076
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "me &lt;action&gt;:  Kişiye ya da sohbet odasına IRC stili hareket gönder."
+
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7079
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "debug &lt;option&gt;:  Bu konuşmaya çeşitli hata ayıklama bilgileri yolla."
+
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7082
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Konuşma ekranını temizler."
+
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7085
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;komut&gt;:  Belirtilen komutla ilgili yardım almanızı sağlar."
+
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users:  Sohbete katılan kullanıcıların listesini göster."
+
+#: ../finch/gntconv.c:963
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Eklentiler penceresini gösterir."
+
+#: ../finch/gntconv.c:966
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Kişi Listesini gösterir."
+
+#: ../finch/gntconv.c:969
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Hesaplar penceresini gösterir."
+
+#: ../finch/gntconv.c:972
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Hata ayıklama penceresini gösterir."
+
+#: ../finch/gntconv.c:975
+msgid "prefs: Show the preference window."
+msgstr "prefs: Tercihler penceresini gösterir."
+
+#: ../finch/gntconv.c:978
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Kaydedilmiş durumlar penceresini gösterir."
+
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
+msgid "Debug Window"
+msgstr "Hata Ayıklama Penceresi"
+
+#. 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:251 ../pidgin/gtkdebug.c:752
+msgid "Clear"
+msgstr "Temizle"
+
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "Filtre: "
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
+msgid "Pause"
+msgstr "Durakla"
+
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Dosya Aktarımı - %d%% - %d dosya"
+
+#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+msgid "File Transfers"
+msgstr "Dosya Aktarımları"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+msgid "Progress"
+msgstr "İlerleme"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+msgid "Filename"
+msgstr "Dosya adı"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+msgid "Size"
+msgstr "Boyut"
+
+#: ../finch/gntft.c:197
+msgid "Speed"
+msgstr "Hız"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+msgid "Remaining"
+msgstr "Kalan"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+msgid "Status"
+msgstr "Durum"
+
+#: ../finch/gntft.c:207
+msgid "Close this window when all transfers finish"
+msgstr "Tüm aktarımlar bitince pencereyi kapat."
+
+#: ../finch/gntft.c:214
+msgid "Clear finished transfers"
+msgstr "Tamamlanan aktarımları temizle"
+
+#: ../finch/gntft.c:228
+msgid "Stop"
+msgstr "Dur"
+
+#. Close button
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Kapat"
+
+#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+msgid "Waiting for transfer to begin"
+msgstr "Aktarımın başlaması bekleniyor"
+
+#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+msgid "Canceled"
+msgstr "İptal Edildi"
+
+#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+msgid "Failed"
+msgstr "Başarısız Oldu"
+
+#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KB/s"
+msgstr "%.2f KB/s"
+
+#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1118
+msgid "Finished"
+msgstr "Bitti"
+
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+msgid "Transferring"
+msgstr "Aktarılıyor"
+
+#: ../finch/gntnotify.c:162
+msgid "Emails"
+msgstr "E-Postalar"
+
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+msgid "You have mail!"
+msgstr "E-postanız var!"
+
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
+msgid "From"
+msgstr "Kimden"
+
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
+msgid "Subject"
+msgstr "Konu"
+
+#: ../finch/gntnotify.c:198
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s (%s) %d yeni ileti."
+
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
+msgid "New Mail"
+msgstr "Yeni E-Posta"
+
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
+#, c-format
+msgid "Info for %s"
+msgstr "%s için Bilgi"
+
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
+msgid "Buddy Information"
+msgstr "Kişi Bilgileri"
+
+#: ../finch/gntnotify.c:366
+msgid "Continue"
+msgstr "Devam Et"
+
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1615 ../pidgin/gtkdebug.c:833
+msgid "Info"
+msgstr "Bilgi"
+
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1576
+msgid "IM"
+msgstr "Anında Mesajlaşma"
+
+#: ../finch/gntnotify.c:378
+msgid "Join"
+msgstr "Katıl"
+
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+msgid "Invite"
+msgstr "Davet Et"
+
+#: ../finch/gntnotify.c:384
+msgid "(none)"
+msgstr "(hiçbiri)"
+
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "HATA"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "eklenti yükleme işlemi başarısız oldu"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "eklenti kaldırma işlemi başarısız oldu"
+
+#: ../finch/gntplugin.c:124
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"İsim: %s\n"
+"Sürüm: %s\n"
+"Açıklama: %s\n"
+"Yazar: %s\n"
+"Web sitesi: %s\n"
+"Dosya Adı: %s\n"
+
+#: ../finch/gntplugin.c:182
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "Yapılandırabilmeniz için önce eklntinin yüklenmesi gerekir."
+
+#: ../finch/gntplugin.c:226
+msgid "No configuration options for this plugin."
+msgstr "Bu eklenti için yapılandırma seçeneği yok."
+
+#: ../finch/gntplugin.c:249
+msgid "You can (un)load plugins from the following list."
+msgstr "Aşağıdaki listede yer alan eklentileri yükleyip kaldırabilirsiniz."
+
+#: ../finch/gntplugin.c:296
+msgid "Configure Plugin"
+msgstr "Eklentiyi Yapılandır"
+
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
 msgid "Preferences"
 msgstr "Tercihler"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: plugins/docklet/docklet.c:416
-msgid "Quit"
-msgstr "��k��"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/docklet/docklet.c:556
-msgid "System Tray Icon"
-msgstr "Mini �kon"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/docklet/docklet.c:559
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "G�rev �ubu�unda Gaim ikonunu g�r�nt�ler"
-
-#. *  description
-#: plugins/docklet/docklet.c:561
-msgid "Displays a system tray icon (in GNOME, KDE or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list or login window. Also allows messages to be queued until the icon is clicked, similar to ICQ."
-msgstr "G�rev �ubu�unda �u anki durumunuzu g�steren, s�k kulland���n�z fonksiyonlara h�zl� eri�im sa�layan ve listenizi saklay�p g�stermenize yard�mc� olan bir ikon g�sterir. Ayn� zamanda siz t�klayana kadar, ICQ'ya benzer �ekilde, gelen mesajlar�n�z� s�ralar."
-
-#: plugins/extplacement.c:79
-msgid "By conversation count"
-msgstr "Yaz��ma say�s�na g�re"
-
-#: plugins/extplacement.c:100
-msgid "Conversation Placement"
-msgstr "Yaz��malar"
-
-#: plugins/extplacement.c:105
-msgid "Number of conversations per window"
-msgstr "Her penceredeki yaz��ma say�s�"
-
-#: plugins/extplacement.c:111
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Numaraya g�re s�raland���nda mesaj ve sohbet pencerelerini ay�r"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/extplacement.c:132
-msgid "ExtPlacement"
-msgstr "Yaz��ma+"
-
-#. *< name
-#. *< version
-#: plugins/extplacement.c:134
-msgid "Extra conversation placement options."
-msgstr "Yaz��ma kontrol�."
-
-#. *< summary
-#. *  description
-#: plugins/extplacement.c:136
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "�stenildi�i takdirde mesaj ve sohbetleri ay�rarak, her penceredeki yaz��ma say�s�n� s�n�rland�r�r."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/filectl.c:245
-msgid "Gaim File Control"
-msgstr "Gaim Dosya Kontrol�"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/filectl.c:248
-#: plugins/filectl.c:250
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "Bir dosyaya komutlar� girerek Gaim'i kontrol etmenizi sa�lar"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim Tan�t�m Eklentisi"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Bir�eyler yapan �rnek eklenti - a��klamaya bak�n."
-
-#. *  description
-#: 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 ""
-"Bu ger�ekten �ok acayip s�per bir eklenti, bir �ok i�e yar�yor:\n"
-"- Oturum a�t���n�zda program� kimin yazd���n� s�yler\n"
-"- T�m gelen mesajlar� ters �evirir\n"
-"- Oturum a�t���n�zda listenizdeki herkese an�nda mesaj g�nderir."
-
-#: plugins/gaimrc.c:40
-msgid "Cursor Color"
-msgstr "�mle� Rengi"
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr "�kincil �mle� Rengi"
-
-#: plugins/gaimrc.c:42
-#, fuzzy
-msgid "Hyperlink Color"
-msgstr "Ba�lant� rengi"
-
-#: plugins/gaimrc.c:53
-#, fuzzy
-msgid "GtkTreeView Expander Size"
-msgstr "Geni�letme Boyutu"
-
-#: plugins/gaimrc.c:72
-msgid "Conversation Entry"
-msgstr "Yaz��ma Girdisi"
-
-#: plugins/gaimrc.c:73
-msgid "Conversation History"
-msgstr "Yaz��ma Ge�mi�i"
-
-#: plugins/gaimrc.c:74
-msgid "Log Viewer"
-msgstr "Kay�t G�r�nt�leyicisi"
-
-#: plugins/gaimrc.c:75
-msgid "Request Dialog"
-msgstr "�stek Diyalogu"
-
-#: plugins/gaimrc.c:76
-msgid "Notify Dialog"
-msgstr "Uyar� Diyalogu"
-
-#: plugins/gaimrc.c:209
-#, c-format
-msgid "Select Color for %s"
-msgstr "%s i�in Renk Ayarla"
-
-#: plugins/gaimrc.c:211
-msgid "Select Color"
-msgstr "Renk Se�"
-
-#: plugins/gaimrc.c:246
-#, c-format
-msgid "Select Font for %s"
-msgstr "%s i�in renk se�"
-
-#: plugins/gaimrc.c:284
-msgid "Select Interface Font"
-msgstr "Aray�z Yaz� Tipini Se�"
-
-#: plugins/gaimrc.c:343
-msgid "GTK+ Interface Font"
-msgstr "GTK+ Aray�z Yaz�s�"
-
-#: plugins/gaimrc.c:362
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: plugins/gaimrc.c:460
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ Tema Kontrol�"
-
-#: plugins/gaimrc.c:462
-#: plugins/gaimrc.c:463
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Provides access to commonly used gtkrc settings."
-
-#. Configuration frame
-#: plugins/gestures/gestures.c:243
-msgid "Mouse Gestures Configuration"
-msgstr "Fare Hareketleri Yap�land�rma"
-
-#: plugins/gestures/gestures.c:250
-msgid "Middle mouse button"
-msgstr "Orta fare tu�u"
-
-#: plugins/gestures/gestures.c:255
-msgid "Right mouse button"
-msgstr "Sa� fare tu�u"
-
-#. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
-msgid "_Visual gesture display"
-msgstr "_Fare hareketi g�sterimi"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gestures/gestures.c:296
-msgid "Mouse Gestures"
-msgstr "Fare Hareketleri"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gestures/gestures.c:299
-msgid "Provides support for mouse gestures"
-msgstr "De�i�ik fare hareketlerinizi alg�lar"
-
-#. *  description
-#: plugins/gestures/gestures.c:301
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+msgid "Please enter a buddy to pounce."
+msgstr "Lütfen uyarmak istediğiniz kişiyi girin."
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "New Buddy Pounce"
+msgstr "Yeni Kişi Uyarıcı"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+msgid "Edit Buddy Pounce"
+msgstr "Kişi Uyarıcıyı Düzenle"
+
+#: ../finch/gntpounce.c:330
+msgid "Pounce Who"
+msgstr "Kimi Uyarsın"
+
+#. Account:
+#. Set up stuff for the account box
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
+msgid "Account:"
+msgstr "Hesap:"
+
+#: ../finch/gntpounce.c:355
+msgid "Buddy name:"
+msgstr "Kişi ismi:"
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+msgid "Pounce When Buddy..."
+msgstr "Uyarılma Nedenleri"
+
+#: ../finch/gntpounce.c:373
+msgid "Signs on"
+msgstr "Giriş yapınca"
+
+#: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "Çıkış yapınca"
+
+#: ../finch/gntpounce.c:375
+msgid "Goes away"
+msgstr "Uzakta durumuna geçince"
+
+#: ../finch/gntpounce.c:376
+msgid "Returns from away"
+msgstr "Geri dönünce"
+
+#: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "Boşta durumuna geçince"
+
+#: ../finch/gntpounce.c:378
+msgid "Is no longer idle"
+msgstr "Boşta değil durumuna geçince"
+
+#: ../finch/gntpounce.c:379
+msgid "Starts typing"
+msgstr "Yazmaya başlayınca"
+
+#: ../finch/gntpounce.c:380
+msgid "Pauses while typing"
+msgstr "Yazmaya ara verince"
+
+#: ../finch/gntpounce.c:381
+msgid "Stops typing"
+msgstr "Yazmayı bırakınca"
+
+#: ../finch/gntpounce.c:382
+msgid "Sends a message"
+msgstr "Bir ileti gönderince"
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+msgid "Action"
+msgstr "Davranışlar"
+
+#: ../finch/gntpounce.c:413
+msgid "Open an IM window"
+msgstr "Bir Anında Mesajlaşma Penceresi Aç"
+
+#: ../finch/gntpounce.c:414
+msgid "Pop up a notification"
+msgstr "Açılan bir uyarı göster"
+
+#: ../finch/gntpounce.c:415
+msgid "Send a message"
+msgstr "Bir ileti gönder"
+
+#: ../finch/gntpounce.c:416
+msgid "Execute a command"
+msgstr "Bir komut çalıştır"
+
+#: ../finch/gntpounce.c:417
+msgid "Play a sound"
+msgstr "Bir ses çal"
+
+#: ../finch/gntpounce.c:445
+msgid "Pounce only when my status is not available"
+msgstr "Sadece erişilebilir olmadığımda uyar"
+
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+msgid "Recurring"
+msgstr "Tekrarlayan"
+
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "%s için %s uyarıcısını silmek istediğinize emin misiniz ?"
+
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+msgid "Buddy Pounces"
+msgstr "Kişi Uyarıcıları"
+
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s yazmaya başladı (%s)"
+
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s yazmayı kesti (%s)"
+
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s bağlandı (%s)"
+
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s boşta durumuna geçti (%s)"
+
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s uzakta durumuna geçti (%s)"
+
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s yazmayı bıraktı (%s)"
+
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s çıktı (%s)"
+
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s boşta durumuna geçti (%s)"
+
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s uzakta durumuna geçti (%s)"
+
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s size bir ileti göndermek istiyor, (%s)"
+
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+msgid "Unknown pounce event. Please report this!"
+msgstr "Bilinmeyen uyarı olayı. Lütfen bunu raporlayın !"
+
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "Klavye kullanımına göre"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
+msgid "From last sent message"
+msgstr "Gönderilen son iletiden"
+
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+msgid "Never"
+msgstr "Asla"
+
+#: ../finch/gntprefs.c:171
+msgid "Show Idle Time"
+msgstr "Boşta Süresini Göster"
+
+#: ../finch/gntprefs.c:172
+msgid "Show Offline Buddies"
+msgstr "Çevrimdışı Kişileri Göster"
+
+#: ../finch/gntprefs.c:179
+msgid "Notify buddies when you are typing"
+msgstr "Yazmaya başladığınızda kişiler uyarılsın"
+
+#: ../finch/gntprefs.c:185
+msgid "Log format"
+msgstr "Kayıt biçemi"
+
+#: ../finch/gntprefs.c:186
+msgid "Log IMs"
+msgstr "Anlık İletileri Kaydet"
+
+#: ../finch/gntprefs.c:187
+msgid "Log chats"
+msgstr "Sohbetleri kaydet"
+
+#: ../finch/gntprefs.c:188
+msgid "Log status change events"
+msgstr "Durum değiştirme olaylarını kaydet"
+
+#. Conversations
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+msgid "Conversations"
+msgstr "Yazışmalar"
+
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+msgid "Logging"
+msgstr "Kayıtlar"
+
+#: ../finch/gntrequest.c:532
+msgid "Not implemented yet."
+msgstr "Özellik henüz eklenmedi."
+
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
+msgid "Save File..."
+msgstr "Dosyayı Kaydet..."
+
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
+msgid "Open File..."
+msgstr "Dosya Aç..."
+
+#: ../finch/gntstatus.c:135
+#, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "\"%s\" ögesini silmek istediğinizden emin misiniz ?"
+
+#: ../finch/gntstatus.c:138
+msgid "Delete Status"
+msgstr "Durumu Sil"
+
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+msgid "Saved Statuses"
+msgstr "Kaydedilmiş Durumlar"
+
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:464
+msgid "Title"
+msgstr "Başlık"
+
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+msgid "Type"
+msgstr "Tip"
+
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../libpurple/protocols/bonjour/bonjour.c:258
+#: ../libpurple/protocols/bonjour/bonjour.c:265
+#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+msgid "Message"
+msgstr "İleti"
+
+#. Use
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+msgid "Use"
+msgstr "Kullan"
+
+#: ../finch/gntstatus.c:294
+msgid "Invalid title"
+msgstr "Hatalı başlık"
+
+#: ../finch/gntstatus.c:295
+msgid "Please enter a non-empty title for the status."
+msgstr "Lütfen durum için boş olmayan bir başlık girin."
+
+#: ../finch/gntstatus.c:302
+msgid "Duplicate title"
+msgstr "Başlığı ikile"
+
+#: ../finch/gntstatus.c:303
+msgid "Please enter a different title for the status."
+msgstr "Lütfen durum için farklı bir başlık girin."
+
+#: ../finch/gntstatus.c:443
+msgid "Substatus"
+msgstr "Alt-durum"
+
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+msgid "Status:"
+msgstr "Durum:"
+
+#: ../finch/gntstatus.c:469
+msgid "Message:"
+msgstr "İleti:"
+
+#: ../finch/gntstatus.c:518
+msgid "Edit Status"
+msgstr "Durumu Düzenle"
+
+#: ../finch/gntstatus.c:560
+msgid "Use different status for following accounts"
+msgstr "Farklı hesaplar için farklı durumlar kullan"
+
+#. Save & Use
+#: ../finch/gntstatus.c:594
+msgid "Save & Use"
+msgstr "Kaydet & Kullan"
+
+#: ../finch/gntui.c:83
+msgid "Statuses"
+msgstr "Durumlar"
+
+#: ../finch/plugins/gntclipboard.c:149
+msgid "GntClipboard"
+msgstr "GntClipboard"
+
+#: ../finch/plugins/gntclipboard.c:151
+msgid "Clipboard plugin"
+msgstr "Pano eklentisi"
+
+#: ../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:231
+#, c-format
+msgid "%s just signed on"
+msgstr "%s şimdi bağlandı"
+
+#: ../finch/plugins/gntgf.c:238
+#, c-format
+msgid "%s just signed off"
+msgstr "%s şimdi çıktı"
+
+#: ../finch/plugins/gntgf.c:246
+#, c-format
+msgid "%s sent you a message"
+msgstr "%s size bir ileti gönderdi"
+
+#: ../finch/plugins/gntgf.c:265
+#, c-format
+msgid "%s said your nick in %s"
+msgstr "%s %s kanalında takma adınızı söyledi"
+
+#: ../finch/plugins/gntgf.c:267
+#, c-format
+msgid "%s sent a message in %s"
+msgstr "%s %s kanalında bir ileti gönderdi"
+
+#: ../finch/plugins/gntgf.c:305
+msgid "Buddy signs on/off"
+msgstr "Kişi bağlandığında / çıktığında"
+
+#: ../finch/plugins/gntgf.c:306
+msgid "You receive an IM"
+msgstr "Bir Anlık İleti aldınız"
+
+#: ../finch/plugins/gntgf.c:307
+msgid "Someone speaks in a chat"
+msgstr "Sohbette birileri konuşuyor"
+
+#: ../finch/plugins/gntgf.c:308
+msgid "Someone says your name in a chat"
+msgstr "Biri sohbette takma adınızı söyledi"
+
+#: ../finch/plugins/gntgf.c:336
+msgid "Notify with a toaster when"
+msgstr "Bir toaster ile uyar"
+
+#: ../finch/plugins/gntgf.c:351
+msgid "Beep too!"
+msgstr "Biip !"
+
+#: ../finch/plugins/gntgf.c:357
+msgid "Set URGENT for the terminal window."
+msgstr "Terminal penceresi için URGENT ayarla."
+
+#: ../finch/plugins/gntgf.c:377
+msgid "GntGf"
+msgstr "GntGf"
+
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+msgid "Toaster plugin"
+msgstr "Toaster eklentisi"
+
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b> %s ile %s üzerindeki diyalog:</b><br>"
+
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+msgid "History Plugin Requires Logging"
+msgstr "Geçmiş Eklentisi Kayıt Tutulmasını Gerektirir"
+
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+"Kayıt tutmayı etkinleştirmek için lütfen Araçlar -> Tercihler -> Kayıtlar "
+"yolunu takip edin.\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 ""
-"Fare hareketlerini yaz��ma penceresinde destekler.\n"
-"Orta fare tu�una bas�l� tutup hareket ettirdi�inizde:\n"
-"\n"
-"A�a��, sonra da sa�a s�r�klerseniz yaz��ma penceresini kapat�r.\n"
-"Yukar�, sonra da sola s�r�klerseniz bir �nceki yaz��maya ge�er.\n"
-"Yukar�, sonra da sa�a s�r�klerseniz bir sonraki yaz��maya ge�er."
-
-#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119
-#: src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638
-#: src/protocols/msn/msn.c:1539
-msgid "Name"
-msgstr "�sim"
-
-#: plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "Yeni Mesaj"
-
-#. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Adres defterinden birini se�in ya da yeni bir ki�i ekleyin."
-
-#. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353
-#: src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
-msgid "Search"
-msgstr "Ara"
-
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306
-#: src/gtkblist.c:4082
-#: src/gtkblist.c:4459
-msgid "Group:"
-msgstr "Grup:"
-
-#. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
-#: plugins/gevolution/assoc-buddy.c:464
-msgid "New Person"
-msgstr "Yeni Ki�i"
-
-#. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
-msgid "Select Buddy"
-msgstr "Ki�i Se�in"
-
-#. Add the label.
-#: plugins/gevolution/assoc-buddy.c:340
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "Eklemek i�in adres defterinizden bir ki�i se�in, ya da yeni bir ki�i olu�turun."
-
-#. Add the expander
-#: plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "Kullan�c� _ayr�nt�lar�"
-
-#. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "Ki�i Se�in"
-
-#: plugins/gevolution/gevo-util.c:64
-#: plugins/gevolution/gevolution.c:96
-#: src/blist.c:518
-#: src/blist.c:1259
-#: src/blist.c:1480
-#: src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+"Anlık İletiler ya da sohetler için kayıt tutmayı etkinleştirmek bu "
+"yazışmalar için geçmiş özelliğini de etkinleştirecektir."
+
+#: ../finch/plugins/gnthistory.c:179
+msgid "GntHistory"
+msgstr "Geçmiş"
+
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Son kaydedilen yazışmayı gösterir."
+
+#: ../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 "Bu eklenti yeni bir yazışma açıldığında eski yazışmaları şimdiki yazışmanın başına ekler."
+
+#: ../finch/plugins/lastlog.c:69
+msgid "Lastlog"
+msgstr "Son Kayıt"
+
+#: ../finch/plugins/lastlog.c:99
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr "lastlog: Kayıtlar içerisinde bir ifadeyi aramanızı sağlar."
+
+#: ../finch/plugins/lastlog.c:121
+msgid "GntLastlog"
+msgstr "Son Kayıt"
+
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr "Son Kayıt eklentisi"
+
+#: ../libpurple/account.c:790
+msgid "accounts"
+msgstr "hesaplar"
+
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
+msgid "Password is required to sign on."
+msgstr "Oturum açmak için parola gerekli"
+
+#: ../libpurple/account.c:963
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "%s (%s) için parolanızı girin"
+
+#: ../libpurple/account.c:970
+msgid "Enter Password"
+msgstr "Parola"
+
+#: ../libpurple/account.c:975
+msgid "Save password"
+msgstr "Parolayı kaydet"
+
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s eklentisi için eksik protokol"
+
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
+msgid "New passwords do not match."
+msgstr "Yeni şifreler çelişiyor."
+
+#: ../libpurple/account.c:1179
+msgid "Fill out all fields completely."
+msgstr "Tüm alanları doldurun."
+
+#: ../libpurple/account.c:1202
+msgid "Original password"
+msgstr "Orijinal şifre"
+
+#: ../libpurple/account.c:1209
+msgid "New password"
+msgstr "Yeni şifre"
+
+#: ../libpurple/account.c:1216
+msgid "New password (again)"
+msgstr "Yeni şifre (tekrar)"
+
+#: ../libpurple/account.c:1222
+#, c-format
+msgid "Change password for %s"
+msgstr "%s için şifre değiştir"
+
+#: ../libpurple/account.c:1230
+msgid "Please enter your current password and your new password."
+msgstr "Lütfen şu anki ve yeni şifrenizi girin."
+
+#: ../libpurple/account.c:1261
+#, c-format
+msgid "Change user information for %s"
+msgstr "%s için kullanıcı bilgilerini değiştir"
+
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+msgid "Set User Info"
+msgstr "Kullanıcı Bilgisini Değiştir"
+
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
-msgstr "Ki�iler"
-
-#: plugins/gevolution/gevolution.c:262
-#: plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "E-Posta g�nderilemedi."
-
-#: plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "Adres Defterine Ekle"
-
-#: plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "E-Posta Yolla"
-
-#. Configuration frame
-#: plugins/gevolution/gevolution.c:414
-msgid "Evolution Integration Configuration"
-msgstr ""
-
-#. Label
-#: plugins/gevolution/gevolution.c:417
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Ki�ilerin otomatik eklenmesi gereken t�m hesaplar� se�in."
-
-#: plugins/gevolution/gevolution.c:447
-#: plugins/idle.c:111
-#: plugins/idle.c:140
-msgid "Account"
-msgstr "Hesap"
-
+msgstr "Kişiler"
+
+#: ../libpurple/blist.c:550
+msgid "buddy list"
+msgstr "Arkadaş Listesi"
+
+#: ../libpurple/connection.c:106
+msgid "Registration Error"
+msgstr "Kayıt Hatası"
+
+#: ../libpurple/connection.c:293
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s giriş yaptı"
+
+#: ../libpurple/connection.c:323
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s çıkış yaptı"
+
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:321
+msgid "Unknown error"
+msgstr "Bilinmeyen Hata"
+
+#: ../libpurple/conversation.c:165
+msgid "Unable to send message: The message is too large."
+msgstr "İleti gönderilemedi: İleti çok uzun."
+
+#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "İleti %s kişisine gönderilemedi."
+
+#: ../libpurple/conversation.c:169
+msgid "The message is too large."
+msgstr "Mesajınız çok uzun."
+
+#: ../libpurple/conversation.c:178
+msgid "Unable to send message."
+msgstr "Mesaj gönderilemedi."
+
+#: ../libpurple/conversation.c:1164
+msgid "Send Message"
+msgstr "İleti Gönder"
+
+#: ../libpurple/conversation.c:1167
+msgid "_Send Message"
+msgstr "_İleti Gönder"
+
+#: ../libpurple/conversation.c:1570
+#, c-format
+msgid "%s entered the room."
+msgstr "%s odaya giriş yaptı."
+
+#: ../libpurple/conversation.c:1573
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] odaya giriş yaptı."
+
+#: ../libpurple/conversation.c:1678
+#, c-format
+msgid "You are now known as %s"
+msgstr "Şimdi %s olarak biliniyorsunuz"
+
+#: ../libpurple/conversation.c:1698
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s şimdi %s olarak biliniyor"
+
+#: ../libpurple/conversation.c:1771
+#, c-format
+msgid "%s left the room."
+msgstr "%s odadan ayrıldı."
+
+#: ../libpurple/conversation.c:1774
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s odadan ayrıldı (%s)."
+
+#: ../libpurple/dbus-server.c:578
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "Bağlantı sağlanamadı: %s"
+
+#: ../libpurple/dbus-server.c:590
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "İsim alımı başarısız oldu: %s"
+
+#: ../libpurple/dbus-server.c:603
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr "Sunucu adı alımı başarısız oldu: %s"
+
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "Purple D-BUS sunucusu aşağıdaki nedenden dolayı çalışmıyor"
+
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgid "No name"
+msgstr "İsimsiz"
+
+#: ../libpurple/dnsquery.c:510
+msgid "Unable to create new resolver process\n"
+msgstr "Yeni çözümleme süreci başlatılamadı\n"
+
+#: ../libpurple/dnsquery.c:515
+msgid "Unable to send request to resolver process\n"
+msgstr "Çözümleme sürecine istek gönderilemedi\n"
+
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+"%s çözümlenirken hata:\n"
+"%s"
+
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr "%s çözümlenirken hata: %d"
+
+#: ../libpurple/dnsquery.c:573
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+"Çözümleme sürecinden okunurken hata:\n"
+"%s"
+
+#: ../libpurple/dnsquery.c:577
+msgid "EOF while reading from resolver process"
+msgstr "Çözümleme sürecinde dosyanın sonuna ulaşıldı"
+
+#: ../libpurple/dnsquery.c:760
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "İş parçacığı (thread) oluşturma işlemi başarısız oldu: %s"
+
+#: ../libpurple/dnsquery.c:761
+msgid "Unknown reason"
+msgstr "Bilinmeyen sebep"
+
+#: ../libpurple/ft.c:204
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"%s okuma hatası: \n"
+"%s.\n"
+
+#: ../libpurple/ft.c:208
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s yazma hatası: \n"
+"%s.\n"
+
+#: ../libpurple/ft.c:212
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s erişim hatası: \n"
+"%s.\n"
+
+#: ../libpurple/ft.c:248
+msgid "Directory is not writable."
+msgstr "Dizin yazılabilir değil."
+
+#: ../libpurple/ft.c:263
+msgid "Cannot send a file of 0 bytes."
+msgstr "0 baytlık bir dosya gönderemezsiniz."
+
+#: ../libpurple/ft.c:273
+msgid "Cannot send a directory."
+msgstr "Bir dizin gönderemezsiniz."
+
+#: ../libpurple/ft.c:282
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s düzgün bir dosya değil. Üzerine yazılmaktan vazgeçildi.\n"
+
+#: ../libpurple/ft.c:342
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s size şunu göndermek istiyor: %s (%s)"
+
+#: ../libpurple/ft.c:349
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s size bir dosya göndermek istiyor"
+
+#: ../libpurple/ft.c:392
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s tarafından gönderilen dosyayı kabul ediyor musunuz?"
+
+#: ../libpurple/ft.c:396
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"İndirmek için dosya hazır:\n"
+"Uzak bilgisayar: %s\n"
+"Erişim portu: %d"
+
+#: ../libpurple/ft.c:431
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s %s dosyasını göndermek istiyor"
+
+#: ../libpurple/ft.c:483
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s geçerli bir dosya ismi değil.\n"
+
+#: ../libpurple/ft.c:504
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Offering to send %s to %s"
+
+#: ../libpurple/ft.c:516
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "%s transferi, %s tarafından başlatılıyor."
+
+#: ../libpurple/ft.c:670
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "%s transferi tamamlandı"
+
+#: ../libpurple/ft.c:673
+msgid "File transfer complete"
+msgstr "Dosya transferi tamamlandı"
+
+#: ../libpurple/ft.c:1091
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "Dosya Transferinden Vazgeçildi (%s)"
+
+#: ../libpurple/ft.c:1096
+msgid "File transfer cancelled"
+msgstr "Dosya transferinden vazgeçildi"
+
+#: ../libpurple/ft.c:1154
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s, %s transferinden vazgeçti"
+
+#: ../libpurple/ft.c:1159
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s dosya transferinden vazgeçti"
+
+#: ../libpurple/ft.c:1216
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "%s kullanıcısında dosya transferi yapılamadı."
+
+#: ../libpurple/ft.c:1218
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "%s kullanıcısından dosya transferi yapılamadı."
+
+#: ../libpurple/gconf/purple.schemas.in.h:1
+msgid "Run the command in a terminal"
+msgstr "Komutu bir terminalde çalıştır."
+
+#: ../libpurple/gconf/purple.schemas.in.h:2
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "Bu komut etkinleştirilirse \"aim\" adreslerini açmak için kullanılır."
+
+#: ../libpurple/gconf/purple.schemas.in.h:3
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "Bu komut etkinleştirilirse \"gg\" adreslerini açmak için kullanılır."
+
+#: ../libpurple/gconf/purple.schemas.in.h:4
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "Bu komut etkinleştirilirse \"icq\" adreslerini açmak için kullanılır."
+
+#: ../libpurple/gconf/purple.schemas.in.h:5
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "Bu komut etkinleştirilirse \"irc\" adreslerini açmak için kullanılır."
+
+#: ../libpurple/gconf/purple.schemas.in.h:6
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "Bu komut etkinleştirilirse \"msnim\" adreslerini açmak için kullanılır."
+
+#: ../libpurple/gconf/purple.schemas.in.h:7
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "Bu komut etkinleştirilirse \"sip\" adreslerini açmak için kullanılır."
+
+#: ../libpurple/gconf/purple.schemas.in.h:8
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "Bu komut etkinleştirilirse \"xmpp\" adreslerini açmak için kullanılır."
+
+#: ../libpurple/gconf/purple.schemas.in.h:9
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "Bu komut etkinleştirilirse \"ymsgr\" adreslerini açmak için kullanılır."
+
+#: ../libpurple/gconf/purple.schemas.in.h:10
+msgid "The handler for \"aim\" URLs"
+msgstr "\"aim\" adresleri için yakalayıcı"
+
+#: ../libpurple/gconf/purple.schemas.in.h:11
+msgid "The handler for \"gg\" URLs"
+msgstr "\"gg\" adresleri için yakalayıcı"
+
+#: ../libpurple/gconf/purple.schemas.in.h:12
+msgid "The handler for \"icq\" URLs"
+msgstr "\"icq\" adresleri için yakalayıcı"
+
+#: ../libpurple/gconf/purple.schemas.in.h:13
+msgid "The handler for \"irc\" URLs"
+msgstr "\"irc\" adresleri için yakalayıcı"
+
+#: ../libpurple/gconf/purple.schemas.in.h:14
+msgid "The handler for \"msnim\" URLs"
+msgstr "\"msnim\" adresleri için yakalayıcı"
+
+#: ../libpurple/gconf/purple.schemas.in.h:15
+msgid "The handler for \"sip\" URLs"
+msgstr "\"sip\" adresleri için yakalayıcı"
+
+#: ../libpurple/gconf/purple.schemas.in.h:16
+msgid "The handler for \"xmpp\" URLs"
+msgstr "\"xmpp\" adresleri için yakalayıcı"
+
+#: ../libpurple/gconf/purple.schemas.in.h:17
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "\"ymsgr\" adresleri için yakalayıcı"
+
+#: ../libpurple/gconf/purple.schemas.in.h:18
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:19
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:21
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:22
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:23
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:25
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+
+#: ../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 ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:27
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:28
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:29
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:30
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:31
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:32
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:33
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr ""
+
+#: ../libpurple/gconf/purple.schemas.in.h:34
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr ""
+
+#: ../libpurple/log.c:181
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">Kaydedicinin okuma fonksiyonu yok</font></b>"
+
+#: ../libpurple/log.c:593
+msgid "HTML"
+msgstr "HTML"
+
+#: ../libpurple/log.c:607
+msgid "Plain text"
+msgstr "Düz metin"
+
+#: ../libpurple/log.c:621
+msgid "Old flat format"
+msgstr "Eski düz biçem"
+
+#: ../libpurple/log.c:732
+msgid "Logging of this conversation failed."
+msgstr "Konuşmanın kaydı yapılamadı."
+
+#: ../libpurple/log.c:1175
+msgid "XML"
+msgstr "XML"
+
+#: ../libpurple/log.c:1251
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;OTOMATIK-"
+"CEVAPLA&gt;:</b></font> %s<br/>\n"
+
+#: ../libpurple/log.c:1253
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;OTOMATIK-"
+"CEVAPLA&gt;:</b></font> %s<br/>\n"
+
+#: ../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>Kayıt dosyası yolu bulunamadı!</b></font>"
+
+#: ../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>Dosya okunamıyor: %s</b></font>"
+
+#: ../libpurple/log.c:1385
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <Otomatik-cevap>: %s\n"
+
+#: ../libpurple/plugin.c:365
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "%s kullanıyorsunuz fakat bu eklenti %s gerektiriyor."
+
+#: ../libpurple/plugin.c:380
+msgid "This plugin has not defined an ID."
+msgstr "Bu eklentinin bir kimliği yok."
+
+#: ../libpurple/plugin.c:448
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "Eklenti magic uyumsuzluğu %d (gereken %d)"
+
+#: ../libpurple/plugin.c:465
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "ABI sürüm uyumsuzluğu %d %d.x(gereken %d %d.x)"
+
+#: ../libpurple/plugin.c:482
+msgid "Plugin does not implement all required functions"
+msgstr "Eklenti gereken fonksiyonlarla yazılmamış."
+
+#: ../libpurple/plugin.c:547
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr "Gerekli eklenti %s bulunamadı. Lütfen eklentiyi kurun ve tekrar deneyin."
+
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "Eklenti yüklenemedi"
+
+#: ../libpurple/plugin.c:574
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "Gerekli %s eklentisi yüklenemedi."
+
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "Eklentiniz yüklenemedi."
+
+#: ../libpurple/plugin.c:677
+#, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "Bağımlılıkları olan %s eklentisi kaldırılamadı."
+
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
+msgstr "Eklenti kaldırılırken hatalar oluştu."
+
+#: ../libpurple/plugins/autoaccept.c:23
+msgid "Autoaccept"
+msgstr "Otomatik-kabul et"
+
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+msgid "Auto-accept file transfer requests from selected users."
+msgstr ""
+"Seçilen kullanıcılar tarafından gönderilen dosyaları otomatik olarak kabul "
+"et."
+
+#: ../libpurple/plugins/autoaccept.c:80
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr ""
+"Otomatik olarak kabul edilen \"%s\" dosyasının \"%s\" kişisinden aktarımı "
+"tamamlandı."
+
+#: ../libpurple/plugins/autoaccept.c:82
+msgid "Autoaccept complete"
+msgstr "Otomatik kabul etme işlemi tamamlandı"
+
+#: ../libpurple/plugins/autoaccept.c:160
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "%s tarafından gönderilen dosya aktarım isteği alındığında"
+
+#: ../libpurple/plugins/autoaccept.c:162
+msgid "Set Autoaccept Setting"
+msgstr "Otomatik Kabul Etme Ayarlarını Düzenle"
+
+#: ../libpurple/plugins/autoaccept.c:164
+msgid "_Save"
+msgstr "_Kaydet"
+
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
+msgid "_Cancel"
+msgstr "İp_tal"
+
+#: ../libpurple/plugins/autoaccept.c:168
+msgid "Ask"
+msgstr "Sor"
+
+#: ../libpurple/plugins/autoaccept.c:169
+msgid "Auto Accept"
+msgstr "Otomatik Kabul Et"
+
+#: ../libpurple/plugins/autoaccept.c:170
+msgid "Auto Reject"
+msgstr "Otomatik Olarak Reddet"
+
+#: ../libpurple/plugins/autoaccept.c:184
+msgid "Autoaccept File Transfers..."
+msgstr "Otomatik Kabul Et Dosya Aktarımları..."
+
+#. XXX: Is there a better way than this? There really should be.
+#: ../libpurple/plugins/autoaccept.c:214
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+"Dosyaların kaydedileceği dizinin yolu\n"
+"(Lütfen tam adres verin)"
+
+#: ../libpurple/plugins/autoaccept.c:219
+msgid "Automatically reject from users not in buddy list"
+msgstr ""
+"Kişi listesinde olmayan kullanıcılar tarafından gönderilenleri otomatik "
+"olarak reddet"
+
+#: ../libpurple/plugins/autoaccept.c:223
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1637
+msgid "Notes"
+msgstr "Notlar"
+
+#: ../libpurple/plugins/buddynote.c:47
+msgid "Enter your notes below..."
+msgstr "Notlarınızı aşağıya girin..."
+
+#: ../libpurple/plugins/buddynote.c:62
+msgid "Edit Notes..."
+msgstr "Notları Düzenle..."
+
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
-msgid "Evolution Integration"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/gevolution/gevolution.c:533
-#: plugins/gevolution/gevolution.c:535
-msgid "Provides integration with Evolution."
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the person's information below."
-msgstr "L�tfen kullan�c�n�n bilgisini a�a�� girin."
-
-#: plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "L�tfen kullan�c�n�n kay�tl� ismini ve hesap tipini girin."
-
-#: plugins/gevolution/new_person_dialog.c:290
-msgid "Account type:"
-msgstr "Hesap tipi:"
-
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
-msgstr "Kay�tl� �sim"
-
-#. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
-msgid "Optional information:"
-msgstr "�ste�e ba�l� bilgi:"
-
-#. Label
-#: plugins/gevolution/new_person_dialog.c:337
-#: src/gtkaccount.c:412
-#: src/gtkaccount.c:434
-#: src/protocols/oscar/oscar.c:613
-msgid "Buddy Icon"
-msgstr "Resim:"
-
-#: plugins/gevolution/new_person_dialog.c:349
-msgid "First name:"
-msgstr "Ad:"
-
-#: plugins/gevolution/new_person_dialog.c:361
-msgid "Last name:"
-msgstr "Soyad:"
-
-#: plugins/gevolution/new_person_dialog.c:381
-msgid "E-mail:"
-msgstr "E-mail:"
-
-#: plugins/history.c:146
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:147
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:186
-msgid "History"
-msgstr "Ge�mi�"
-
-#: plugins/history.c:188
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Son kaydedilen yaz��may� g�sterir."
-
-#: plugins/history.c:189
-msgid ""
-"When a new conversation is opened this plugin will insert the last conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from Tools -> Preferences -> Logging. Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/iconaway.c:101
-msgid "Iconify on Away"
-msgstr "D��ar�da! oldu�unda pencereyi k���lt"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/iconaway.c:104
-#: plugins/iconaway.c:106
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "D��ar�da! durumuna ge�ti�inizde listenizi ve t�m yaz��malar�n�z� simge durumua k���lt�r."
-
-#: plugins/idle.c:115
-msgid "Minutes"
-msgstr "Dakika"
-
-#: plugins/idle.c:122
-#: plugins/idle.c:149
-#: plugins/idle.c:215
-msgid "I'dle Mak'er"
-msgstr "Ba�l� S�rem"
-
-#: plugins/idle.c:123
-#: plugins/idle.c:181
-msgid "Set Account Idle Time"
-msgstr "Ba�l� Kald���n S�reyi Ayarla"
-
-#: plugins/idle.c:126
-msgid "_Set"
-msgstr "_Ayarla"
-
-#: plugins/idle.c:127
-#: plugins/idle.c:154
-msgid "_Cancel"
-msgstr "�p_tal"
-
-#: plugins/idle.c:150
-#: plugins/idle.c:185
-msgid "Unset Account Idle Time"
-msgstr "Hesap Bo� Durma S�resini Belirleme"
-
-#: plugins/idle.c:153
-msgid "_Unset"
-msgstr "_Belirsiz"
-
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217
-#: plugins/idle.c:218
-#, fuzzy
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Ne kadar ba�l� kald���n� g�steren s�reyi ayarlaman�z� sa�lar"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "IPC Test �stemcisi"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr ""
-
-#. *  description
-#: plugins/ipc-test-client.c:92
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "IPC Test Sunucusu"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr ""
-
-#. *  description
-#: plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-
-#: plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "Posta Kontrol"
-
-#: plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Yerel postalar i�in kontrol et."
-
-#: plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "Yeni postan�z oldu�unda listenize k���k bir kutu resmi ekler"
-
-#. ---------- "Notify For" ----------
-#: plugins/notify.c:638
-msgid "Notify For"
-msgstr "Uyar"
-
-#: plugins/notify.c:642
-msgid "_IM windows"
-msgstr "_Mesaj penceresi"
-
-#: plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "_Sohbet Penceresi"
-
-#: plugins/notify.c:656
-msgid "_Focused windows"
-msgstr "_Aktif pencere"
-
-#. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
-msgid "Notification Methods"
-msgstr "Uyar� Metodlar�"
-
-#: plugins/notify.c:671
-#, fuzzy
-msgid "Prepend _string into window title:"
-msgstr "Pencere ba�l���:"
-
-#. Count method button
-#: plugins/notify.c:690
-msgid "Insert c_ount of new messages into window title"
-msgstr "Pencere ba�l���na yeni mesaj say�s�n� ekle"
-
-#. Urgent method button
-#: plugins/notify.c:698
-msgid "Set window manager \"_URGENT\" hint"
-msgstr ""
-
-#. Raise window method button
-#: plugins/notify.c:706
-#, fuzzy
-msgid "R_aise conversation window"
-msgstr "Yaz��ma Penceresi"
-
-#. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
-msgid "Notification Removal"
-msgstr "Uyar�y� Kald�rma"
-
-#. Remove on focus button
-#: plugins/notify.c:719
-msgid "Remove when conversation window _gains focus"
-msgstr "Yaz��ma penceresi aktif olunca kald�r"
-
-#. Remove on click button
-#: plugins/notify.c:726
-msgid "Remove when conversation window _receives click"
-msgstr "Yaz��ma penceresine t�kland���nda kald�r"
-
-#. Remove on type button
-#: plugins/notify.c:734
-msgid "Remove when _typing in conversation window"
-msgstr "Yaz��ma penceresinde yazd���nda kald�r"
-
-#. Remove on message send button
-#: plugins/notify.c:742
-msgid "Remove when a _message gets sent"
-msgstr ""
-
-#. Remove on conversation switch button
-#: plugins/notify.c:751
-msgid "Remove on switch to conversation ta_b"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/notify.c:841
-msgid "Message Notification"
-msgstr "Mesaj Uyar�s�"
+#: ../libpurple/plugins/buddynote.c:87
+msgid "Buddy Notes"
+msgstr "Kişi Notları"
 
 #. *< name
 #. *< version
-#. *  summary
-#. *  description
-#: plugins/notify.c:844
-#: plugins/notify.c:846
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/perl/perl.c:587
-msgid "Perl Plugin Loader"
-msgstr "Perl Eklentisi Y�kleyici"
-
-#. *< name
-#. *< version
+#: ../libpurple/plugins/buddynote.c:89
+msgid "Store notes on particular buddies."
+msgstr "Farklı kişiler için not kaydet"
+
 #. *< summary
-#: plugins/perl/perl.c:589
-#: plugins/perl/perl.c:590
-msgid "Provides support for loading perl plugins."
-msgstr ""
-
-#: plugins/raw.c:151
-msgid "Raw"
-msgstr "Raw"
-
-#: plugins/raw.c:153
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-
-#: plugins/raw.c:154
-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 ""
-
-#: plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Kulland���n�z Gaim versiyonu %s.  En son versiyon ise %s.<hr>"
-
-#: plugins/relnot.c:69
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Kay�t:</b>\n"
-"%s<br><br>"
-
-#: plugins/relnot.c:74
-#, c-format
-msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
-msgstr "Gaim versiyonu %s i�in:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
-
-#: plugins/relnot.c:78
-#: plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "Yeni Versiyon Mevcut"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "S�r�m De�i�ikli�i Uyar�s�"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "Periyodik olarak yeni s�r�mleri kontrol et."
-
-#. *  description
-#: plugins/relnot.c:142
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Yeni s�r�mleri periyodik olarak denetler."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/signals-test.c:730
-msgid "Signals Test"
-msgstr "Sinyal Testi"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/signals-test.c:733
-#: plugins/signals-test.c:735
-msgid "Test to see that all signals are working properly."
-msgstr "T�m sinyallerin do�ru �al���p �al��mad���n� g�rmek i�in test edin."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/simple.c:34
-msgid "Simple Plugin"
-msgstr "Basit Eklenti"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/simple.c:37
-#: plugins/simple.c:39
-msgid "Tests to see that most things are working."
-msgstr "�o�u �eyin �al���p �al��mad���n� g�rmek i�in test edin."
-
-#: plugins/spellchk.c:1788
-msgid "Duplicate Correction"
-msgstr "�ift Do�rulama"
-
-#: plugins/spellchk.c:1789
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1948
-msgid "Text Replacements"
-msgstr "Metin De�i�tirme"
-
-#: plugins/spellchk.c:1972
-msgid "You type"
-msgstr "Yazd���n�z"
-
-#: plugins/spellchk.c:1984
-msgid "You send"
-msgstr "G�nderdi�iniz"
-
-#: plugins/spellchk.c:1996
-msgid "Whole words only"
-msgstr "Sadece t�m kelimeler"
-
-#: plugins/spellchk.c:2022
-msgid "Add a new text replacement"
-msgstr "Yeni metin de�i�ikli�i ekle"
-
-#: plugins/spellchk.c:2032
-msgid "You _type:"
-msgstr "Yazd���n�z:"
-
-#: plugins/spellchk.c:2048
-msgid "You _send:"
-msgstr "G�nderdi�iniz"
-
-#: plugins/spellchk.c:2060
-msgid "Only replace _whole words"
-msgstr "Sadece _t�m kelimelerle de�i�tir"
-
-#: plugins/spellchk.c:2097
-msgid "Text replacement"
-msgstr "Metin �evirici"
-
-#: plugins/spellchk.c:2099
-#: plugins/spellchk.c:2100
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Belirtilen kurallara g�re giden mesajdaki kelimeleri de�i�tirir."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-gnutls.c:227
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:230
-#: plugins/ssl/ssl-gnutls.c:232
-msgid "Provides SSL support through GNUTLS."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-nss.c:319
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:322
-#: plugins/ssl/ssl-nss.c:324
-msgid "Provides SSL support through Mozilla NSS."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl.c:97
-#: plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
-
-#: plugins/statenotify.c:42
-#, c-format
-msgid "%s has gone away."
-msgstr "%s D��ar�da!"
-
-#: plugins/statenotify.c:49
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s art�k D��ar�da! de�il."
-
-#: plugins/statenotify.c:56
-#, c-format
-msgid "%s has become idle."
-msgstr "%s ba�land�."
-
-#: plugins/statenotify.c:63
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s art�k ba�l� de�il."
-
-#: plugins/statenotify.c:74
-msgid "Notify When"
-msgstr "Uyar"
-
-#: plugins/statenotify.c:77
-msgid "Buddy Goes _Away"
-msgstr "Ki�i d��ar�da! olunca"
-
-#: plugins/statenotify.c:80
-msgid "Buddy Goes _Idle"
-msgstr "Ki�i ba�l� olunca"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/statenotify.c:120
-msgid "Buddy State Notification"
-msgstr "Ki�i Durum Uyar�s�"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/statenotify.c:123
-#: plugins/statenotify.c:126
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr "Ki�inin durumundaki de�i�iklikleri (D��arda!, burda, vs.) yaz��ma penceresinde belirtir."
-
-#: plugins/tcl/tcl.c:363
-msgid "Tcl Plugin Loader"
-msgstr "Tcl Eklentisi Y�kleyici"
-
-#: plugins/tcl/tcl.c:365
-#: plugins/tcl/tcl.c:366
-msgid "Provides support for loading Tcl plugins"
+#: ../libpurple/plugins/buddynote.c:90
+msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 
 #. *< type
@@ -1088,31 +2261,121 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75
-#: plugins/ticker/ticker.c:326
-msgid "Buddy Ticker"
-msgstr "Ki�i Se�in"
+#: ../libpurple/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "DBus Örneği"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "DBus Eklenti Örneği"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr "Dosya Kontrolü"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329
-#: plugins/ticker/ticker.c:331
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "Listenin yatay versiyonu."
-
-#: plugins/timestamp.c:202
-msgid "iChat Timestamp"
-msgstr "iChat S�re �l�er"
-
-#: plugins/timestamp.c:209
-msgid "Delay"
-msgstr "Gecikme"
-
-#: plugins/timestamp.c:216
-msgid "minutes."
-msgstr "dakika."
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr "Bir dosyaya komutlar girerek Pidgin'i kontrol etmenizi sağlar."
+
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+msgid "Minutes"
+msgstr "Dakika"
+
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+msgid "I'dle Mak'er"
+msgstr "Bağlı Sürem"
+
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+msgid "Set Account Idle Time"
+msgstr "Bağlı Kaldığın Süreyi Ayarla"
+
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+msgid "_Set"
+msgstr "_Ayarla"
+
+#: ../libpurple/plugins/idle.c:184
+msgid "None of your accounts are idle."
+msgstr "Hesaplarınızın hiçbiri bağlı değil."
+
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+msgid "Unset Account Idle Time"
+msgstr "Hesap Boş Durma Süresini Belirleme"
+
+#: ../libpurple/plugins/idle.c:203
+msgid "_Unset"
+msgstr "_Belirsiz"
+
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+msgid "Set Idle Time for All Accounts"
+msgstr "Tüm Hesaplar için Boşta Zamanı Ayarla"
+
+#: ../libpurple/plugins/idle.c:271
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "Ne kadar bağlı kaldığınızı gösteren süreyi el ile ayarlamanızı sağlar"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "IPC Test İstemcisi"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr ""
+
+#. *  description
+#: ../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."
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -1120,60 +2383,160 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
-msgid "Timestamp"
-msgstr "S�re�l�er"
+#: ../libpurple/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "IPC Test Sunucusu"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr ""
+
+#. *  description
+#: ../libpurple/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr "En Düşük Oda Boyutu"
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:270
+msgid "Join/Part Hiding"
+msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
+#: ../libpurple/plugins/joinpart.c:273
+msgid "Hides extraneous join/part messages."
+msgstr ""
+
 #. *  description
-#: plugins/timestamp.c:282
-#: plugins/timestamp.c:284
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr ""
-
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Opakl�k:"
-
-#. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Yaz��ma Penceresi"
-
-#: plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "_Mesaj penceresi ge�irgenli�i"
-
-#: plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "Kayd�rma �ubuklar�n� mesaj penceresinde g�ster"
-
-#: plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "�zerine gelindi�inde anl�k ileti penceresi �effafl���n� yoket"
-
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Her zaman �stte"
-
-#. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Liste Penceresi"
-
-#: plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "Liste penceresi ge�irgenli�i"
-
-#: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Liste penceresi ge�irgenli�i"
+#: ../libpurple/plugins/joinpart.c:275
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+#: ../libpurple/plugins/log_reader.c:497
+msgid "(UTC)"
+msgstr "(UTC)"
+
+#: ../libpurple/plugins/log_reader.c:1552
+msgid "User is offline."
+msgstr "Kullanıcı çevrimdışı."
+
+#: ../libpurple/plugins/log_reader.c:1558
+msgid "Auto-response sent:"
+msgstr "Otomatik-yanıt gönderildi:"
+
+#: ../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 şimdi çıkış yaptı."
+
+#: ../libpurple/plugins/log_reader.c:1585
+msgid "One or more messages may have been undeliverable."
+msgstr "Bir ya da daha fazla ileti gönderilebilir değil."
+
+#: ../libpurple/plugins/log_reader.c:1595
+msgid "You were disconnected from the server."
+msgstr "Sunucuyla bağlantınız koptu."
+
+#: ../libpurple/plugins/log_reader.c:1603
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr "Şuanda çevrimdışısınız. Oturum açana kadar ileti alamayacaksınız."
+
+#: ../libpurple/plugins/log_reader.c:1618
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "İleti gönderilemedi çünkü ileti uzunluğu aşıldı."
+
+#: ../libpurple/plugins/log_reader.c:1623
+msgid "Message could not be sent."
+msgstr "İleti gönderilemedi."
+
+#. 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.
+#: ../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.
+#: ../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.
+#: ../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.
+#: ../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.
+#: ../libpurple/plugins/log_reader.c:2026
+#: ../libpurple/plugins/log_reader.c:2103
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../libpurple/plugins/log_reader.c:2067
+msgid "General Log Reading Configuration"
+msgstr "Genel Kayıt Okuma Yapılandırması"
+
+#: ../libpurple/plugins/log_reader.c:2071
+msgid "Fast size calculations"
+msgstr "Hızlı boyut hesaplama"
+
+#: ../libpurple/plugins/log_reader.c:2075
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+#: ../libpurple/plugins/log_reader.c:2081
+msgid "Log Directory"
+msgstr "Kayıt Dizini"
 
 #. *< type
 #. *< ui_requirement
@@ -1181,3534 +2544,368 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
-msgid "Transparency"
-msgstr "Ge�irgenlik"
+#: ../libpurple/plugins/log_reader.c:2132
+msgid "Log Reader"
+msgstr "Kayıt Okuyucu"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libpurple/plugins/log_reader.c:2136
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+
+#. * description
+#: ../libpurple/plugins/log_reader.c:2140
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+
+#: ../libpurple/plugins/mono/loader/mono.c:217
+msgid "Mono Plugin Loader"
+msgstr "Mono Eklenti Yükleyici"
+
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
+msgid "Loads .NET plugins with Mono."
+msgstr "Mono ile .NET eklentilerini yükler."
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/newline.c:68
+msgid "New Line"
+msgstr "Yeni Satır"
+
+#. *< name
+#. *< version
+#: ../libpurple/plugins/newline.c:70
+msgid "Prepends a newline to displayed message."
+msgstr "Görüntülenen iletinin üst kısmına boş bir satır ekler."
+
+#. *< summary
+#: ../libpurple/plugins/newline.c:71
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the screen name in the conversation window."
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:23
+msgid "Offline Message Emulation"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+msgid "Save messages sent to an offline user as pounce."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../libpurple/plugins/offlinemsg.c:156
+msgid "Offline Message"
+msgstr "Çevrimdışı İletisi"
+
+#: ../libpurple/plugins/offlinemsg.c:157
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
+#: ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "Evet"
+
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
+#: ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "Hayır"
+
+#: ../libpurple/plugins/offlinemsg.c:189
+msgid "Save offline messages in pounce"
+msgstr "Çevrimdışı iletileri uyarıcı içine kaydet"
+
+#: ../libpurple/plugins/offlinemsg.c:193
+msgid "Do not ask. Always save in pounce."
+msgstr "Sorma. Herzaman uyarıcıya kaydet."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/perl/perl.c:601
+msgid "Perl Plugin Loader"
+msgstr "Perl Eklenti Yükleyici"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+msgid "Provides support for loading perl plugins."
+msgstr "Perl eklentilerini yüklemek için destek sağlar."
+
+#: ../libpurple/plugins/psychic.c:20
+msgid "Psychic Mode"
+msgstr "Ruhsal Durum"
+
+#: ../libpurple/plugins/psychic.c:21
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:22
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:72
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:91
+msgid "Only enable for users on the buddy list"
+msgstr "Sadece kişi listemdeki kullanıcıları etkinleştir"
+
+#: ../libpurple/plugins/psychic.c:96
+msgid "Disable when away"
+msgstr "Uzaktayken pasifleştir"
+
+#: ../libpurple/plugins/psychic.c:100
+msgid "Display notification message in conversations"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:105
+msgid "Raise psychic conversations"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "Sinyal Testi"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:660
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Liste ve mesaj penceresi i�in ge�irgenlik de�i�keni."
-
+#. *  description
+#: ../libpurple/plugins/signals-test.c:687
+#: ../libpurple/plugins/signals-test.c:689
+msgid "Test to see that all signals are working properly."
+msgstr "Tüm sinyallerin doğru çalışıp çalışmadığını görmek için test edin."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "Basit Eklenti"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "Çoğu şeyin çalışıp çalışmadığını görmek için test edin."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS üzerinden SSL desteği sağlar."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:662
-#, fuzzy
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"Bu eklenti mesaj penceresi ve listedeki ge�irgenli�i ayarlaman�z� sa�lar\n"
-"\n"
-"* Not: Eklenti Win2000 veya WinXP gerektirir."
-
-#: plugins/win32/winprefs/winprefs.c:385
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime S�r�m�"
-
-#. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
-msgid "Startup"
-msgstr "Ba�lang��"
-
-#: plugins/win32/winprefs/winprefs.c:394
-msgid "_Start Gaim on Windows startup"
-msgstr "Gaim'i Windows ba�larken _�al��t�r"
-
-#. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405
-#: src/gtkblist.c:3173
-msgid "Buddy List"
-msgstr "Liste"
-
-#: plugins/win32/winprefs/winprefs.c:406
-msgid "_Dockable Buddy List"
-msgstr "_�zerine b�rak�labilir Ki�i Listesi"
-
-#. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
-msgid "_Keep Buddy List window on top:"
-msgstr "Liste penceresi her zaman _�stte"
-
-#: plugins/win32/winprefs/winprefs.c:412
-#: src/gtkprefs.c:1657
-msgid "Never"
-msgstr "Asla"
-
-#: plugins/win32/winprefs/winprefs.c:413
-msgid "Always"
-msgstr "Her zaman"
-
-#. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
-msgid "Only when docked"
-msgstr ""
-
-#. Conversations
-#: plugins/win32/winprefs/winprefs.c:419
-#: src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
-msgid "Conversations"
-msgstr "Yaz��malar"
-
-#: plugins/win32/winprefs/winprefs.c:420
-msgid "_Flash window when messages are received"
-msgstr "Yeni ileti geldi�inde pencereyi canland�r"
-
-#: plugins/win32/winprefs/winprefs.c:443
-msgid "WinGaim Options"
-msgstr "WinGaim Se�enekleri"
-
-#: plugins/win32/winprefs/winprefs.c:445
-msgid "Options specific to Windows Gaim."
-msgstr "Windows Gaim'e �zel se�enekler"
-
-#: plugins/win32/winprefs/winprefs.c:446
-msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-msgid "accounts"
-msgstr "hesaplar"
-
-#: src/account.c:915
-msgid "Password is required to sign on."
-msgstr "Oturum a�mak i�in parola gerekli"
-
-#: src/account.c:940
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "%s (%s) i�in �ifre girin"
-
-#: src/account.c:947
-msgid "Enter Password"
-msgstr "Parola gir"
-
-#: src/account.c:952
-msgid "Save password"
-msgstr "Parolay� kaydet"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
-#.
-#: src/account.c:960
-#: src/account.c:1116
-#: src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648
-#: src/gtkdialogs.c:704
-#: src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434
-#: src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498
-#: src/protocols/jabber/jabber.c:1162
-#: src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:250
-#: src/protocols/msn/msn.c:265
-#: src/protocols/msn/msn.c:280
-#: src/protocols/msn/msn.c:295
-#: src/protocols/oscar/oscar.c:2894
-#: src/protocols/oscar/oscar.c:4404
-#: src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857
-#: src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007
-#: src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585
-#: src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137
-#: src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460
-#: src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083
-#: src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716
-#: src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974
-#: src/request.h:1331
-msgid "OK"
-msgstr "Tamam"
-
-#: src/account.c:961
-#: src/account.c:1117
-#: src/account.c:1155
-#: src/gtkaccount.c:2124
-#: src/gtkaccount.c:2575
-#: src/gtkblist.c:4497
-#: src/gtkdialogs.c:508
-#: src/gtkdialogs.c:649
-#: src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724
-#: src/gtkdialogs.c:746
-#: src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810
-#: src/gtkdialogs.c:872
-#: src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956
-#: src/gtkimhtmltoolbar.c:419
-#: src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608
-#: src/gtkprivacy.c:633
-#: src/gtkprivacy.c:644
-#: src/gtkrequest.c:262
-#: src/gtksavedstatuses.c:221
-#: src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582
-#: src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499
-#: src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358
-#: src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163
-#: src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:251
-#: src/protocols/msn/msn.c:266
-#: src/protocols/msn/msn.c:281
-#: src/protocols/msn/msn.c:296
-#: src/protocols/msn/msn.c:313
-#: src/protocols/oscar/oscar.c:1596
-#: src/protocols/oscar/oscar.c:2895
-#: src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405
-#: src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486
-#: src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983
-#: src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060
-#: src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586
-#: src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042
-#: src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595
-#: src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697
-#: src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966
-#: src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331
-#: src/request.h:1341
-msgid "Cancel"
-msgstr "Vazge�"
-
-#: src/account.c:986
-#: src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "%s eklentisi i�in eksik protokol"
-
-#: src/account.c:988
-#: src/connection.c:99
-msgid "Connection Error"
-msgstr "Ba�lant� Hatas�"
-
-#: src/account.c:1052
-#: src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
-msgid "New passwords do not match."
-msgstr "Yeni �ifreler �eli�iyor."
-
-#: src/account.c:1061
-msgid "Fill out all fields completely."
-msgstr "T�m alanlar� doldurun."
-
-#: src/account.c:1085
-msgid "Original password"
-msgstr "Orijinal �ifre"
-
-#: src/account.c:1092
-msgid "New password"
-msgstr "Yeni �ifre"
-
-#: src/account.c:1099
-msgid "New password (again)"
-msgstr "Yeni �ifre (tekrar)"
-
-#: src/account.c:1105
-#, c-format
-msgid "Change password for %s"
-msgstr "%s i�in �ifre de�i�tir"
-
-#: src/account.c:1113
-msgid "Please enter your current password and your new password."
-msgstr "L�tfen �u anki ve yeni �ifrenizi girin."
-
-#: src/account.c:1146
-#, c-format
-msgid "Change user information for %s"
-msgstr "%s i�in kullan�c� bilgilerini de�i�tir"
-
-#: src/account.c:1154
-#: src/gtkdebug.c:684
-#: src/gtkrequest.c:268
-#: src/protocols/jabber/buddy.c:572
-msgid "Save"
-msgstr "Kaydet"
-
-#: src/account.c:1641
-#: src/gtkft.c:156
-#: src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083
-#: src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
-msgid "Unknown"
-msgstr "Bilinmeyen"
-
-#: src/blist.c:545
-msgid "buddy list"
-msgstr "Arkada� Listesi"
-
-#: src/blist.c:1162
-msgid "Chats"
-msgstr "Sohbetler"
-
-#: src/blist.c:1863
-#, c-format
-msgid "%d buddy from group %s was not removed because its account was not logged in.  This buddy and the group were not removed.\n"
-msgid_plural "%d buddies from group %s were not removed because their accounts were not logged in.  These buddies and the group were not removed.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/blist.c:1872
-msgid "Group not removed"
-msgstr "Grup kald�r�lmad�"
-
-#: src/connection.c:98
-msgid "Registration Error"
-msgstr "Kay�t Hatas�"
-
-#: src/conversation.c:205
-#, fuzzy
-msgid "Unable to send message: The message is too large."
-msgstr "Mesaj�n�z �ok uzun oldu�undan g�nderilemedi."
-
-#: src/conversation.c:208
-#: src/conversation.c:221
-#, fuzzy, c-format
-msgid "Unable to send message to %s."
-msgstr "Mesaj %s e g�nderilemedi:"
-
-#: src/conversation.c:209
-msgid "The message is too large."
-msgstr "Mesaj�n�z �ok uzun."
-
-#: src/conversation.c:218
-msgid "Unable to send message."
-msgstr "Mesaj g�nderilemedi."
-
-#: src/conversation.c:1497
-#, c-format
-msgid "%s entered the room."
-msgstr "%s odaya giri� yapt�."
-
-#: src/conversation.c:1499
-#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] odaya giri� yapt�."
-
-#: src/conversation.c:1598
-#, c-format
-msgid "You are now known as %s"
-msgstr "�sminizi %s olarak de�i�tirdiniz"
-
-#: src/conversation.c:1613
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s ismini de�i�tirdi: %s"
-
-#: src/conversation.c:1669
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s oday� terk etti (%s)."
-
-#: src/conversation.c:1671
-#, c-format
-msgid "%s left the room."
-msgstr "%s oday� terk etti."
-
-#: src/conversation.c:1748
-#, c-format
-msgid "(+%d more)"
-msgstr "(+%d daha)"
-
-#: src/conversation.c:1750
-#, c-format
-msgid " left the room (%s)."
-msgstr " oday� terk etti (%s)."
-
-#: src/ft.c:188
-#: src/protocols/msn/msn.c:412
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
-msgstr ""
-"Okuma hatas� %s: \n"
-"%s.\n"
-
-#: src/ft.c:192
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
-msgstr ""
-"Yazma hatas� %s: \n"
-"%s.\n"
-
-#: src/ft.c:196
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
-msgstr ""
-"Ula�ma hatas� %s: \n"
-"%s.\n"
-
-#: src/ft.c:229
-msgid "Cannot send a file of 0 bytes."
-msgstr "0 baytl�k bir dosya g�nderemezsiniz."
-
-#: src/ft.c:239
-msgid "Cannot send a directory."
-msgstr "Klas�r g�nderemezsiniz."
-
-#: src/ft.c:248
-#, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s d�zg�n bir dosya de�il. �zerine yaz�lmaktan vazge�ildi.\n"
-
-#: src/ft.c:306
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s size dosya g�ndermek istiyor: %s (%s)"
-
-#: src/ft.c:313
-#, c-format
-msgid "%s wants to send you a file"
-msgstr "%s size bir dosya g�ndermek istiyor"
-
-#: src/ft.c:354
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "%s taraf�ndan g�nderilen dosyay� kabul ediyor musunuz?"
-
-#: src/ft.c:358
-#, c-format
-msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
-msgstr ""
-"�ndirmek i�in dosya haz�r:\n"
-"Uzak bilgisayar: %s\n"
-"Eri�im portu: %d"
-
-#: src/ft.c:382
-#, fuzzy, c-format
-msgid "%s is offering to send file %s"
-msgstr "Offering to send %s to %s"
-
-#: src/ft.c:422
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s ge�erli bir dosya ismi de�il.\n"
-
-#: src/ft.c:443
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "Offering to send %s to %s"
-
-#: src/ft.c:454
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "%s transferi, %s taraf�ndan ba�lat�l�yor."
-
-#: src/ft.c:608
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "%s transferi tamamland�"
-
-#: src/ft.c:611
-msgid "File transfer complete"
-msgstr "Dosya transferi tamamland�"
-
-#: src/ft.c:995
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Dosya Transferinden Vazge�ildi (%s)"
-
-#: src/ft.c:1000
-msgid "File transfer cancelled"
-msgstr "Dosya transferinden vazge�ildi"
-
-#: src/ft.c:1057
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s, %s transferinden vazge�ti"
-
-#: src/ft.c:1062
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s dosya transferinden vazge�ti"
-
-#: src/ft.c:1119
-#, c-format
-msgid "File transfer to %s failed."
-msgstr "%s kullan�c�s�nda dosya transferi yap�lamad�."
-
-#: src/ft.c:1121
-#, c-format
-msgid "File transfer from %s failed."
-msgstr "%s kullan�c�s�ndan dosya transferi yap�lamad�."
-
-#: src/gtkaccount.c:362
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Dosya:</b> %s\n"
-"<b>Dosya boyutu:</b> %s\n"
-"<b>Resim boyutu:</b> %dx%d"
-
-#. Build the login options frame.
-#: src/gtkaccount.c:730
-msgid "Login Options"
-msgstr "Giri� Se�enekleri"
-
-#: src/gtkaccount.c:747
-#: src/gtkft.c:623
-msgid "Protocol:"
-msgstr "Protokol:"
-
-#: src/gtkaccount.c:752
-#: src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "Kay�tl� �sim:"
-
-#: src/gtkaccount.c:825
-msgid "Password:"
-msgstr "�ifre:"
-
-#: src/gtkaccount.c:830
-#: src/gtkblist.c:4065
-#: src/gtkblist.c:4444
-msgid "Alias:"
-msgstr "G�r�nen �sim:"
-
-#: src/gtkaccount.c:834
-msgid "Remember password"
-msgstr "�ifreyi hat�rla"
-
-#. Build the user options frame.
-#: src/gtkaccount.c:879
-msgid "User Options"
-msgstr "Kullan�c� Se�enekleri"
-
-#: src/gtkaccount.c:892
-msgid "New mail notifications"
-msgstr "Yeni posta bildiricisi"
-
-#: src/gtkaccount.c:901
-msgid "Buddy icon:"
-msgstr "Resim:"
-
-#. Build the protocol options frame.
-#: src/gtkaccount.c:990
-#, c-format
-msgid "%s Options"
-msgstr "%s Se�enekleri"
-
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128
-#: src/gtkaccount.c:1175
-msgid "Use Global Proxy Settings"
-msgstr "Evrensel Proxy Ayarlar�n� Kullan"
-
-#. No Proxy
-#: src/gtkaccount.c:1134
-#: src/gtkaccount.c:1182
-msgid "No Proxy"
-msgstr "Proxy Kullanma"
-
-#. HTTP
-#: src/gtkaccount.c:1140
-#: src/gtkaccount.c:1189
-msgid "HTTP"
-msgstr "HTTP"
-
-#. SOCKS 4
-#: src/gtkaccount.c:1146
-#: src/gtkaccount.c:1196
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#. SOCKS 5
-#: src/gtkaccount.c:1152
-#: src/gtkaccount.c:1203
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158
-#: src/gtkaccount.c:1210
-#: src/gtkprefs.c:1007
-msgid "Use Environmental Settings"
-msgstr "Genel Ayarlar� Kullan"
-
-#: src/gtkaccount.c:1249
-msgid "you can see the butterflies mating"
-msgstr ""
-
-#: src/gtkaccount.c:1253
-msgid "If you look real closely"
-msgstr ""
-
-#: src/gtkaccount.c:1269
-msgid "Proxy Options"
-msgstr "Proxy Ayarlar�"
-
-#: src/gtkaccount.c:1287
-#: src/gtkprefs.c:1001
-msgid "Proxy _type:"
-msgstr "Proxy _tipi:"
-
-#: src/gtkaccount.c:1296
-#: src/gtkprefs.c:1022
-msgid "_Host:"
-msgstr "_Host"
-
-#: src/gtkaccount.c:1300
-#: src/gtkprefs.c:1040
-msgid "_Port:"
-msgstr "_Port"
-
-#: src/gtkaccount.c:1308
-msgid "_Username:"
-msgstr "_Kullan�c� Ad�:"
-
-#: src/gtkaccount.c:1313
-#: src/gtkprefs.c:1077
-msgid "Pa_ssword:"
-msgstr "�if_re"
-
-#: src/gtkaccount.c:1700
-msgid "Add Account"
-msgstr "Hesap ekle"
-
-#: src/gtkaccount.c:1702
-msgid "Modify Account"
-msgstr "Hesab� De�i�tir"
-
-#. Register button
-#: src/gtkaccount.c:1750
-#: src/protocols/jabber/jabber.c:706
-msgid "Register"
-msgstr "Kaydol"
-
-#: src/gtkaccount.c:2118
-#: src/gtksavedstatuses.c:217
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "%s silmek istedi�inize emin misiniz?"
-
-#: src/gtkaccount.c:2123
-#: src/gtkrequest.c:265
-#: src/gtksavedstatuses.c:220
-msgid "Delete"
-msgstr "Sil"
-
-#: src/gtkaccount.c:2187
-#: src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
-msgid "Screen Name"
-msgstr "Kay�tl� �sim"
-
-#: src/gtkaccount.c:2210
-msgid "Enabled"
-msgstr "Aktif"
-
-#: src/gtkaccount.c:2218
-msgid "Protocol"
-msgstr "Protokol"
-
-#: src/gtkaccount.c:2550
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr ""
-
-#: src/gtkaccount.c:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Bu ki�iyi kullan�c� listenize eklemek istiyor musunuz?"
-
-#: src/gtkaccount.c:2572
-msgid "Add buddy to your list?"
-msgstr "Ki�iyi listenize eklemek istiyor musunuz?"
-
-#: src/gtkaccount.c:2574
-#: src/gtkblist.c:4496
-#: src/gtkconv.c:1527
-#: src/gtkrequest.c:266
-#: src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674
-#: src/protocols/silc/chat.c:594
-msgid "Add"
-msgstr "Ekle"
-
-#: src/gtkblist.c:595
-msgid "Join a Chat"
-msgstr "Sohbete Kat�l"
-
-#: src/gtkblist.c:616
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
-msgstr ""
-
-#: src/gtkblist.c:627
-#: src/gtkpounce.c:415
-#: src/gtkroomlist.c:354
-msgid "_Account:"
-msgstr "_Hesap"
-
-#: src/gtkblist.c:935
-msgid "Get _Info"
-msgstr "Bilgiyi Al"
-
-#: src/gtkblist.c:938
-msgid "I_M"
-msgstr "Mesaj"
-
-#: src/gtkblist.c:944
-msgid "_Send File"
-msgstr "_Dosya G�nder"
-
-#: src/gtkblist.c:950
-msgid "Add Buddy _Pounce"
-msgstr "Yeni Uyar�c� Ekle"
-
-#: src/gtkblist.c:954
-#: src/gtkblist.c:958
-#: src/gtkblist.c:1056
-#: src/gtkblist.c:1079
-msgid "View _Log"
-msgstr "_Kay�tlar� G�ster"
-
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "G�r�nen �sim..."
-
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "Ki�iyi _Kald�r"
-
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "G�r�nen �sim..."
-
-#: src/gtkblist.c:976
-#: src/gtkdialogs.c:808
-#: src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "Ki�iyi Kald�r"
-
-#: src/gtkblist.c:980
-#: src/gtkblist.c:1064
-#: src/gtkblist.c:1085
-msgid "_Alias..."
-msgstr "G�r�nen �sim..."
-
-#: src/gtkblist.c:982
-#: src/gtkblist.c:1066
-#: src/gtkblist.c:1087
-msgid "_Remove"
-msgstr "_Kald�r"
-
-#: src/gtkblist.c:1028
-msgid "Add a _Buddy"
-msgstr "Ki�i Ekle"
-
-#: src/gtkblist.c:1030
-msgid "Add a C_hat"
-msgstr "_Sohbet Ekle"
-
-#: src/gtkblist.c:1032
-msgid "_Delete Group"
-msgstr "_Grubu Sil"
-
-#: src/gtkblist.c:1034
-msgid "_Rename"
-msgstr "Ye_niden Adland�r"
-
-#. join button
-#: src/gtkblist.c:1052
-#: src/gtkroomlist.c:264
-#: src/gtkroomlist.c:409
-#: src/gtkstock.c:118
-msgid "_Join"
-msgstr "_Kat�l"
-
-#: src/gtkblist.c:1054
-msgid "Auto-Join"
-msgstr "Otomatik Kat�l"
-
-#: src/gtkblist.c:1092
-#: src/gtkblist.c:1115
-msgid "_Collapse"
-msgstr "_Daralt"
-
-#: src/gtkblist.c:1120
-msgid "_Expand"
-msgstr "_Geni�let"
-
-#: src/gtkblist.c:1353
-#: src/gtkblist.c:1363
-#: src/gtkblist.c:3326
-#: src/gtkblist.c:3331
-msgid "/Tools/Mute Sounds"
-msgstr "/Ara�lar/Sesleri Kapat"
-
-#: src/gtkblist.c:1822
-#: src/gtkconv.c:3745
-#: src/gtkpounce.c:314
-msgid "You are not currently signed on with an account that can add that buddy."
-msgstr ""
-
-#. Buddies menu
-#: src/gtkblist.c:2329
-msgid "/_Buddies"
-msgstr "/_Ki�iler"
-
-#: src/gtkblist.c:2330
-msgid "/Buddies/New Instant _Message..."
-msgstr "/_Ki�iler/Yeni _Mesaj..."
-
-#: src/gtkblist.c:2331
-msgid "/Buddies/Join a _Chat..."
-msgstr "/_Ki�iler/Sohbete Kat�l..."
-
-#: src/gtkblist.c:2332
-msgid "/Buddies/Get User _Info..."
-msgstr "/_Ki�iler/Kullan�c� Bilgisi Al..."
-
-#: src/gtkblist.c:2333
-msgid "/Buddies/View User _Log..."
-msgstr "/_Ki�iler/Ki�i Kay�tlar�n� G�ster..."
-
-#: src/gtkblist.c:2335
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/_Ki�iler/�evrimd��� Ki�ileri G�ster"
-
-#: src/gtkblist.c:2336
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/_Ki�iler/Bo� Gruplar� G�ster"
-
-#: src/gtkblist.c:2337
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Ki�iler/Ki�i Bilgilerini G�ster"
-
-#: src/gtkblist.c:2338
-#: src/gtkblist.c:5158
-msgid "/Buddies/Sort Buddies"
-msgstr "/Ki�iler/Ki�ileri S�rala"
-
-#: src/gtkblist.c:2340
-msgid "/Buddies/_Add Buddy..."
-msgstr "/_Ki�iler/_Arkada� Ekle..."
-
-#: src/gtkblist.c:2341
-msgid "/Buddies/Add C_hat..."
-msgstr "/_Ki�iler/Sohbet Ekle..."
-
-#: src/gtkblist.c:2342
-msgid "/Buddies/Add _Group..."
-msgstr "/_Ki�iler/Grup Ekle..."
-
-#: src/gtkblist.c:2344
-msgid "/Buddies/_Quit"
-msgstr "/_Ki�iler/_Kapat"
-
-#. Tools
-#: src/gtkblist.c:2347
-msgid "/_Tools"
-msgstr "/_Ara�lar"
-
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
-msgstr "/Ara�lar/_Uyar�c�lar"
-
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/Ara�lar/Hesaplarla �lgili"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/_Ara�lar/_Hesaplar"
-
-#: src/gtkblist.c:2352
-msgid "/Tools/Pr_eferences"
-msgstr "/_Ara�lar/_Tercihler"
-
-#: src/gtkblist.c:2353
-msgid "/Tools/Plu_gins"
-msgstr "/Ara�lar/Eklentiler"
-
-#: src/gtkblist.c:2354
-msgid "/Tools/Pr_ivacy"
-msgstr "/_Ara�lar/_G�venlik"
-
-#: src/gtkblist.c:2355
-msgid "/Tools/_File Transfers"
-msgstr "/_Ara�lar/_Dosya Transferleri"
-
-#: src/gtkblist.c:2356
-msgid "/Tools/R_oom List"
-msgstr "/_Ara�lar/Oda Listesi"
-
-#: src/gtkblist.c:2358
-msgid "/Tools/Mute _Sounds"
-msgstr "/Ara�lar/Sesleri _Kapat"
-
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/_Ara�lar/Sistem Kay�tlar�n� G�ster"
-
-#. Help
-#: src/gtkblist.c:2362
-msgid "/_Help"
-msgstr "/_Yard�m"
-
-#: src/gtkblist.c:2363
-msgid "/Help/Online _Help"
-msgstr "/Yard�m/�evrim_i�i Yard�m"
-
-#: src/gtkblist.c:2364
-msgid "/Help/_Debug Window"
-msgstr "/Yard�m/_Hata Yakalama"
-
-#: src/gtkblist.c:2365
-msgid "/Help/_About"
-msgstr "/Yard�m/_Hakk�nda"
-
-#: src/gtkblist.c:2397
-#: src/gtkblist.c:2464
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Hesap:</b> %s"
-
-#: src/gtkblist.c:2473
-#, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>G�r�nen �sim:</b> %s"
-
-#: src/gtkblist.c:2481
-#, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>G�r�nen (etiket) �sim:</b> %s"
-
-#: src/gtkblist.c:2489
-#, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Takma ad�:</b>%s"
-
-#: src/gtkblist.c:2498
-#, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Giri� Yapt�:</b>%s"
-
-#: src/gtkblist.c:2510
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>S�re:</b> %s"
-
-#: src/gtkblist.c:2546
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Son g�r�lme</b> %s �nce"
-
-#: src/gtkblist.c:2554
-msgid ""
-"\n"
-"<b>Status:</b> Offline"
-msgstr ""
-"\n"
-"<b>Durum:</b> �evrimd���"
-
-#: src/gtkblist.c:2577
-msgid ""
-"\n"
-"<b>Description:</b> Spooky"
-msgstr ""
-"\n"
-"<b>A��klama:</b> Korkun�"
-
-#: src/gtkblist.c:2579
-msgid ""
-"\n"
-"<b>Status:</b> Awesome"
-msgstr ""
-"\n"
-"<b>Durum:</b> Korkun�"
-
-#: src/gtkblist.c:2581
-msgid ""
-"\n"
-"<b>Status:</b> Rockin'"
-msgstr ""
-"\n"
-"<b>Durum:</b> Rock Yap�yor"
-
-#: src/gtkblist.c:2843
-#, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "Ba�l� (%dh %02dm) "
-
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
-msgstr "Ba�l� (%dd) "
-
-#: src/gtkblist.c:2848
-msgid "Idle "
-msgstr "S�re"
-
-#: src/gtkblist.c:2852
-msgid "Offline "
-msgstr "�evrimd���"
-
-#: src/gtkblist.c:2968
-msgid "/Buddies/New Instant Message..."
-msgstr "/_Ki�iler/Yeni Anl�k �leti..."
-
-#: src/gtkblist.c:2969
-#: src/gtkblist.c:3003
-msgid "/Buddies/Join a Chat..."
-msgstr "/_Ki�iler/Sohbete Kat�l..."
-
-#: src/gtkblist.c:2970
-msgid "/Buddies/Get User Info..."
-msgstr "/_Ki�iler/Kullan�c� Bilgisi Al..."
-
-#: src/gtkblist.c:2971
-msgid "/Buddies/Add Buddy..."
-msgstr "/_Ki�iler/_Ki�i Ekle..."
-
-#: src/gtkblist.c:2972
-msgid "/Buddies/Add Chat..."
-msgstr "/_Ki�iler/Sohbet Ekle..."
-
-#: src/gtkblist.c:2973
-msgid "/Buddies/Add Group..."
-msgstr "/_Ki�iler/Grup Ekle..."
-
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/Ara�lar/Oda Listesi"
-
-#: src/gtkblist.c:3009
-msgid "/Tools/Privacy"
-msgstr "/Ara�lar/G�venlik"
-
-#: src/gtkblist.c:3085
-msgid "Manually"
-msgstr "El ile ayarla"
-
-#: src/gtkblist.c:3087
-msgid "Alphabetically"
-msgstr "Alfabetik"
-
-#: src/gtkblist.c:3088
-msgid "By status"
-msgstr "Duruma g�re"
-
-#: src/gtkblist.c:3089
-msgid "By log size"
-msgstr "Kay�t b�y�kl���ne g�re"
-
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/Ara�lar/Uyar�c�lar"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/Ara�lar/Hesaplarla �lgili"
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: src/gtkblist.c:3322
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Ki�iler/�evrimd��� Ki�ileri G�ster"
-
-#: src/gtkblist.c:3324
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Ki�iler/Bo� Gruplar� G�ster"
-
-#: src/gtkblist.c:3328
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Ki�iler/Ki�i Ayr�nt�lar�n� G�ster"
-
-#: src/gtkblist.c:4005
-#: src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994
-#: src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129
-#: src/protocols/yahoo/yahoo.c:2886
-msgid "Add Buddy"
-msgstr "Ki�i Ekle"
-
-#: src/gtkblist.c:4029
-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 "L�tfen eklemek istedi�iniz ki�inin listedeki ismini girin. �sterseniz ki�inin g�r�nen ismini de�i�tirebilirsiniz. B�ylece m�mk�n oldu�u takdirde girdi�iniz isim, ki�inin kay�tl� ismi yerine listenizde g�r�necektir.\n"
-
-#. Set up stuff for the account box
-#: src/gtkblist.c:4092
-#: src/gtkblist.c:4424
-msgid "Account:"
-msgstr "Hesap:"
-
-#: src/gtkblist.c:4357
-msgid "This protocol does not support chat rooms."
-msgstr "Bu protokol sohbet odalar�n� desteklemiyor."
-
-#: src/gtkblist.c:4373
-msgid "You are not currently signed on with any protocols that have the ability to chat."
-msgstr "Sohbet etmek i�in hi�bir sohbet protokol�ne giri� yapmad�n�z."
-
-#: src/gtkblist.c:4390
-msgid "Add Chat"
-msgstr "Sohbet Ekle"
-
-#: src/gtkblist.c:4414
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr "L�tfen bir g�r�nen isim ve listeye eklemek istedi�iniz sohbet hakk�nda uygun bir bilgi girin.\n"
-
-#: src/gtkblist.c:4493
-msgid "Add Group"
-msgstr "Grup Ekle"
-
-#: src/gtkblist.c:4494
-msgid "Please enter the name of the group to be added."
-msgstr "L�tfen eklemek istedi�iniz grubun ismini girin."
-
-#: src/gtkblist.c:5025
-msgid "No actions available"
-msgstr "Kullan�labilir i�lem yok"
-
-#: src/gtkblist.c:5094
-msgid "/Tools"
-msgstr "/Ara�lar"
-
-#: src/gtkconn.c:190
-#, c-format
-msgid "%s disconnected"
-msgstr "%s ba�lant�y� kesti"
-
-#: src/gtkconn.c:191
-#, c-format
-msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and re-enable the account to connect."
-msgstr "%s bir hatadan dolay� koptu. %s hesab� kapat�ld�. Hatay� d�zeltin ve hesab� ba�lanmak i�in etkin hale getirin."
-
-#: src/gtkconv.c:325
-#, c-format
-msgid "me is using Gaim v%s."
-msgstr "Gaim v%s kullan�yorum."
-
-#: src/gtkconv.c:334
-msgid "Supported debug options are:  version"
-msgstr "Desteklenen hata ay�klama se�enekleri: versiyon"
-
-#: src/gtkconv.c:371
-msgid "No such command (in this context)."
-msgstr "Ge�ersiz komut."
-
-#: src/gtkconv.c:374
-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;komut&gt;\" yazarak belirtilen komutla ilgili yard�m alabilirsiniz.\n"
-"A�a��dakiler burada ge�erli olan komutlard�r:\n"
-
-#: src/gtkconv.c:446
-msgid "No such command."
-msgstr "Bilinmeyen komut."
-
-#: src/gtkconv.c:453
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Syntax Hatas�: Komut i�in yanl�� say�da parametre verdiniz."
-
-#: src/gtkconv.c:458
-msgid "Your command failed for an unknown reason."
-msgstr "Bilinmeyen bir sebepten komutunuz �al��mad�."
-
-#: src/gtkconv.c:465
-msgid "That command only works in chats, not IMs."
-msgstr "Bu komut sadece sohbetlerde ge�erlidir, anl�k iletilerde de�il."
-
-#: src/gtkconv.c:468
-msgid "That command only works in IMs, not chats."
-msgstr "Bu komut sadece anl�k iletilerde ge�erlidir, sohbette de�il."
-
-#: src/gtkconv.c:472
-msgid "That command doesn't work on this protocol."
-msgstr "Komut, bu protokol �zerinde �al��maz."
-
-#: src/gtkconv.c:699
-#: src/gtkconv.c:725
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "Ki�i bu sohbetle ayn� protokol �zerinde de�il."
-
-#: src/gtkconv.c:719
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "Bu ki�iyi davet etmek i�in hen�z ge�erli bir hesaptan oturum a�mad�n�z."
-
-#: src/gtkconv.c:772
-msgid "Invite Buddy Into Chat Room"
-msgstr "Ki�iyi Sohbet Odas�na Davet Et"
-
-#. Put our happy label in it.
-#: src/gtkconv.c:802
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr "�sterseniz bir davet mesaj�yla beraber davet etmek istedi�iniz ki�inin ismini girin."
-
-#: src/gtkconv.c:823
-msgid "_Buddy:"
-msgstr "_Ki�i:"
-
-#: src/gtkconv.c:843
-#: src/gtksavedstatuses.c:836
-msgid "_Message:"
-msgstr "_Mesaj:"
-
-#: src/gtkconv.c:900
-#: src/gtkconv.c:2228
-#: src/gtkdebug.c:217
-#: src/gtkft.c:470
-msgid "Unable to open file."
-msgstr "Dosya a��lam�yor."
-
-#: src/gtkconv.c:906
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>%s ile yaz��ma</h1>\n"
-
-#: src/gtkconv.c:930
-msgid "Save Conversation"
-msgstr "Yaz��may� Kaydet"
-
-#: src/gtkconv.c:1030
-#: src/gtkdebug.c:165
-#: src/gtkdebug.c:678
-msgid "Find"
-msgstr "Bul"
-
-#: src/gtkconv.c:1056
-#: src/gtkdebug.c:193
-msgid "_Search for:"
-msgstr "Aranan:"
-
-#: src/gtkconv.c:1227
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: src/gtkconv.c:1235
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: src/gtkconv.c:1489
-msgid "IM"
-msgstr "IM"
-
-#: src/gtkconv.c:1495
-#: src/protocols/oscar/oscar.c:628
-msgid "Send File"
-msgstr "Dosya G�nder"
-
-#: src/gtkconv.c:1502
-msgid "Un-Ignore"
-msgstr "Yoksayma"
-
-#: src/gtkconv.c:1505
-msgid "Ignore"
-msgstr "Yoksay"
-
-#: src/gtkconv.c:1511
-msgid "Info"
-msgstr "Bilgi"
-
-#: src/gtkconv.c:1517
-msgid "Get Away Message"
-msgstr "D��arda! Mesaj� al"
-
-#: src/gtkconv.c:1524
-#: src/gtkrequest.c:267
-msgid "Remove"
-msgstr "Kald�r"
-
-#: src/gtkconv.c:2236
-msgid "Unable to save icon file to disk."
-msgstr "�kon diske kaydedilemedi"
-
-#: src/gtkconv.c:2259
-msgid "Save Icon"
-msgstr "�konu Kaydet"
-
-#: src/gtkconv.c:2308
-msgid "Animate"
-msgstr "Oynat"
-
-#: src/gtkconv.c:2313
-msgid "Hide Icon"
-msgstr "�konu Gizle"
-
-#: src/gtkconv.c:2319
-msgid "Save Icon As..."
-msgstr "�konu Farkl� Kaydet..."
-
-#. Conversation menu
-#: src/gtkconv.c:2367
-msgid "/_Conversation"
-msgstr "/_Yaz��ma"
-
-#: src/gtkconv.c:2369
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Yaz��ma/Yeni _Mesaj..."
-
-#: src/gtkconv.c:2374
-msgid "/Conversation/_Find..."
-msgstr "/Yaz��ma/_Ara..."
-
-#: src/gtkconv.c:2376
-msgid "/Conversation/View _Log"
-msgstr "/Yaz��ma/_Kay�tlar� G�ster"
-
-#: src/gtkconv.c:2377
-msgid "/Conversation/_Save As..."
-msgstr "/Yaz��ma/Farkl� Kaydet..."
-
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
-msgstr "/Yaz��ma/Temizle"
-
-#: src/gtkconv.c:2383
-msgid "/Conversation/Se_nd File..."
-msgstr "/Yaz��ma/_Dosya G�nder..."
-
-#: src/gtkconv.c:2384
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Yaz��ma/_Uyar�c� Ekle..."
-
-#: src/gtkconv.c:2386
-msgid "/Conversation/_Get Info"
-msgstr "/Yaz��ma/_Bilgiyi Al"
-
-#: src/gtkconv.c:2388
-msgid "/Conversation/In_vite..."
-msgstr "/Yaz��ma/Davet Et..."
-
-#: src/gtkconv.c:2393
-msgid "/Conversation/Al_ias..."
-msgstr "/Yaz��ma/G�r�nen �s_im..."
-
-#: src/gtkconv.c:2395
-msgid "/Conversation/_Block..."
-msgstr "/Yaz��ma/Engelle..."
-
-#: src/gtkconv.c:2397
-msgid "/Conversation/_Add..."
-msgstr "/Yaz��ma/_Ekle..."
-
-#: src/gtkconv.c:2399
-msgid "/Conversation/_Remove..."
-msgstr "/Yaz��ma/_Kald�r..."
-
-#: src/gtkconv.c:2404
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Yaz��ma/K�sayol Ekle..."
-
-#: src/gtkconv.c:2406
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Yaz��ma/_Resim Ekle..."
-
-#: src/gtkconv.c:2411
-msgid "/Conversation/_Close"
-msgstr "/Yaz��ma/_Kapat"
-
-#. Options
-#: src/gtkconv.c:2415
-msgid "/_Options"
-msgstr "/_Se�enekler"
-
-#: src/gtkconv.c:2416
-msgid "/Options/Enable _Logging"
-msgstr "/_Se�enekler/_Kay�t Tut"
-
-#: src/gtkconv.c:2417
-msgid "/Options/Enable _Sounds"
-msgstr "/_Se�enekler/_Ses A��k"
-
-#: src/gtkconv.c:2418
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/_Se�enekler/Bi�imlendirme �ubuklar�n� G�s_ter"
-
-#: src/gtkconv.c:2419
-msgid "/Options/Show Ti_mestamps"
-msgstr "/_Se�enekler/Za_man� G�ster"
-
-#: src/gtkconv.c:2420
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Options/Show Buddy _Icon"
-
-#: src/gtkconv.c:2460
-msgid "/Conversation/View Log"
-msgstr "/Yaz��ma/Kay�tlar� G�ster"
-
-#: src/gtkconv.c:2466
-msgid "/Conversation/Send File..."
-msgstr "/Yaz��ma/Dosya G�nder..."
-
-#: src/gtkconv.c:2470
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Yaz��ma/Uyar�c� Ekle..."
-
-#: src/gtkconv.c:2476
-msgid "/Conversation/Get Info"
-msgstr "/Yaz��ma/Bilgiyi Al"
-
-#: src/gtkconv.c:2480
-msgid "/Conversation/Invite..."
-msgstr "/Yaz��ma/Davet Et..."
-
-#: src/gtkconv.c:2486
-msgid "/Conversation/Alias..."
-msgstr "/Yaz��ma/G�r�nen �sim..."
-
-#: src/gtkconv.c:2490
-msgid "/Conversation/Block..."
-msgstr "/Yaz��ma/Yoksay..."
-
-#: src/gtkconv.c:2494
-msgid "/Conversation/Add..."
-msgstr "/Yaz��ma/Ekle..."
-
-#: src/gtkconv.c:2498
-msgid "/Conversation/Remove..."
-msgstr "/Yaz��ma/Kald�r..."
-
-#: src/gtkconv.c:2504
-msgid "/Conversation/Insert Link..."
-msgstr "/Yaz��ma/K�sayol Ekle..."
-
-#: src/gtkconv.c:2508
-msgid "/Conversation/Insert Image..."
-msgstr "/Yaz��ma/Resim Ekle..."
-
-#: src/gtkconv.c:2514
-msgid "/Options/Enable Logging"
-msgstr "/_Se�enekler/Kay�t Tut"
-
-#: src/gtkconv.c:2517
-msgid "/Options/Enable Sounds"
-msgstr "/_Se�enekler/Ses A��k"
-
-#: src/gtkconv.c:2520
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/_Se�enekler/Bi�imlendirme �ubu�unu G�ster"
-
-#: src/gtkconv.c:2523
-msgid "/Options/Show Timestamps"
-msgstr "/_Se�enekler/Zaman� G�ster"
-
-#: src/gtkconv.c:2526
-msgid "/Options/Show Buddy Icon"
-msgstr "/_Se�enekler/Ki�i Resmini G�ster"
-
-#: src/gtkconv.c:2597
-msgid "User is typing..."
-msgstr "Kullan�c� yaz�yor..."
-
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
-msgstr "Kullan�c� bir �eyler yazd� ve durdu"
-
-#. Build the Send As menu
-#: src/gtkconv.c:2740
-msgid "_Send To"
-msgstr "_G�nder"
-
-#: src/gtkconv.c:3373
-msgid "Topic:"
-msgstr "Konu:"
-
-#. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
-msgid "0 people in room"
-msgstr "Odada kimse yok"
-
-#: src/gtkconv.c:3500
-msgid "IM the user"
-msgstr "Kullan�c�ya mesaj"
-
-#: src/gtkconv.c:3513
-msgid "Ignore the user"
-msgstr "Kullan�c�y� yoksay"
-
-#: src/gtkconv.c:3525
-msgid "Get the user's information"
-msgstr "Kullan�c�n�n bilgisini al"
-
-#: src/gtkconv.c:4360
-#: src/gtkconv.c:4462
-#: src/gtkconv.c:4517
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d ki�i odada"
-
-#: src/gtkconv.c:5582
-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
-msgstr "say &lt;mesaj&gt;:  Komut kullanm�yormu�unuz gibi mesaj g�ndermenizi sa�lar."
-
-#: src/gtkconv.c:5585
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-
-#: src/gtkconv.c:5588
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr "debug &lt;option&gt;:  Bu konu�maya de�i�ik debug bilgileri yolla."
-
-#: src/gtkconv.c:5591
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Konu�ma ekran�n� temizler"
-
-#: src/gtkconv.c:5594
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;komut&gt;:  Belirtilen komutla ilgili yard�m."
-
-#: src/gtkconv.c:5709
-msgid "Confirm close"
-msgstr "Kapatmay� onayla"
-
-#: src/gtkconv.c:5741
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Okunmam�� iletileriniz var. Pencereyi kapatmak istedi�inize emin misiniz?"
-
-#: src/gtkconv.c:6408
-msgid "Close conversation"
-msgstr "Yaz��may� kapat"
-
-#: src/gtkconv.c:6872
-msgid "Last created window"
-msgstr "Son a��lan pencere"
-
-#: src/gtkconv.c:6874
-msgid "Separate IM and Chat windows"
-msgstr "Mesaj ve sohbet pencerelerini ay�r"
-
-#: src/gtkconv.c:6876
-#: src/gtkprefs.c:1205
-msgid "New window"
-msgstr "Yeni pencere"
-
-#: src/gtkconv.c:6878
-msgid "By group"
-msgstr "Gruba g�re"
-
-#: src/gtkconv.c:6880
-msgid "By account"
-msgstr "Hesap t�r�ne g�re"
-
-#: src/gtkdebug.c:232
-msgid "Save Debug Log"
-msgstr "Hata Kayd�n� Sakla"
-
-#: src/gtkdebug.c:586
-msgid "Invert"
-msgstr "�evirmek"
-
-#: src/gtkdebug.c:589
-msgid "Highlight matches"
-msgstr "Bulunanlar� Vurgula"
-
-#: src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "Hata Ay�klama Penceresi"
-
-#: src/gtkdebug.c:689
-msgid "Clear"
-msgstr "Temizle"
-
-#: src/gtkdebug.c:698
-msgid "Pause"
-msgstr "Durakla"
-
-#: src/gtkdebug.c:705
-#: src/gtkdebug.c:706
-msgid "Timestamps"
-msgstr "Zaman"
-
-#: src/gtkdebug.c:724
-msgid "Filter"
-msgstr "S�zge�"
-
-#: src/gtkdebug.c:743
-msgid "Right click for more options."
-msgstr "Daha fazla se�enek i�in sa� t�klay�n"
-
-#: src/gtkdialogs.c:59
-#: src/gtkdialogs.c:90
-msgid "lead developer"
-msgstr "geli�tirici"
-
-#: src/gtkdialogs.c:60
-#: src/gtkdialogs.c:63
-#: src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65
-#: src/gtkdialogs.c:66
-#: src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69
-#: src/gtkdialogs.c:70
-#: src/gtkdialogs.c:71
-msgid "developer"
-msgstr "geli�tirici"
-
-#: src/gtkdialogs.c:61
-msgid "developer & webmaster"
-msgstr "geli�tirici & sitesahibi"
-
-#: src/gtkdialogs.c:62
-msgid "win32 port"
-msgstr "win32 portu"
-
-#: src/gtkdialogs.c:68
-msgid "support"
-msgstr "destek"
-
-#: src/gtkdialogs.c:88
-#: src/gtkdialogs.c:91
-msgid "maintainer"
-msgstr "ilgili"
-
-#: src/gtkdialogs.c:89
-msgid "libfaim maintainer"
-msgstr "libfaim bak�mc�s�"
-
-#: src/gtkdialogs.c:92
-msgid "Jabber developer"
-msgstr "Jabber geli�tiricisi"
-
-#: src/gtkdialogs.c:93
-msgid "original author"
-msgstr "�zg�n dizgi"
-
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker ve belirtilmi� s�r�c� [lazy bum]"
-
-#: src/gtkdialogs.c:99
-#: src/gtkdialogs.c:100
-#: src/gtkdialogs.c:144
-msgid "Bulgarian"
-msgstr "Bulgarca"
-
-#: src/gtkdialogs.c:101
-msgid "Bosnian"
-msgstr "Bo�nak�a"
-
-#: src/gtkdialogs.c:102
-#: src/gtkdialogs.c:145
-#: src/gtkdialogs.c:146
-msgid "Catalan"
-msgstr "Katalan dili"
-
-#: src/gtkdialogs.c:103
-#: src/gtkdialogs.c:147
-msgid "Czech"
-msgstr "�ek�e"
-
-#: src/gtkdialogs.c:104
-msgid "Danish"
-msgstr "Danimarka dili"
-
-#: src/gtkdialogs.c:105
-#: src/gtkdialogs.c:148
-msgid "German"
-msgstr "Almanca"
-
-#: src/gtkdialogs.c:106
-msgid "Australian English"
-msgstr "Avusturalya �ngilizcesi"
-
-#: src/gtkdialogs.c:107
-msgid "British English"
-msgstr "�ngiliz �ngilizcesi"
-
-#: src/gtkdialogs.c:108
-msgid "Canadian English"
-msgstr "Kanada �ngilizcesi"
-
-#: src/gtkdialogs.c:109
-#: src/gtkdialogs.c:149
-msgid "Spanish"
-msgstr "�spanyolca"
-
-#: src/gtkdialogs.c:110
-#: src/gtkdialogs.c:150
-msgid "Finnish"
-msgstr "Fince"
-
-#: src/gtkdialogs.c:111
-#: src/gtkdialogs.c:151
-msgid "French"
-msgstr "Frans�zca"
-
-#: src/gtkdialogs.c:112
-msgid "Hebrew"
-msgstr "�branice"
-
-#: src/gtkdialogs.c:113
-msgid "Hindi"
-msgstr "Hindu dili"
-
-#: src/gtkdialogs.c:114
-msgid "Hungarian"
-msgstr "Macarca"
-
-#: src/gtkdialogs.c:115
-#: src/gtkdialogs.c:152
-msgid "Italian"
-msgstr "�talyanca"
-
-#: src/gtkdialogs.c:116
-#: src/gtkdialogs.c:153
-msgid "Japanese"
-msgstr "Japonca"
-
-#: src/gtkdialogs.c:117
-msgid "Lithuanian"
-msgstr "Litvanca"
-
-#: src/gtkdialogs.c:118
-msgid "Georgian"
-msgstr "G�rc� Dili"
-
-#: src/gtkdialogs.c:119
-#: src/gtkdialogs.c:154
-msgid "Korean"
-msgstr "Korece"
-
-#: src/gtkdialogs.c:120
-msgid "Dutch, Flemish"
-msgstr "Hollandaca, Flamanca"
-
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr "Makedonca"
-
-#: src/gtkdialogs.c:122
-msgid "Norwegian"
-msgstr "Norve� dili"
-
-#: src/gtkdialogs.c:123
-#: src/gtkdialogs.c:124
-#: src/gtkdialogs.c:155
-msgid "Polish"
-msgstr "Polonyaca"
-
-#: src/gtkdialogs.c:125
-msgid "Portuguese"
-msgstr "Portekizce"
-
-#: src/gtkdialogs.c:126
-msgid "Portuguese-Brazil"
-msgstr "Portekizce-Brezilyaca"
-
-#: src/gtkdialogs.c:127
-msgid "Romanian"
-msgstr "Romence"
-
-#: src/gtkdialogs.c:128
-#: src/gtkdialogs.c:156
-#: src/gtkdialogs.c:157
-msgid "Russian"
-msgstr "Rus�a"
-
-#: src/gtkdialogs.c:129
-#: src/gtkdialogs.c:130
-msgid "Serbian"
-msgstr "S�rp�a"
-
-#: src/gtkdialogs.c:131
-msgid "Slovenian"
-msgstr "Sloven dili"
-
-#: src/gtkdialogs.c:132
-#: src/gtkdialogs.c:159
-msgid "Swedish"
-msgstr "�sve��e"
-
-#: src/gtkdialogs.c:133
-msgid "Telugu"
-msgstr "Telugu"
-
-#: src/gtkdialogs.c:134
-msgid "Vietnamese"
-msgstr "Vietnamese (VIQR)"
-
-#: src/gtkdialogs.c:134
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh ve Gnome-Vi Tak�m�"
-
-#: src/gtkdialogs.c:135
-#: src/gtkdialogs.c:160
-msgid "Simplified Chinese"
-msgstr "�ince (Basit)"
-
-#: src/gtkdialogs.c:136
-#: src/gtkdialogs.c:137
-#: src/gtkdialogs.c:161
-msgid "Traditional Chinese"
-msgstr "�ince (Geleneksel)"
-
-#: src/gtkdialogs.c:143
-msgid "Amharic"
-msgstr "Habe��e (EZ+)"
-
-#: src/gtkdialogs.c:158
-msgid "Slovak"
-msgstr "Slovak dili"
-
-#: src/gtkdialogs.c:202
-msgid "About Gaim"
-msgstr "Gaim Hakk�nda"
-
-#: src/gtkdialogs.c:226
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr "Gaim; AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu hesaplar�n�za ayn� anda ba�lanman�z� sa�layan mod�ler bir mesaj program�d�r. GTK+ kullan�larak yaz�lm�� olup GNU GPL lisans� alt�ndad�r.<BR><BR>"
-
-#: src/gtkdialogs.c:235
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-
-#: src/gtkdialogs.c:238
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
-msgstr "Aktif Geli�tiriciler"
-
-#: src/gtkdialogs.c:259
-msgid "Crazy Patch Writers"
-msgstr "��lg�n Yama Yazarlar�"
-
-#: src/gtkdialogs.c:274
-msgid "Retired Developers"
-msgstr "Emekli Yap�mc�lar"
-
-#: src/gtkdialogs.c:289
-msgid "Current Translators"
-msgstr "�u anki �evirmenler"
-
-#: src/gtkdialogs.c:309
-msgid "Past Translators"
-msgstr "Eski �evirmenler"
-
-#: src/gtkdialogs.c:327
-msgid "Debugging Information"
-msgstr "Ay�klama Bilgisi"
-
-#: src/gtkdialogs.c:489
-#: src/gtkdialogs.c:630
-#: src/gtkdialogs.c:685
-msgid "_Name"
-msgstr "_�sim"
-
-#: src/gtkdialogs.c:494
-#: src/gtkdialogs.c:635
-#: src/gtkdialogs.c:690
-msgid "_Account"
-msgstr "_Hesap"
-
-#: src/gtkdialogs.c:502
-msgid "New Instant Message"
-msgstr "Yeni Mesaj"
-
-#: src/gtkdialogs.c:504
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "L�tfen anl�k ileti g�ndermek istedi�iniz ki�inin g�r�nt� veya etiket ismini giriniz."
-
-#: src/gtkdialogs.c:643
-msgid "Get User Info"
-msgstr "Kullan�c� Bilgisini Al"
-
-#: src/gtkdialogs.c:645
-msgid "Please enter the screen name or alias of the person whose info you would like to view."
-msgstr "L�tfen bilgilerini g�rmek istedi�iniz ki�inin g�r�nt� veya etiket ismini giriniz."
-
-#: src/gtkdialogs.c:699
-msgid "View User Log"
-msgstr "Kullan�c� Kayd�n� Al"
-
-#: src/gtkdialogs.c:701
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
-msgstr "L�tfen kay�tlar�n� g�rmek istedi�iniz ki�inin g�r�nt� veya etiket ismini giriniz."
-
-#: src/gtkdialogs.c:720
-msgid "Alias Contact"
-msgstr "G�r�nen �sim"
-
-#: src/gtkdialogs.c:721
-msgid "Enter an alias for this contact."
-msgstr "Bu ki�i i�in g�r�nen ismi girin."
-
-#: src/gtkdialogs.c:723
-#: src/gtkdialogs.c:745
-#: src/gtkdialogs.c:765
-#: src/gtkrequest.c:269
-#: src/protocols/silc/chat.c:585
-msgid "Alias"
-msgstr "G�r�nen �sim"
-
-#: src/gtkdialogs.c:741
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "%s i�in g�r�nen ismi girin."
-
-#: src/gtkdialogs.c:743
-msgid "Alias Buddy"
-msgstr "G�r�nen �sim..."
-
-#: src/gtkdialogs.c:762
-msgid "Alias Chat"
-msgstr "G�r�nen Sohbet"
-
-#: src/gtkdialogs.c:763
-msgid "Enter an alias for this chat."
-msgstr "Bu sohbet i�in g�r�nen ismi girin."
-
-#: src/gtkdialogs.c:800
-#, 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 ve %d i�eren ki�iyi ki�i listenizden silmek �zeresiniz. Devam etmek istiyor musunuz?"
-
-#: src/gtkdialogs.c:867
-#, 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 grubu ve i�erdi�i �yeleri arkada� listenizden silmek �zeresiniz.  Devam etmek istiyor musunuz?"
-
-#: src/gtkdialogs.c:870
-#: src/gtkdialogs.c:871
-msgid "Remove Group"
-msgstr "_Grubu Sil"
-
-#: src/gtkdialogs.c:909
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "%s �gesini kullan�c� listenizden silmek �zeresiniz.  Devam etmek istiyor musunuz?"
-
-#: src/gtkdialogs.c:912
-#: src/gtkdialogs.c:913
-msgid "Remove Buddy"
-msgstr "Ki�iyi Sil"
-
-#: src/gtkdialogs.c:951
-#, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
-msgstr "%s ile olan sohbetinizi arkada� listenizden silmek �zeresiniz.  Devam etmek istiyor musunuz?"
-
-#: src/gtkdialogs.c:954
-#: src/gtkdialogs.c:955
-msgid "Remove Chat"
-msgstr "Sohbeti Sil"
-
-#: src/gtkft.c:138
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
-
-#: src/gtkft.c:159
-#: src/gtkft.c:1035
-msgid "Finished"
-msgstr "Bitti"
-
-#: src/gtkft.c:162
-#: src/gtkft.c:986
-msgid "Canceled"
-msgstr "Vazge�ildi"
-
-#: src/gtkft.c:165
-#: src/gtkft.c:905
-msgid "Waiting for transfer to begin"
-msgstr "Transferin ba�lamas� bekleniyor"
-
-#: src/gtkft.c:218
-msgid "<b>Receiving As:</b>"
-msgstr "<b>Al�nan:</b>"
-
-#: src/gtkft.c:220
-msgid "<b>Receiving From:</b>"
-msgstr "<b>G�nderen:</b>"
-
-#: src/gtkft.c:224
-msgid "<b>Sending To:</b>"
-msgstr "<b>Kime:</b>"
-
-#: src/gtkft.c:226
-msgid "<b>Sending As:</b>"
-msgstr "<b>G�nderilen:</b>"
-
-#: src/gtkft.c:442
-msgid "There is no application configured to open this type of file."
-msgstr "Bu dosyay� a�mak i�in uygulama belirtilmemi�."
-
-#: src/gtkft.c:447
-msgid "An error occurred while opening the file."
-msgstr "Dosyay� a�arken bir hata olu�tu."
-
-#: src/gtkft.c:467
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "%s �al��t�rma hatas�: %s"
-
-#: src/gtkft.c:476
-#, c-format
-msgid "Error running %s"
-msgstr "%s �al��t�rma hatas�"
-
-#: src/gtkft.c:477
-#, c-format
-msgid "Process returned error code %d"
-msgstr "��lemde hata olu�tu. Hata Kodu: %d"
-
-#: src/gtkft.c:572
-msgid "Progress"
-msgstr "�lerleme"
-
-#: src/gtkft.c:579
-msgid "Filename"
-msgstr "Dosya ad�"
-
-#: src/gtkft.c:586
-msgid "Size"
-msgstr "Boyut"
-
-#: src/gtkft.c:593
-msgid "Remaining"
-msgstr "Kalan"
-
-#: src/gtkft.c:624
-msgid "Filename:"
-msgstr "Dosya ad�:"
-
-#: src/gtkft.c:625
-msgid "Local File:"
-msgstr "Yerel Dosya:"
-
-#: src/gtkft.c:626
-msgid "Status:"
-msgstr "Durum:"
-
-#: src/gtkft.c:627
-msgid "Speed:"
-msgstr "H�z:"
-
-#: src/gtkft.c:628
-msgid "Time Elapsed:"
-msgstr "Ge�en S�re:"
-
-#: src/gtkft.c:629
-msgid "Time Remaining:"
-msgstr "Kalan S�re:"
-
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "Ba�lant�y� a��k tut"
-
-#: src/gtkft.c:725
-msgid "C_lear finished transfers"
-msgstr "Tamamlanan transferleri _temizle"
-
-#. "Download Details" arrow
-#: src/gtkft.c:734
-msgid "File transfer _details"
-msgstr "Dosya transfer _detaylar�"
-
-#. Pause button
-#: src/gtkft.c:764
-#: src/gtkstock.c:122
-msgid "_Pause"
-msgstr "_Duraksat"
-
-#. Resume button
-#: src/gtkft.c:774
-msgid "_Resume"
-msgstr "Devam _Et"
-
-#: src/gtkft.c:988
-msgid "Failed"
-msgstr "Ba�lant� Kurulam�yor"
-
-#: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
-msgstr "Metin olarak Yap��t�r"
-
-#: src/gtkimhtml.c:1313
-msgid "Hyperlink color"
-msgstr "Ba�lant� rengi"
-
-#: src/gtkimhtml.c:1314
-msgid "Color to draw hyperlinks."
-msgstr "Ba�lant�lar� renklendir."
-
-#: src/gtkimhtml.c:1317
-#, fuzzy
-msgid "Hyperlink prelight color"
-msgstr "Ba�lant� rengi"
-
-#: src/gtkimhtml.c:1318
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Ba�lant�lar� fare �zerine geldi�inde renklendir."
-
-#: src/gtkimhtml.c:1537
-msgid "_Copy E-Mail Address"
-msgstr "E-Posta Adresini _Kopyala"
-
-#: src/gtkimhtml.c:1549
-msgid "_Open Link in Browser"
-msgstr "Ba�lant�y� A�"
-
-#: src/gtkimhtml.c:1559
-msgid "_Copy Link Location"
-msgstr "Ba�lant�y� _Kopyala"
-
-#: src/gtkimhtml.c:3234
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>Tan�nmayan dosya t�r�.</span>\n"
-"\n"
-"PNG ye d�zenleniyor."
-
-#: src/gtkimhtml.c:3237
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Tan�nmayan dosya t�r�\n"
-"\n"
-"PNG varsay�lan yap�l�yor."
-
-#: src/gtkimhtml.c:3250
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Resmi kaydederken hata</span>\n"
-"\n"
-"%s"
-
-#: src/gtkimhtml.c:3253
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr "Resmi kaydederken hata: %s"
-
-#: src/gtkimhtml.c:3333
-#: src/gtkimhtml.c:3345
-msgid "Save Image"
-msgstr "Resmi Kaydet"
-
-#: src/gtkimhtml.c:3373
-msgid "_Save Image..."
-msgstr "Resmi _Kaydet..."
-
-#: src/gtkimhtmltoolbar.c:147
-msgid "Select Font"
-msgstr "Yaz�tipi Se�"
-
-#: src/gtkimhtmltoolbar.c:226
-msgid "Select Text Color"
-msgstr "Yaz� Rengini Se�"
-
-#: src/gtkimhtmltoolbar.c:305
-msgid "Select Background Color"
-msgstr "Arkaplan Rengini Se�"
-
-#: src/gtkimhtmltoolbar.c:394
-msgid "_URL"
-msgstr "_URL"
-
-#: src/gtkimhtmltoolbar.c:402
-msgid "_Description"
-msgstr "_A��klama"
-
-#: src/gtkimhtmltoolbar.c:405
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr "L�tfen eklemek istedi�iniz ba�lant�y� ve a��klamas�n� girin. A��klama zorunlu de�ildir."
-
-#: src/gtkimhtmltoolbar.c:409
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "L�tfen eklemek istedi�iniz ba�lant�y� girin."
-
-#: src/gtkimhtmltoolbar.c:414
-msgid "Insert Link"
-msgstr "Ba�lant� Ekle"
-
-#: src/gtkimhtmltoolbar.c:418
-msgid "_Insert"
-msgstr "_Ekle"
-
-#: src/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Resim kaydedilemedi: %s\n"
-
-#: src/gtkimhtmltoolbar.c:513
-#: src/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "Resim Ekle"
-
-#: src/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr "Bu tema g�leny�z i�ermiyor."
-
-#. show everything
-#: src/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "G�leny�z!"
-
-#: src/gtkimhtmltoolbar.c:916
-msgid "Bold"
-msgstr "Kal�n"
-
-#: src/gtkimhtmltoolbar.c:927
-msgid "Italic"
-msgstr "�talik"
-
-#: src/gtkimhtmltoolbar.c:938
-msgid "Underline"
-msgstr "Alt�izgili"
-
-#: src/gtkimhtmltoolbar.c:954
-msgid "Larger font size"
-msgstr "B�y�k yaz� boyutu"
-
-#: src/gtkimhtmltoolbar.c:966
-msgid "Smaller font size"
-msgstr "Ufak yaz� boyutu"
-
-#: src/gtkimhtmltoolbar.c:983
-msgid "Font Face"
-msgstr "Font"
-
-#: src/gtkimhtmltoolbar.c:995
-msgid "Foreground font color"
-msgstr "Yaz� rengi"
-
-#: src/gtkimhtmltoolbar.c:1007
-msgid "Background color"
-msgstr "Arkaplan rengi"
-
-#: src/gtkimhtmltoolbar.c:1023
-msgid "Clear formatting"
-msgstr "Bi�imlemeyi Temizle"
-
-#: src/gtkimhtmltoolbar.c:1038
-msgid "Insert link"
-msgstr "Ba�lant� Ekle"
-
-#: src/gtkimhtmltoolbar.c:1048
-msgid "Insert image"
-msgstr "Resim ekle"
-
-#: src/gtkimhtmltoolbar.c:1059
-msgid "Insert smiley"
-msgstr "G�leny�z ekle"
-
-#: src/gtklog.c:200
-#, c-format
-msgid "Conversation in %s on %s"
-msgstr "%s i�inde %s �zerinde konu�ma"
-
-#: src/gtklog.c:202
-#, c-format
-msgid "Conversation with %s on %s"
-msgstr "%s ile %s �zerindeki konu�ma"
-
-#: src/gtklog.c:309
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr "Sistem olaylar� sadece \"T�m durum de�i�ikliklerini sistem g�nl���ne kaydet\" se�ene�i aktifse kaydedilir."
-
-#: src/gtklog.c:313
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr "Anl�k iletiler sadece \"T�m anl�k iletileri kaydet\" se�ene�i aktifse kaydedilir."
-
-#: src/gtklog.c:316
-msgid "Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-
-#: src/gtklog.c:320
-msgid "No logs were found"
-msgstr "G�nl�k kayd� bulunamad�"
-
-#: src/gtklog.c:396
-msgid "Total log size:"
-msgstr "Toplam Kay�t b�y�kl���:"
-
-#: src/gtklog.c:472
-#, c-format
-msgid "Conversations in %s"
-msgstr "%s i�indeki Konu�malar"
-
-#: src/gtklog.c:480
-#: src/gtklog.c:531
-#, c-format
-msgid "Conversations with %s"
-msgstr "%s ile konu�ma"
-
-#: src/gtklog.c:556
-msgid "System Log"
-msgstr "Sistem Kay�tlar�"
-
-#: src/gtkmain.c:326
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Fazla bilgi i�in `%s -h' deneyin.\n"
-
-#: src/gtkmain.c:328
-#, 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 ""
-
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676
-#: src/gtkmain.c:678
-#: src/gtkmain.c:681
-#: src/gtkstatusbox.c:663
-#: src/gtkstatusbox.c:665
-#: src/gtkstatusbox.c:668
-#: src/status.c:1696
-msgid "Default"
-msgstr "Varsay�lan"
-
-#. Descriptive label
-#: src/gtknotify.c:275
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s, %d yeni mesaj."
-
-#: src/gtknotify.c:289
-#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr "<span weight=\"bold\">Kimden:</span> %s\n"
-
-#: src/gtknotify.c:298
-#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr "<span weight=\"bold\">Konu:</span> %s\n"
-
-#: src/gtknotify.c:303
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Mesaj�n�z Var!</span>\n"
-"\n"
-"%s%s%s%s"
-
-#: src/gtknotify.c:319
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Mesaj�n�z Var!</span>\n"
-"\n"
-"%s"
-
-#: src/gtknotify.c:504
-msgid "Search Results"
-msgstr "Arama sonu�lar�"
-
-#: src/gtknotify.c:643
-#: src/protocols/oscar/oscar.c:4858
-#, c-format
-msgid "Info for %s"
-msgstr "%s i�in Bilgi"
-
-#: src/gtknotify.c:644
-#: src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "Arkada� Bilgisi"
-
-#: src/gtknotify.c:687
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "Taray�c� komutu <b>%s</b> ge�ersiz."
-
-#: src/gtknotify.c:689
-#: src/gtknotify.c:701
-#: src/gtknotify.c:714
-#: src/gtknotify.c:838
-msgid "Unable to open URL"
-msgstr "Ba�lant� a��lam�yor"
-
-#: src/gtknotify.c:699
-#: src/gtknotify.c:712
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "�al��t�rma hatas� <b>%s</b>: %s"
-
-#: src/gtknotify.c:839
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "'El ile ayarla' taray�c� komutu se�ildi, ama hi�bir komut yaz�lmad�."
-
-#: src/gtkpounce.c:130
-msgid "Select a file"
-msgstr "Dosyay� se�in"
-
-#: src/gtkpounce.c:161
-msgid "Please enter a buddy to pounce."
-msgstr "Uyarmak istedi�iniz ki�iyi girin."
-
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391
-#: src/gtkpounce.c:898
-msgid "New Buddy Pounce"
-msgstr "Yeni Uyar�c�"
-
-#: src/gtkpounce.c:391
-msgid "Edit Buddy Pounce"
-msgstr "Uyar�c�y� D�zenle"
-
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
-msgid "Pounce Who"
-msgstr "Kimi Uyar"
-
-#: src/gtkpounce.c:435
-msgid "_Buddy name:"
-msgstr "_Ki�i:"
-
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "Ne zaman Uyar"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
-msgstr "Giri�te"
-
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "��k��ta"
-
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "Gidince"
-
-#: src/gtkpounce.c:473
-msgid "_Return from away"
-msgstr "D�n�nce"
-
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "Haz�r olunca"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr ""
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
-msgstr "Yazmaya ba�lay�nca"
-
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "Ki�i yazm�yor"
-
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
-msgid "Pounce Action"
-msgstr "Uyar� ��leri"
-
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
-msgstr "Mesaj penceresi a�"
-
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
-msgstr "_Popup bildirici"
-
-#: src/gtkpounce.c:522
-msgid "Send a _message"
-msgstr "Mesaj g�nder"
-
-#: src/gtkpounce.c:524
-msgid "E_xecute a command"
-msgstr "Komut �al��t�r"
-
-#: src/gtkpounce.c:526
-msgid "P_lay a sound"
-msgstr "Ses �al"
-
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
-msgstr "G�zat..."
-
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
-msgstr "G�zat..."
-
-#: src/gtkpounce.c:533
-msgid "Pre_view"
-msgstr "�nizleme"
-
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr ""
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "Uyar�c�y� Kald�r"
-
-#: src/gtkpounce.c:964
-#, c-format
-msgid "%s has started typing to you (%s)"
-msgstr "%s size yaz�yor (%s)"
-
-#: src/gtkpounce.c:966
-#, c-format
-msgid "%s has signed on (%s)"
-msgstr "%s ba�land� (%s)"
-
-#: src/gtkpounce.c:968
-#, c-format
-msgid "%s has returned from being idle (%s)"
-msgstr ""
-
-#: src/gtkpounce.c:970
-#, c-format
-msgid "%s has returned from being away (%s)"
-msgstr ""
-
-#: src/gtkpounce.c:972
-#, c-format
-msgid "%s has stopped typing to you (%s)"
-msgstr "%s size yazm�yor (%s)"
-
-#: src/gtkpounce.c:974
-#, c-format
-msgid "%s has signed off (%s)"
-msgstr "%s ��kt� (%s)"
-
-#: src/gtkpounce.c:976
-#, c-format
-msgid "%s has become idle (%s)"
-msgstr "%s ba�l� (%s)"
-
-#: src/gtkpounce.c:978
-#, c-format
-msgid "%s has gone away. (%s)"
-msgstr "%s d��ar�da! (%s)"
-
-#: src/gtkpounce.c:979
-msgid "Unknown pounce event. Please report this!"
-msgstr ""
-
-#: src/gtkprefs.c:623
-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 ""
-
-#: src/gtkprefs.c:658
-msgid "Icon"
-msgstr "�kon"
-
-#: src/gtkprefs.c:665
-#: src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811
-#: src/protocols/jabber/chat.c:769
-msgid "Description"
-msgstr "A��klama"
-
-#: src/gtkprefs.c:805
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr ""
-
-#: src/gtkprefs.c:807
-msgid "Show _formatting on incoming messages"
-msgstr "Gelen iletilerde _bi�imlendirmeyi g�ster"
-
-#: src/gtkprefs.c:809
-msgid "Show buddy _icons"
-msgstr "Resimleri g�ster"
-
-#: src/gtkprefs.c:811
-msgid "Enable buddy ic_on animation"
-msgstr ""
-
-#: src/gtkprefs.c:813
-msgid "_Notify buddies that you are typing to them"
-msgstr ""
-
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
-msgstr "Yanl�� yaz�lm�� s�zc�kleri vurgula"
-
-#: src/gtkprefs.c:834
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
-msgstr "Bu mesaj, bi�imlendirmeyi destekleyen protokollerde g�nderdi�iniz mesaj�n nas�l g�r�nece�ini g�sterir. :)"
-
-#. All the tab options!
-#: src/gtkprefs.c:856
-msgid "Tab Options"
-msgstr "Sekme Se�enekleri"
-
-#: src/gtkprefs.c:858
-msgid "Show IMs and chats in _tabbed windows"
-msgstr ""
-
-#: src/gtkprefs.c:872
-msgid "Show close b_utton on tabs"
-msgstr ""
-
-#: src/gtkprefs.c:878
-msgid "_Placement:"
-msgstr "_Yerle�tirme:"
-
-#: src/gtkprefs.c:880
-msgid "Top"
-msgstr "�st"
-
-#: src/gtkprefs.c:881
-msgid "Bottom"
-msgstr "Alt"
-
-#: src/gtkprefs.c:882
-msgid "Left"
-msgstr "Sol"
-
-#: src/gtkprefs.c:883
-msgid "Right"
-msgstr "Sa�"
-
-#: src/gtkprefs.c:885
-msgid "Left Vertical"
-msgstr "Sol Dikey"
-
-#: src/gtkprefs.c:886
-msgid "Right Vertical"
-msgstr "Sa� Dikey"
-
-#: src/gtkprefs.c:891
-msgid "N_ew conversations:"
-msgstr "Y_eni Konu�malar:"
-
-#: src/gtkprefs.c:942
-#: src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
-msgid "IP Address"
-msgstr "IP Adresi"
-
-#: src/gtkprefs.c:944
-msgid "STUN Server:"
-msgstr "STUN Sunucusu:"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
-msgstr "IP Adresini Otomatik Al"
-
-#: src/gtkprefs.c:955
-msgid "Public _IP:"
-msgstr "Yerel _IP:"
-
-#: src/gtkprefs.c:979
-msgid "Ports"
-msgstr "Portlar"
-
-#: src/gtkprefs.c:982
-msgid "_Manually specify range of ports to listen on"
-msgstr ""
-
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
-msgstr "Ba�lang�� Portu:"
-
-#: src/gtkprefs.c:992
-msgid "_End Port:"
-msgstr "Biti� Portu:"
-
-#: src/gtkprefs.c:999
-msgid "Proxy Server"
-msgstr "Proxy Sunucusu"
-
-#: src/gtkprefs.c:1003
-msgid "No proxy"
-msgstr "Proxy yok"
-
-#: src/gtkprefs.c:1059
-msgid "_User:"
-msgstr "_Kullan�c�"
-
-#: src/gtkprefs.c:1119
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/gtkprefs.c:1120
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/gtkprefs.c:1121
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/gtkprefs.c:1122
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1123
-msgid "GNOME Default"
-msgstr "Gnome Varsay�lan�"
-
-#: src/gtkprefs.c:1124
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1125
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/gtkprefs.c:1126
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1127
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1136
-msgid "Manual"
-msgstr "El ile ayarla"
-
-#: src/gtkprefs.c:1189
-msgid "Browser Selection"
-msgstr "Taray�c� Se�imi"
-
-#: src/gtkprefs.c:1193
-msgid "_Browser:"
-msgstr "_Taray�c�"
-
-#: src/gtkprefs.c:1201
-msgid "_Open link in:"
-msgstr "Ba�lant�y� a�:"
-
-#: src/gtkprefs.c:1203
-msgid "Browser default"
-msgstr "Varsay�lan Taray�c�"
-
-#: src/gtkprefs.c:1204
-msgid "Existing window"
-msgstr "Varolan pencere"
-
-#: src/gtkprefs.c:1206
-msgid "New tab"
-msgstr "Yeni sekme"
-
-#: src/gtkprefs.c:1220
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_El ile ayarla:\n"
-"(Ba�lant� i�in %s)"
-
-#: src/gtkprefs.c:1256
-#: src/gtkprefs.c:1738
-msgid "Logging"
-msgstr "Kay�t"
-
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
-msgstr "Kay�t Bi�imi"
-
-#: src/gtkprefs.c:1264
-msgid "Log all _instant messages"
-msgstr "T�m anl�k _mesajlar� kaydet"
-
-#: src/gtkprefs.c:1266
-msgid "Log all c_hats"
-msgstr "T�m sohbetleri tut"
-
-#: src/gtkprefs.c:1268
-msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
-msgid "Sound Selection"
-msgstr "Ses Se�imi"
-
-#: src/gtkprefs.c:1454
-msgid "Sound Method"
-msgstr "Ses Metodu"
-
-#: src/gtkprefs.c:1455
-msgid "_Method:"
-msgstr "_Metod:"
-
-#: src/gtkprefs.c:1457
-msgid "Console beep"
-msgstr "Konsol bip"
-
-#: src/gtkprefs.c:1459
-msgid "Automatic"
-msgstr "Otomatik"
-
-#: src/gtkprefs.c:1464
-msgid "Command"
-msgstr "Komut"
-
-#: src/gtkprefs.c:1465
-msgid "No sounds"
-msgstr "Ses Yok"
-
-#: src/gtkprefs.c:1473
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"Ses komutu:\n"
-"(dosya ismi i�in %s)"
-
-#: src/gtkprefs.c:1499
-msgid "Sound Options"
-msgstr "Ses Se�enekleri"
-
-#: src/gtkprefs.c:1500
-msgid "Sounds when conversation has _focus"
-msgstr "Tart��ma aktifken ses a��k"
-
-#: src/gtkprefs.c:1502
-msgid "_Sounds while away"
-msgstr "D��ar�da!yken ses a��k"
-
-#: src/gtkprefs.c:1512
-msgid "Sound Events"
-msgstr "Ses Olaylar�"
-
-#: src/gtkprefs.c:1563
-msgid "Play"
-msgstr "Oynat"
-
-#: src/gtkprefs.c:1570
-msgid "Event"
-msgstr "Olay"
-
-#: src/gtkprefs.c:1589
-msgid "Test"
-msgstr "Test Et"
-
-#: src/gtkprefs.c:1593
-msgid "Reset"
-msgstr "S�f�rla"
-
-#: src/gtkprefs.c:1597
-msgid "Choose..."
-msgstr "Se�..."
-
-#: src/gtkprefs.c:1651
-#: src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240
-#: src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221
-#: src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055
-#: src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825
-#: src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041
-#: src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516
-#: src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610
-#: src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764
-#: src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52
-#: src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259
-#: src/status.c:158
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Mozilla NSS üzerinden SSL desteği sağlar."
+
+#: ../libpurple/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s artık uzakta değil."
+
+#: ../libpurple/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s şimdi uzakta."
+
+#: ../libpurple/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s şimdi boşta."
+
+#: ../libpurple/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s artık boşta değil."
+
+#: ../libpurple/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s şimdi bağlı."
+
+#: ../libpurple/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "Uyarı Zamanı"
+
+#: ../libpurple/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "Kişi Uzakta _Durumuna Geçince"
+
+#: ../libpurple/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "Kişi bağlı olunca"
+
+#: ../libpurple/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "Kişi _Giriş/Çıkış Yaptı"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/statenotify.c:148
+msgid "Buddy State Notification"
+msgstr "Kişi Durum Uyarısı"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Kişinin durumundaki değişiklikleri (Dışarda!, burda, vs.) yazışma "
+"penceresinde belirtir."
+
+#: ../libpurple/plugins/tcl/tcl.c:421
+msgid "Tcl Plugin Loader"
+msgstr "Tcl Eklentisi Yükleyici"
+
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+msgid "Provides support for loading Tcl plugins"
+msgstr ""
+
+#: ../libpurple/plugins/tcl/tcl.c:495
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+
+#. Send a message about the connection error
+#: ../libpurple/protocols/bonjour/bonjour.c:113
+msgid "Unable to listen for incoming IM connections\n"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:148
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
-msgstr "D��ar�da!"
-
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr ""
-
-#: src/gtkprefs.c:1655
-msgid "_Auto-reply:"
-msgstr "_Otomatik-cevapla:"
-
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "D��ar�da!yken"
-
-#: src/gtkprefs.c:1659
-msgid "When both away and idle"
-msgstr "Ayn� anda me�gul ve bo� oldu�u zaman"
-
-#: src/gtkprefs.c:1662
-msgid "_Report idle time"
-msgstr "Bo�a ge�en s�reyi _raporla"
-
-#: src/gtkprefs.c:1665
-msgid "Auto-away"
-msgstr "Otomatik D��ar�da!"
-
-#: src/gtkprefs.c:1666
-msgid "Change status when _idle"
-msgstr "Bo�ken durumu de�_i�tir"
-
-#: src/gtkprefs.c:1670
-msgid "_Minutes before changing status:"
-msgstr "Durumunuzu de�i�tir_menizden ge�en dakika "
-
-#: src/gtkprefs.c:1678
-msgid "Change _status to:"
-msgstr "Durumu _de�i�tir:"
-
-#: src/gtkprefs.c:1728
-msgid "Smiley Themes"
-msgstr "G�leny�z Temalar�"
-
-#: src/gtkprefs.c:1729
-msgid "Sounds"
-msgstr "Sesler"
-
-#: src/gtkprefs.c:1730
-#: src/protocols/silc/silc.c:1589
-msgid "Network"
-msgstr "A�"
-
-#: src/gtkprefs.c:1735
-msgid "Browser"
-msgstr "Taray�c�"
-
-#: src/gtkprefs.c:1739
-msgid "Away / Idle"
-msgstr "D��ar�da / Burda"
-
-#: src/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr "Her kullan�c� bana ula�abilir"
-
-#: src/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
-msgstr "Sadece listemdekiler bana ula�abilir"
-
-#: src/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "Sadece a�a��daki kullan�c�lar bana ula�abilir"
-
-#: src/gtkprivacy.c:82
-msgid "Block all users"
-msgstr "T�m sohbetleri tut"
-
-#: src/gtkprivacy.c:83
-msgid "Block only the users below"
-msgstr "Sadece a�a��daki kullan�c�lar bana ula�abilir"
-
-#: src/gtkprivacy.c:398
-msgid "Privacy"
-msgstr "Gizlilik"
-
-#: src/gtkprivacy.c:411
-msgid "Changes to privacy settings take effect immediately."
-msgstr "Gizlilikteki de�i�iklikler an�nda aktif olur."
-
-#. "Set privacy for:" label
-#: src/gtkprivacy.c:423
-msgid "Set privacy for:"
-msgstr "Gizlilik ayarla: "
-
-#: src/gtkprivacy.c:589
-#: src/gtkprivacy.c:605
-msgid "Permit User"
-msgstr "Kullan�c�ya �zin Ver"
-
-#: src/gtkprivacy.c:590
-msgid "Type a user you permit to contact you."
-msgstr "Sizinle ileti�im kurulmas�na izin verece�iniz kullan�c�y� yaz�n"
-
-#: src/gtkprivacy.c:591
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-
-#: src/gtkprivacy.c:594
-#: src/gtkprivacy.c:607
-msgid "Permit"
-msgstr "�zin Ver"
-
-#: src/gtkprivacy.c:599
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "%s ile g�r��mek istiyor musunuz?"
-
-#: src/gtkprivacy.c:601
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr ""
-
-#: src/gtkprivacy.c:628
-#: src/gtkprivacy.c:641
-msgid "Block User"
-msgstr "Kullan�c�y� Engelle"
-
-#: src/gtkprivacy.c:629
-msgid "Type a user to block."
-msgstr "Engellenecek kullan�c�y� girin."
-
-#: src/gtkprivacy.c:630
-msgid "Please enter the name of the user you wish to block."
-msgstr ""
-
-#: src/gtkprivacy.c:632
-#: src/gtkprivacy.c:643
-#: src/protocols/gg/gg.c:1135
-msgid "Block"
-msgstr "Engelle"
-
-#: src/gtkprivacy.c:637
-#, c-format
-msgid "Block %s?"
-msgstr "Engelle %s?"
-
-#: src/gtkprivacy.c:639
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "%s engellemek istedi�inize emin misiniz?"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
-#.
-#: src/gtkrequest.c:259
-#: src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553
-#: src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902
-#: src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117
-#: src/request.h:1322
-msgid "Yes"
-msgstr "Evet"
-
-#: src/gtkrequest.c:260
-#: src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553
-#: src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903
-#: src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118
-#: src/request.h:1322
-msgid "No"
-msgstr "Hay�r"
-
-#: src/gtkrequest.c:263
-msgid "Apply"
-msgstr "Uygula"
-
-#: src/gtkrequest.c:264
-#: src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
-msgid "Close"
-msgstr "Kapat"
-
-#: src/gtkrequest.c:1796
-msgid "That file already exists"
-msgstr "Bu dosya zaten var"
-
-#: src/gtkrequest.c:1797
-msgid "Would you like to overwrite it?"
-msgstr "�zerine yazmak ister misiniz?"
-
-#: src/gtkrequest.c:1839
-#: src/gtkrequest.c:1880
-msgid "Save File..."
-msgstr "Farkl� Kaydet..."
-
-#: src/gtkrequest.c:1840
-#: src/gtkrequest.c:1881
-msgid "Open File..."
-msgstr "A�..."
-
-#: src/gtkroomlist.c:331
-msgid "Room List"
-msgstr "Oda Listesi"
-
-#. list button
-#: src/gtkroomlist.c:402
-msgid "_Get List"
-msgstr "_Listeyi Al"
-
-#: src/gtksavedstatuses.c:362
-#: src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805
-#: src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "Ba�l�k"
-
-#: src/gtksavedstatuses.c:377
-msgid "Type"
-msgstr "T�r"
-
-#: src/gtksavedstatuses.c:388
-#: src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241
-#: src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088
-#: src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107
-#: src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177
-#: src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040
-#: src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056
-#: src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072
-#: src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758
-#: src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771
-#: src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220
-#: src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
-msgid "Message"
-msgstr "Mesaj"
-
-#: src/gtksavedstatuses.c:451
-msgid "Saved Statuses"
-msgstr "Kaydedilmi� Durumlar"
-
-#. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-msgid "_Use"
-msgstr "_Kullan"
-
-#: src/gtksavedstatuses.c:584
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Ba�l�k zaten kullan�l�yor. Farkl� bir ba�l�k se�melisiniz."
-
-#: src/gtksavedstatuses.c:675
-msgid "Custom status"
-msgstr "�uanki durum"
-
-#: src/gtksavedstatuses.c:778
-#: src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069
-#: src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005
-#: src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844
-#: src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762
-#: src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769
-#: src/protocols/yahoo/yahoo.c:2787
-msgid "Status"
-msgstr "Durum"
-
-#: src/gtksavedstatuses.c:797
-msgid "_Title:"
-msgstr "Ba�_l�k"
-
-#: src/gtksavedstatuses.c:817
-msgid "_Status:"
-msgstr "D_urum:"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
-msgid "Use a _different status for some accounts"
-msgstr "Baz� hesaplar i�in _farkl� bir durum kullan."
-
-#: src/gtksound.c:61
-msgid "Buddy logs in"
-msgstr "Arkada��n�z giri� yapt�"
-
-#: src/gtksound.c:62
-msgid "Buddy logs out"
-msgstr "Arkada��n�z ��k�� yapt�"
-
-#: src/gtksound.c:63
-msgid "Message received"
-msgstr "Mesaj al�nd�"
-
-#: src/gtksound.c:64
-msgid "Message received begins conversation"
-msgstr "Al�nan mesaj yaz��may� ba�lat�r"
-
-#: src/gtksound.c:65
-msgid "Message sent"
-msgstr "Mesaj g�nderildi"
-
-#: src/gtksound.c:66
-msgid "Person enters chat"
-msgstr "Ki�i sohbete kat�ld�"
-
-#: src/gtksound.c:67
-msgid "Person leaves chat"
-msgstr "Ki�i sohbetten ayr�ld�"
-
-#: src/gtksound.c:68
-msgid "You talk in chat"
-msgstr "Sohbet ediyorsunuz"
-
-#: src/gtksound.c:69
-msgid "Others talk in chat"
-msgstr "Sohbet ediyorlar"
-
-#: src/gtksound.c:72
-msgid "Someone says your name in chat"
-msgstr "Biri sohbette ad�n�z� s�yledi"
-
-#: src/gtksound.c:414
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "(%s) dosyas�ndan ses okunamad�. Dosya yok."
-
-#: src/gtksound.c:430
-msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
-msgstr "Ses �al�namad� ��nk� 'Komut' ses y�ntemi se�ilmi� ama hi�bir ses ayarlanmam��."
-
-#: src/gtksound.c:442
-#, c-format
-msgid "Unable to play sound because the configured sound command could not be launched: %s"
-msgstr "Ses �al�namad� ��nk� yap�land�r�lan ses komutu �al��t�r�lamad�: %s"
-
-#: src/gtkstatusbox.c:197
-msgid "Typing"
-msgstr "Yazma"
-
-#. connect to the server
-#: src/gtkstatusbox.c:200
-#: src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838
-#: src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525
-#: src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816
-#: src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455
-#: src/protocols/zephyr/zephyr.c:1546
-msgid "Connecting"
-msgstr "Ba�lan�l�yor"
-
-#. hacks
-#: src/gtkstatusbox.c:294
-#: src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172
-#: src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573
-#: src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30
-#: src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38
-#: src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2956
-#: src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808
-#: src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253
-#: src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214
-#: src/status.c:155
-msgid "Available"
-msgstr "Mevcut"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296
-#: src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711
-#: src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633
-#: src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "G�r�nmez"
-
-#: src/gtkstatusbox.c:297
-#: src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082
-#: src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087
-#: src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569
-#: src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834
-#: src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769
-#: src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752
-#: src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249
-#: src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637
-#: src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "�evrimd���"
-
-#: src/gtkstatusbox.c:299
-msgid "Custom..."
-msgstr "De�i�tir..."
-
-#: src/gtkstatusbox.c:300
-msgid "Saved..."
-msgstr "Kaydedilmi�..."
-
-#: src/gtkstock.c:117
-msgid "_Alias"
-msgstr "_G�r�nen �sim"
-
-#: src/gtkstock.c:119
-msgid "_Invite"
-msgstr "_Davet Et"
-
-#: src/gtkstock.c:120
-msgid "_Modify"
-msgstr "_D�zenle"
-
-#: src/gtkstock.c:121
-msgid "_Open Mail"
-msgstr "_Mesaj A�"
-
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "_Uyar�"
-
-#: src/gtkutils.c:1393
-#: src/gtkutils.c:1418
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "%s y�klenirken �u hata olu�tu: %s"
-
-#: src/gtkutils.c:1395
-#: src/gtkutils.c:1420
-msgid "Failed to load image"
-msgstr "Resim kaydetmede hata"
-
-#: src/gtkutils.c:1495
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "%s klas�r� yollanamad�."
-
-#: src/gtkutils.c:1497
-msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
-msgstr "Gaim bir klas�r� transfer edemez. Dosyalar� tek ba��na g�ndermek zorundas�n�z"
-
-#: src/gtkutils.c:1525
-#: src/gtkutils.c:1534
-#: src/gtkutils.c:1539
-msgid "You have dragged an image"
-msgstr "Bir resim s�r�klediniz."
-
-#: src/gtkutils.c:1526
-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 "Bu resmi dosya transferi, bir mesaj i�inde g�nderebilir veya arkada��n�nz�n g�r�nt� resmi olarak kullanabilirsiniz."
-
-#: src/gtkutils.c:1530
-#: src/gtkutils.c:1545
-msgid "Set as buddy icon"
-msgstr "Ki�i g�r�nt�s� olarak ata"
-
-#: src/gtkutils.c:1531
-#: src/gtkutils.c:1546
-msgid "Send image file"
-msgstr "Resim dosyas� g�nder"
-
-#: src/gtkutils.c:1532
-#: src/gtkutils.c:1546
-msgid "Insert in message"
-msgstr "�leti i�ine ekle"
-
-#: src/gtkutils.c:1535
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Bunu ki�i ikonu olarak ayarlamak istiyor musunuz?"
-
-#: src/gtkutils.c:1540
-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 "Bu resmi dosya transferi, bir mesaj i�inde g�nderebilir veya arkada��n�nz�n g�r�nt� resmi olarak kullanabilirsiniz."
-
-#: src/gtkutils.c:1542
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "Bu mesaja resim ekleyebilir veya arkada��n�z�n simgesi olarak kullanabilirsiniz."
-
-#. 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
-#: src/gtkutils.c:1596
-msgid "Cannot send launcher"
-msgstr "�al��t�r�c� g�nderilemiyor"
-
-#: src/gtkutils.c:1596
-msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
-msgstr "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
-
-#: src/log.c:129
-msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">Kaydedicinin okuma fonksiyonu yok</font></b>"
-
-#: src/log.c:577
-msgid "Logging of this conversation failed."
-msgstr "Konu�man�n kayd� yap�lamad�."
-
-#: src/log.c:839
-msgid "XML"
-msgstr "XML"
-
-#: src/log.c:904
-#, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;OTOMATIK-CEVAPLA&gt;:</b></font> %s<br/>\n"
-
-#: src/log.c:906
-#, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;OTOMATIK-CEVAPLA&gt;:</b></font> %s<br/>\n"
-
-#: src/log.c:957
-#: src/log.c:1074
-msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Kay�t dosyas� yolu bulunamad�!</b></font>"
-
-#: src/log.c:967
-#: src/log.c:1086
-#, c-format
-msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>Dosya okunam�yor: %s</b></font>"
-
-#: src/log.c:1019
-#, c-format
-msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr "(%s) %s <Otomatik-cevap>: %s\n"
-
-#: src/plugin.c:331
-#, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
-msgstr "Gerekli eklenti %s bulunamad�. L�tfen eklentiyi kurun ve tekrar deneyin."
-
-#: src/plugin.c:336
-#: src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim eklentinizi y�kleyemedi."
-
-#: src/plugin.c:360
-#, c-format
-msgid "The required plugin %s was unable to load."
-msgstr "Gerekli %s eklentisi y�klenemedi."
-
-#: src/protocols/bonjour/bonjour.c:298
-#: src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064
-#: src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "Haz�r olunca"
-
-#: src/protocols/bonjour/bonjour.c:303
-#, c-format
-msgid ""
-"\n"
-"<b>Status:</b> %s"
-msgstr ""
-"\n"
-"<b>Durum:</b> %s"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, c-format
-msgid ""
-"\n"
-"<b>Message:</b> %s"
-msgstr ""
-"\n"
-"<b>Mesaj:</b> %s"
+msgstr "Uzakta"
 
 #. *< type
 #. *< ui_requirement
@@ -4720,346 +2917,418 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388
-#: src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
-msgstr "Yahoo Protokol Eklentisi"
+msgstr "Bonjour Protokolü Eklentisi"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
+msgid "Purple Person"
+msgstr "Mor Kişi"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-msgid "Host name"
-msgstr "Bar�nd�r�c� Ad�"
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
+msgid "Hostname"
+msgstr "Barındırıcı adı"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421
-#: src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968
-#: src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
-msgid "Port"
-msgstr "Port"
-
-#: src/protocols/bonjour/bonjour.c:424
-#: src/protocols/gg/gg.c:405
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
-msgstr "Ad:"
-
-#: src/protocols/bonjour/bonjour.c:427
-#: src/protocols/gg/gg.c:401
+msgstr "Ad"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
-msgstr "Soyad:"
-
-#: src/protocols/bonjour/bonjour.c:430
-#: src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772
-#: src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661
-#: src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
-msgid "Email"
-msgstr "E-Posta"
-
-#: src/protocols/bonjour/bonjour.h:35
+msgstr "Soyad"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:814
+#: ../libpurple/protocols/silc/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:930
+msgid "E-mail"
+msgstr "E-posta"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:602
+msgid "AIM Account"
+msgstr "AIM Hesabı"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP Hesabı"
+
+#: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr "G�nayd�n"
-
-#: src/protocols/gg/gg.c:136
-#: src/protocols/gg/gg.c:155
+msgstr "Bonjour"
+
+#: ../libpurple/protocols/bonjour/jabber.c:374
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s yazışmayı kapattı."
+
+#: ../libpurple/protocols/bonjour/jabber.c:461
+msgid "Cannot open socket"
+msgstr "Soket açılamıyor"
+
+#: ../libpurple/protocols/bonjour/jabber.c:469
+msgid "Error setting socket options"
+msgstr "Soket seçenekleri ayarlanırken hata"
+
+#: ../libpurple/protocols/bonjour/jabber.c:493
+msgid "Could not bind socket to port"
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/jabber.c:501
+msgid "Could not listen on socket"
+msgstr "Soketten okunamıyor"
+
+#: ../libpurple/protocols/bonjour/jabber.c:599
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "İletiniz gönderilemedi, yazışma başlatılamadı."
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+msgid "Invalid proxy settings"
+msgstr "Geçersiz proxy ayarları"
+
+#: ../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 ""
+"Proxy ayarlarınız için girdiğiniz host adresi ya da port numarası geçerli "
+"değil."
+
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
+msgid "Token Error"
+msgstr "Belirti Hatası"
+
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:181
+msgid "Unable to fetch the token.\n"
+msgstr "İfade eşlenemedi.\n"
+
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
-msgstr "Liste Kaydet"
-
-#: src/protocols/gg/gg.c:137
+msgstr "Kişi Listesini Kaydet..."
+
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "Arkada� listenzi bo�, dosyaya hi�bir �ey yaz�lmad�."
-
-#: src/protocols/gg/gg.c:143
-#: src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
+msgstr "Kişi listeniz boş, dosyaya hiçbir şey yazılmadı."
+
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
-msgstr "Dosya a��lam�yor"
-
-#: src/protocols/gg/gg.c:156
+msgstr "Dosya açılamadı"
+
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
-msgstr "Ki�i Listesi ba�ar�yla kaydedildi!"
-
-#: src/protocols/gg/gg.c:178
-msgid "Could't open file"
-msgstr "Dosya a��lam�yor!"
-
-#: src/protocols/gg/gg.c:199
+msgstr "Kişi listesi başarıyla kaydedildi!"
+
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+msgid "Couldn't load buddylist"
+msgstr "Kişi listesi yüklenemedi"
+
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
-msgstr "Ki�i Listesi Y�kle!"
-
-#: src/protocols/gg/gg.c:200
+msgstr "Kişi Listesi Yükle..."
+
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
-msgstr "Ki�i Listesi Ba�ar�yla Y�klendi!"
-
-#: src/protocols/gg/gg.c:211
+msgstr "Kişi listesi başarıyla yüklendi!"
+
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
-msgstr "Ki�i Listesi Kaydet..."
-
-#: src/protocols/gg/gg.c:254
+msgstr "Kişi listesi Kaydet..."
+
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
-msgstr "Kay�t alanlar�n� doldurun."
-
-#: src/protocols/gg/gg.c:259
+msgstr "Kayıt alanlarını doldurun."
+
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
-msgstr "Parolalar �eli�iyor."
-
-#: src/protocols/gg/gg.c:266
+msgstr "Parolalar çelişiyor."
+
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "Yeni bir hesap kaydedilemedi. Hata olu�tu. \n"
-
-#: src/protocols/gg/gg.c:279
+msgstr "Yeni hesap kaydedilemedi. Bir hata oluştu.\n"
+
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
-msgstr "Yeni Gadu-Gadu Hesab� Kaydedildi"
-
-#: src/protocols/gg/gg.c:280
+msgstr "Yeni Gadu-Gadu Hesabı Kaydedildi"
+
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
-msgstr "Kay�t ba�ar�yla tamamland�."
-
-#: src/protocols/gg/gg.c:409
-#: src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252
-#: src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341
-#: src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394
-#: src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114
-#: src/protocols/yahoo/yahoo_profile.c:1000
-msgid "Nickname"
-msgstr "Takma Ad"
-
-#: src/protocols/gg/gg.c:413
-#: src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006
-#: src/protocols/oscar/oscar.c:6014
+msgstr "Kayıt başarıyla tamamlandı!"
+
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
+msgid "Password"
+msgstr "Parola"
+
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+msgid "Password (retype)"
+msgstr "Parola (tekrar)"
+
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+msgid "Enter current token"
+msgstr "Geçerli ifadeyi girin"
+
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+msgid "Current token"
+msgstr "Geçerli ifade"
+
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+msgid "Register New Gadu-Gadu Account"
+msgstr "Yeni Gadu-Gadu Hesabı Oluştur"
+
+#: ../libpurple/protocols/gg/gg.c:499
+msgid "Please, fill in the following fields"
+msgstr "Lütfen alanları doldurun"
+
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
-msgstr "�ehir"
-
-#: src/protocols/gg/gg.c:417
+msgstr "Şehir"
+
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
-msgstr "Do�um Y�l�"
-
-#: src/protocols/gg/gg.c:426
+msgstr "Doğum Yılı"
+
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../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 "Cinsiyet"
+
+#: ../libpurple/protocols/gg/gg.c:646
+msgid "Male or female"
+msgstr "Bay veya Bayan"
+
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:224
+msgid "Male"
+msgstr " Bay"
+
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
+msgid "Female"
+msgstr "Bayan"
+
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
-msgstr "Sadece �evrimi�ler"
-
-#: src/protocols/gg/gg.c:430
-#: src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
+msgstr "Sadece çevrimiçi"
+
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
-msgstr "Ki�i bul"
-
-#: src/protocols/gg/gg.c:432
+msgstr "Kişi bul"
+
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
-msgstr "Arama kriterinizi a�a��ya girin"
-
-#: src/protocols/gg/gg.c:465
+msgstr "Lütfen arama kriterinizi aşağıya girin"
+
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
-msgstr "Alanlar� doldurunuz."
-
-#: src/protocols/gg/gg.c:476
+msgstr "Alanları doldurun."
+
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
-msgstr "�uanki parolan�z �nceden belirledi�iniz paroladan farkl�."
-
-#: src/protocols/gg/gg.c:491
-msgid "Unable to change password. Error occured.\n"
-msgstr "Parola de�i�tirilemedi. Hata olu�tu. \n"
-
-#: src/protocols/gg/gg.c:500
+msgstr "Şimdiki parolanız önceden belirlediğiniz paroladan farklı."
+
+#: ../libpurple/protocols/gg/gg.c:722
+msgid "Unable to change password. Error occurred.\n"
+msgstr "Parola değiştirilemedi. Hata oluştu.\n"
+
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Gadu-Gudu hesab� i�in parola de�i�tir."
-
-#: src/protocols/gg/gg.c:501
+msgstr "Gadu-Gudu hesabı için parola değiştir"
+
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
-msgstr "Parola ba�ar�yla de�i�tirildi"
-
-#: src/protocols/gg/gg.c:535
-msgid "Token Error"
-msgstr "Belirti Hatas�"
-
-#: src/protocols/gg/gg.c:536
-#, fuzzy
-msgid "Unable to fetch the token.\n"
-msgstr "Liste al�nam�yor."
-
-#: src/protocols/gg/gg.c:551
+msgstr "Parola başarıyla değiştirildi!"
+
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
-msgstr "�uanki �ifre"
-
-#: src/protocols/gg/gg.c:555
-#: src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632
-#: src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "�ifre"
-
-#: src/protocols/gg/gg.c:559
-#: src/protocols/gg/gg.c:1480
-msgid "Password (retype)"
-msgstr "Parola (tekrarlay�n)"
-
-#: src/protocols/gg/gg.c:563
-#: src/protocols/gg/gg.c:1484
-#, fuzzy
-msgid "Enter current token"
-msgstr "Kullan�c� %s oturum a�mam��"
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568
-#: src/protocols/gg/gg.c:1489
-#, fuzzy
-msgid "Current token"
-msgstr "�u anda a��k"
-
-#: src/protocols/gg/gg.c:574
+msgstr "Şimdiki parola"
+
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "L�tfen UIN i�in �uanki parolan�z� ve yeni parolan�z� girin:"
-
-#: src/protocols/gg/gg.c:578
-#: src/protocols/gg/gg.c:579
+msgstr "Lütfen UIN için şimdiki parolanızı ve yeni parolanızı girin:"
+
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
-msgstr "Gadu-Gadu �ifreni De�i�tir"
-
-#: src/protocols/gg/gg.c:649
+msgstr "Gadu-Gadu Parolası Değiştir"
+
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Ki�i i�in bir sohbet se�in : %s"
-
-#: src/protocols/gg/gg.c:651
-#: src/protocols/gg/gg.c:652
+msgstr "Kişi için bir sohbet seçin : %s"
+
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
-msgstr "_Sohbet Ekle"
-
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "Ba�lant� a��lam�yor"
-
-#: src/protocols/gg/gg.c:959
+msgstr "Sohbete ekle..."
+
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+msgid "Offline"
+msgstr "Çevrimdışı"
+
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
+msgid "Available"
+msgstr "Çevrimiçi"
+
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
+msgid "UIN"
+msgstr "UIN"
+
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
+#: ../libpurple/protocols/silc/ops.c:1024
+msgid "First Name"
+msgstr "İsim"
+
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+msgid "Birth Year"
+msgstr "Doğum Yılı"
+
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
+msgid "Unable to display the search results."
+msgstr "Arama sonuçları gösterilemedi."
+
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
-msgstr "Gadu-Gadu Public Directory"
-
-#: src/protocols/gg/gg.c:960
+msgstr "Gadu-Gadu Açık Dizini"
+
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
-msgstr "Arama sonu�lar�"
-
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087
-#: src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578
-#: src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639
-#: src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "�evrimi�i"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106
-#: src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962
-#: src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421
-#: src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617
-#: src/protocols/yahoo/yahoo.c:3233
-msgid "Busy"
-msgstr "Me�gul"
-
-#: src/protocols/gg/gg.c:1111
-#: src/protocols/msn/msn.c:554
+msgstr "Arama sonuçları"
+
+#: ../libpurple/protocols/gg/gg.c:1212
+msgid "No matching users found"
+msgstr "Uygun kullanıcı bulunamadı"
+
+#: ../libpurple/protocols/gg/gg.c:1213
+msgid "There are no users matching your search criteria."
+msgstr "Arama kirterlerinize uyan bir kullanıcı bulunamadı."
+
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+msgid "Unable to read socket"
+msgstr "Soket okunamıyor"
+
+#: ../libpurple/protocols/gg/gg.c:1392
+msgid "Buddy list downloaded"
+msgstr "Kişi listesi indirildi"
+
+#: ../libpurple/protocols/gg/gg.c:1393
+msgid "Your buddy list was downloaded from the server."
+msgstr "Kiş listeniz sunucudan indirildi."
+
+#: ../libpurple/protocols/gg/gg.c:1400
+msgid "Buddy list uploaded"
+msgstr "Kişi listesi gönderildi"
+
+#: ../libpurple/protocols/gg/gg.c:1401
+msgid "Your buddy list was stored on the server."
+msgstr "Kişi listeniz sunucuya gönderildi."
+
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+msgid "Connection failed."
+msgstr "Bağlantı kurulamadı."
+
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
-msgstr "Engellenmi�"
-
-#: src/protocols/gg/gg.c:1129
+msgstr "Engellenmiş"
+
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
-msgstr "Sohbete Ekle"
-
-#: src/protocols/gg/gg.c:1133
+msgstr "Sohbete ekle"
+
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
-msgstr "Blo�u kald�r"
-
-#: src/protocols/gg/gg.c:1149
+msgstr "Engellemeyi Kaldır"
+
+#: ../libpurple/protocols/gg/gg.c:1654
+msgid "Block"
+msgstr "Engelle"
+
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
-msgstr "Sohbet _ad�"
-
-#: src/protocols/gg/gg.c:1183
-msgid "Connection failed."
-msgstr "Ba�lant� kurulamad�."
-
-#: src/protocols/gg/gg.c:1357
+msgstr "Sohbet _adı:"
+
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
-msgstr "Sohbet hatas�"
-
-#: src/protocols/gg/gg.c:1358
+msgstr "Sohbet hatası"
+
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
-msgstr "Bu dsohbet ad� zaten kullan�mda"
-
-#: src/protocols/gg/gg.c:1435
+msgstr "Bu sohbet adı zaten kullanımda"
+
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
-msgstr "Sunucuya ba�lan�lamad�"
-
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1472
-msgid "e-Mail"
-msgstr "E-Posta"
-
-#: src/protocols/gg/gg.c:1495
-#: src/protocols/gg/gg.c:1496
-msgid "Register New Gadu-Gadu Account"
-msgstr "Yeni Gadu-Gadu Hesab� Olu�tur"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr "L�tfen alanlar� doldurunuz"
-
-#: src/protocols/gg/gg.c:1515
-msgid "Change password"
-msgstr "Parola De�i�tir"
-
-#: src/protocols/gg/gg.c:1520
+msgstr "Sunucuya bağlı değilsiniz."
+
+#: ../libpurple/protocols/gg/gg.c:2018
+msgid "Find buddies..."
+msgstr "Kişi bul..."
+
+#: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "Parola değiştir..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
 msgid "Upload buddylist to Server"
-msgstr "Arkada� Listesini Sunucuya Ver"
-
-#: src/protocols/gg/gg.c:1523
+msgstr "Kişi Listesini Sunucuya Gönder"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
-msgstr "Arkada� Listesini Sunucudan �ndir"
-
-#: src/protocols/gg/gg.c:1526
+msgstr "Kişi Listesini Sunucudan İndir"
+
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
-msgstr "Arkada� Listesini Sunucudan Sil"
-
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr "Ki�i listesini dosyaya kaydet"
-
-#: src/protocols/gg/gg.c:1532
-msgid "Load buddylist from file"
-msgstr "Arkada� Listesini Dosyadan Al"
+msgstr "Kişi Listesini Sunucudan Sil"
+
+#: ../libpurple/protocols/gg/gg.c:2042
+msgid "Save buddylist to file..."
+msgstr "Kişi listesini dosyaya kaydet..."
+
+#: ../libpurple/protocols/gg/gg.c:2046
+msgid "Load buddylist from file..."
+msgstr "Kişi listesini dosyadan yükle..."
 
 #. magic
 #. major_version
@@ -5072,134 +3341,147 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu Protokol Eklentisi"
+msgstr "Gadu-Gadu Protokolü Eklentisi"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
-msgstr "Pop�ler IM'i cilala"
-
-#: src/protocols/gg/gg.c:1665
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu Kullan�c�s�"
-
-#: src/protocols/irc/cmds.c:43
-#: src/protocols/silc/silc.c:1313
+msgstr "Gadu-Gadu Kullanıcısı"
+
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Bilinmeyen komut: %s"
 
-#: src/protocols/irc/cmds.c:468
-#: src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
-msgstr "�u anki konu: %s"
-
-#: src/protocols/irc/cmds.c:472
-#: src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+msgstr "şimdiki konu: %s"
+
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
-msgstr "Hi�bir konu se�ilmedi"
-
-#: src/protocols/irc/dcc_send.c:272
-#: src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
+msgstr "Konu ayarlanmamış"
+
+#: ../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 "Dosya transferi Ba�ar�lamad�"
-
-#: src/protocols/irc/dcc_send.c:273
-msgid "Gaim could not open a listening port."
-msgstr "Gaim bir dinleme portu a�amad�"
-
-#: src/protocols/irc/irc.c:79
+msgstr "Dosya aktarımı başarısız oldu"
+
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
+msgid "Could not open a listening port."
+msgstr "Bir dinleme portu açılamadı."
+
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
-msgstr "MOTD g�r�nt�lenirken hata"
-
-#: src/protocols/irc/irc.c:79
+msgstr "MOTD görüntülenirken hata"
+
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
-msgstr "MOTD mevcut de�il"
-
-#: src/protocols/irc/irc.c:80
+msgstr "Kullanılabilir MOTD yok"
+
+#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
-msgstr "Ba�lant�yla temas halinde bir MOTD bulunmamaktad�r"
-
-#: src/protocols/irc/irc.c:83
+msgstr "Bu bağlantıyla ilgilişkilendirilmiş bir MOTD yok."
+
+#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
-msgstr "%s i�in MOTD"
-
-#: src/protocols/irc/irc.c:103
-#: src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+msgstr "%s için MOTD"
+
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
-msgstr "Sunucu ba�lant�s� kesildi"
-
-#: src/protocols/irc/irc.c:188
+msgstr "Sunucu bağlantısı kesildi"
+
+#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
-msgstr "MOTD'yi g�ster"
-
-#: src/protocols/irc/irc.c:200
-#: src/protocols/silc/chat.c:32
+msgstr "MOTD'yi göster"
+
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal"
 
-#: src/protocols/irc/irc.c:206
-#: src/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59
 msgid "_Password:"
-msgstr "�_ifre"
-
-#: src/protocols/irc/irc.c:238
+msgstr "Ş_ifre"
+
+#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
-msgstr "IRC isimler bo�luk karakteri i�eremez"
-
-#: src/protocols/irc/irc.c:266
-#: src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+msgstr "IRC isimler boşluk karakteri içeremez"
+
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+msgid "Connecting"
+msgstr "Bağlanılıyor"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
-msgstr "SSL deste�i mevcut de�il"
-
-#: src/protocols/irc/irc.c:277
-#: src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+msgstr "SSL desteği mevcut değil"
+
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
-msgstr "Soket yarat�lamad�"
-
-#: src/protocols/irc/irc.c:348
-#: src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744
-#: src/protocols/oscar/oscar.c:1812
+msgstr "Soket yaratılamadı"
+
+#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
-msgstr "Ana bilgisayara ba�lan�lamad�"
-
-#: src/protocols/irc/irc.c:373
-#: src/protocols/jabber/jabber.c:333
+msgstr "Ana bilgisayara bağlanılamadı"
+
+#: ../libpurple/protocols/irc/irc.c:438
+#: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
-msgstr "Ba�lant� Kurulam�yor"
-
-#: src/protocols/irc/irc.c:376
-#: src/protocols/jabber/jabber.c:336
+msgstr "Bağlantı Kurulamıyor"
+
+#: ../libpurple/protocols/irc/irc.c:441
+#: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
-msgstr "SSL Handshake Ba�ar�s�z"
-
-#: src/protocols/irc/irc.c:519
-#: src/protocols/irc/irc.c:541
+msgstr "SSL Handshake Başarısız"
+
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
-msgstr "Okuma hatas�"
-
-#: src/protocols/irc/irc.c:690
-#: src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+msgstr "Okuma hatası"
+
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
-msgstr "Kullan�c�lar"
-
-#: src/protocols/irc/irc.c:693
-#: src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166
-#: src/protocols/yahoo/yahoochat.c:1385
+msgstr "Kullanıcılar"
+
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
+#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Konu"
 
@@ -5211,1181 +3493,1383 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protokol Eklentisi"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr ""
-
-#: src/protocols/irc/irc.c:819
-#: src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708
-#: src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428
-#: src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+msgstr "Daha az Hatası Olan IRC Eklentisi"
+
+#. host to connect to
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Sunucu"
 
-#: src/protocols/irc/irc.c:825
+#. port to connect to
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2134
+#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/toc/toc.c:2331
+msgid "Port"
+msgstr "Port"
+
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "Kodlamalar"
 
-#: src/protocols/irc/irc.c:828
-#: src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628
-#: src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975
-#: src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124
-#: src/protocols/silc/ops.c:1126
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1191
+#: ../libpurple/protocols/silc/ops.c:1194
+#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
-msgstr "Kullan�c� Ad�"
-
-#: src/protocols/irc/irc.c:831
+msgstr "Kullanıcı Adı"
+
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
-msgstr "Ger�ek Ad"
+msgstr "Gerçek Ad"
 
 #.
-#. 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);
 #.
-#: src/protocols/irc/irc.c:839
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "SSL Kullan"
 
-#: src/protocols/irc/msgs.c:105
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
-msgstr "K�t� mod"
-
-#: src/protocols/irc/msgs.c:116
+msgstr "Kötü mod"
+
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
-msgstr "%s taraf�ndan yasakland�n�z."
-
-#: src/protocols/irc/msgs.c:117
+msgstr "%s tarafından yasaklandınız."
+
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
-msgstr "Yasakl�"
-
-#: src/protocols/irc/msgs.c:134
+msgstr "Yasaklı"
+
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "%s banlanam�yor: ban listesi dolu."
-
-#: src/protocols/irc/msgs.c:213
-#: src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
-#, c-format
-msgid "<b>%s:</b> %s"
-msgstr "<b>%s:</b> %s"
-
-#: src/protocols/irc/msgs.c:213
-#: src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
-msgid "Nick"
-msgstr "Takma isim"
-
-#: src/protocols/irc/msgs.c:216
+msgstr "%s banlanamıyor: ban listesi dolu."
+
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr "<i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
-msgstr "<i>(tan�mland�)</i>"
-
-#: src/protocols/irc/msgs.c:221
-#: src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228
-#: src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
-#: src/protocols/irc/msgs.c:228
-#: src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118
-#: src/protocols/yahoo/yahoo_profile.c:1005
-msgid "Realname"
-msgstr "Ger�ek Ad"
-
-#: src/protocols/irc/msgs.c:239
-#: src/protocols/silc/ops.c:1041
+msgstr "<i>(tanımlandı)</i>"
+
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
+#: ../libpurple/protocols/silc/ops.c:1414
+msgid "Nick"
+msgstr "Takma isim"
+
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
-msgstr "�u anda a��k"
-
-#: src/protocols/irc/msgs.c:244
-#, c-format
-msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>Haz�r:</b> %s<br>"
-
-#: src/protocols/irc/msgs.c:246
+msgstr "Şu anda açık"
+
+#: ../libpurple/protocols/irc/msgs.c:334
+msgid "Idle for"
+msgstr "Boşta süresi"
+
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
-msgstr "Ba�l� oldu�u s�re:"
-
-#: src/protocols/irc/msgs.c:249
-msgid "<br><b>Defining adjective:</b> Glorious<br>"
-msgstr "<br><b>Belirleyici s�fat:</b> M�kemmel<br>"
-
-#: src/protocols/irc/msgs.c:317
+msgstr "Bağlanma zamanı:"
+
+#: ../libpurple/protocols/irc/msgs.c:341
+msgid "<b>Defining adjective:</b>"
+msgstr "<br><b>Tanımlayıcı sıfat:</b>"
+
+#: ../libpurple/protocols/irc/msgs.c:341
+msgid "Glorious"
+msgstr "Harika"
+
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s konuyu de�i�tirdi: %s"
-
-#: src/protocols/irc/msgs.c:322
+msgstr "%s konuyu değiştirdi: %s"
+
+#: ../libpurple/protocols/irc/msgs.c:419
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s konuyu sildi."
+
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%s i�in konu: %s"
-
-#: src/protocols/irc/msgs.c:339
+msgstr "%s için konu: %s"
+
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
-msgstr "Bilinmeyen mesaj '%s'"
-
-#: src/protocols/irc/msgs.c:340
+msgstr "Bilinmeyen ileti '%s'"
+
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
-msgstr "Bilinmeyen mesaj"
-
-#: src/protocols/irc/msgs.c:340
-msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "Gaim'in g�nderdi�i mesaj IRC sunucusu taraf�ndan alg�lanamad�."
-
-#: src/protocols/irc/msgs.c:363
+msgstr "Bilinmeyen ileti"
+
+#: ../libpurple/protocols/irc/msgs.c:446
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC sunucusu algılayamadığı bir ileti aldı."
+
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
-msgstr "Ki�iler (%s): %s"
-
-#: src/protocols/irc/msgs.c:482
+msgstr "Kişiler %s: %s"
+
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
-msgstr "Zaman Yan�t�"
-
-#: src/protocols/irc/msgs.c:483
+msgstr "Zaman Yanıtı"
+
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
-msgstr "IRC Sunucusu'nun yerel zaman�:"
-
-#: src/protocols/irc/msgs.c:494
+msgstr "IRC Sunucusunun yerel saati:"
+
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
-msgstr "B�yle bir kanal yok"
+msgstr "Böyle bir kanal yok"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
-msgstr "b�yle bir kanal yok"
-
-#: src/protocols/irc/msgs.c:508
+msgstr "böyle bir kanal yok"
+
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
-msgstr "Kullan�c� oturum a�mam��"
-
-#: src/protocols/irc/msgs.c:513
+msgstr "Kullanıcı oturum açmamış"
+
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
-msgstr "B�yle bir ki�i veya kanal bulunamad�"
-
-#: src/protocols/irc/msgs.c:533
+msgstr "Böyle bir kişi veya kanal bulunamadı"
+
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
-msgstr "G�nderilemedi"
-
-#: src/protocols/irc/msgs.c:589
+msgstr "Gönderilemedi"
+
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "%s kat�l�m� davet gerektiriyor."
-
-#: src/protocols/irc/msgs.c:590
+msgstr "%s katılımı davet gerektiriyor."
+
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "Sadece davetliler"
 
-#: src/protocols/irc/msgs.c:692
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "%s taraf�ndan at�ld�n�z: (%s)"
-
-#: src/protocols/irc/msgs.c:697
+msgstr "%s tarafından atıldınız: (%s)"
+
+#. Remove user from channel
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "%s taraf�ndan at�ld�n�z (%s)"
-
-#: src/protocols/irc/msgs.c:721
+msgstr "%s tarafından atıldınız (%s)"
+
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "mod (%s %s) , %s taraf�ndan"
-
-#: src/protocols/irc/msgs.c:805
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "Se�ti�iniz hesap ad� sunucu taraf�ndan geri �evrildi. Muhtemelen ge�ersiz karakterler i�eriyor olabilir."
-
-#: src/protocols/irc/msgs.c:844
+msgstr "mod (%s %s) , %s tarafından"
+
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
+msgid "Invalid nickname"
+msgstr "Geçersiz takma ad"
+
+#: ../libpurple/protocols/irc/msgs.c:907
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Seçtiğiniz takma ad sunucu tarafından reddedildi.  Muhtemelen geçersiz "
+"karakterler içeriyor."
+
+#: ../libpurple/protocols/irc/msgs.c:912
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Seçtiğiniz hesap adı sunucu tarafından reddedildi.  Muhtemelen geçersiz "
+"karakterler içeriyor."
+
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
-msgstr "Kullan�c� ad� de�i�tirilemiyor"
-
-#: src/protocols/irc/msgs.c:844
+msgstr "Takma ad değiştirilemez"
+
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
-msgstr "Kullan�c� ad� de�i�tirilemiyor"
-
-#: src/protocols/irc/msgs.c:865
+msgstr "Takma ad değiştirilemedi"
+
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:907
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
-msgstr "Hata: sunucudan ge�ersiz cevap (PONG)"
-
-#: src/protocols/irc/msgs.c:909
+msgstr "Hata: sunucudan geçersiz yanıt (PONG)"
+
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "PING cevab� -- Gecikme: %lu saniye"
-
-#: src/protocols/irc/msgs.c:984
-#, c-format
-msgid "Cannot join %s:"
-msgstr "%s'e kat�l�nam�yor:"
-
-#: src/protocols/irc/msgs.c:985
-#: src/protocols/silc/ops.c:914
+msgstr "PING yanıtı -- Gecikme: %lu saniye"
+
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "%s kanalına katılamadınız: Kayıt olamız gerekli."
+
+#: ../libpurple/protocols/irc/msgs.c:1098
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
-msgstr "Kanal kat�l�nam�yor"
-
-#: src/protocols/irc/msgs.c:1019
+msgstr "Kanala girilemedi"
+
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Takma ad veya kanal ge�ici olarak hizmet d���d�r."
-
-#: src/protocols/irc/msgs.c:1031
+msgstr "Takma ad veya kanal geçici olarak hizmet dışı."
+
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
-msgstr "%s sert bir dayak att�."
-
-#: src/protocols/irc/parse.c:114
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;action to perform&gt;:  Bir faaliyet yap."
-
-#: src/protocols/irc/parse.c:115
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "D��ar�da! [mesaj]:  D��ar�da! mesaj�n�z� yaz�n, ya da D��arda! oldu�unuzda bo� mesaj kullan�n."
-
-#: src/protocols/irc/parse.c:116
-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
-msgstr "deop &lt;nick1&gt; [nick2] ...:  Bir kanal operat�r�nden durumunu almak i�in bir kanal operat�r� olmak zorundas�n�z."
-
-#: src/protocols/irc/parse.c:117
-msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
-msgstr ""
-
-#: src/protocols/irc/parse.c:118
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
-msgstr "invite &lt;nick&gt; [room]:  Birini se�ti�iniz veya bulundu�unuz kanala davet eder."
-
-#: src/protocols/irc/parse.c:119
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr ""
-
-#: src/protocols/irc/parse.c:120
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr ""
-
-#: src/protocols/irc/parse.c:121
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
-msgstr ""
-
-#: src/protocols/irc/parse.c:122
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
-msgstr "list:  A�daki sohbet odalar�n� listeler <i>Dikkat, baz� sunucular siz bunu yaparken sohbet a��yla ba�lant�n�z� kesebilirler.</i>"
-
-#: src/protocols/irc/parse.c:123
+msgstr "action &lt;action to perform&gt;:  Bir hareket yap."
+
+#: ../libpurple/protocols/irc/parse.c:123
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"Uzakta [ileti]:  Bir uzakta iletisi yazın, aksi durumda Uzakta olduğunuzda "
+"boş uzakta iletisi kullanılacak."
+
+#: ../libpurple/protocols/irc/parse.c:124
+msgid "chanserv: Send a command to chanserv"
+msgstr "chanserv: Chanserv'e bir komut gönderir"
+
+#: ../libpurple/protocols/irc/parse.c:125
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;takma ad1&gt; [takma ad2] ...:  Bir kanal operatöründen "
+"operatörlüğünü al. Bunu yapabilmek için kanal operatörü olmalısınız."
+
+#: ../libpurple/protocols/irc/parse.c:126
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:127
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;nick&gt; [room]:  Birini seçtiğiniz veya bulunduğunuz kanala "
+"davet eder."
+
+#: ../libpurple/protocols/irc/parse.c:128
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:129
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:130
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:131
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:  Ağdaki sohbet odalarını listeler <i>Dikkat, bazı sunucular siz bunu "
+"yaparken sohbet ağıyla bağlantınızı kesebilirler.</i>"
+
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;:  Bir eylem yap."
 
-#: src/protocols/irc/parse.c:124
-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;nick|channel&gt;:  Kanal veya kullan�c� modu ayarlama/belirsizle�tirme."
-
-#: src/protocols/irc/parse.c:125
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "msg &lt;nick&gt; &lt;message&gt;:  Bir ki�iye �zel mesaj yollar (kanala de�il)"
-
-#: src/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:133
+msgid "memoserv: Send a command to memoserv"
+msgstr "memoserv: Memoserv'e bir komut gönderir"
+
+#: ../libpurple/protocols/irc/parse.c:134
+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;nick|channel&gt;:  Kanal veya kullanıcı "
+"modu ayarlama/belirsizleştirme."
+
+#: ../libpurple/protocols/irc/parse.c:135
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;nick&gt; &lt;message&gt;:  Bir kişiye özel mesaj yollar (kanala "
+"değil)"
+
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [channel]: Kanaldaki kullan�c�lar� listeler"
-
-#: src/protocols/irc/parse.c:127
-#: src/protocols/jabber/jabber.c:1555
+msgstr "names [channel]: Kanaldaki kullanıcıları listeler"
+
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;new nickname&gt;:  Nick (takma ad�n�z�) de�i�tirir."
-
-#: src/protocols/irc/parse.c:128
-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
-msgstr "deop &lt;nick1&gt; [nick2] ...:  Bir kanal operat�r�nden durumunu almak i�in bir kanal operat�r� olmak zorundas�n�z."
-
-#: src/protocols/irc/parse.c:129
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "operwall &lt;message&gt;:  Ne oldu�unu bilmiyorsan�z muhtelemen kullanamazs�n�z :)"
-
-#: src/protocols/irc/parse.c:130
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [room] [message]:  Bulunulan veya belirtilen kanaldan e�er istenirse bir mesaj yaz�larak ayr�l�nabilir."
-
-#: src/protocols/irc/parse.c:131
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
-msgstr "ping [nick]:  Bir kullan�c�n�n ne kadar ping(lag)'a sahip oldu�unu sorar."
-
-#: src/protocols/irc/parse.c:132
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "query &lt;nick&gt; &lt;message&gt;:  Kullanc�ya �zel mesaj yollar (kanaldan ayr�)"
-
-#: src/protocols/irc/parse.c:133
+msgstr "nick &lt;new nickname&gt;:  Nick (takma adınızı) değiştirir."
+
+#: ../libpurple/protocols/irc/parse.c:138
+msgid "nickserv: Send a command to nickserv"
+msgstr "nickserv: Nickserv'e bir komut gönderir"
+
+#: ../libpurple/protocols/irc/parse.c:139
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"deop &lt;nick1&gt; [nick2] ...:  Bir kanal operatöründen durumunu almak için "
+"bir kanal operatörü olmak zorundasınız."
+
+#: ../libpurple/protocols/irc/parse.c:140
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;message&gt;:  Ne olduğunu bilmiyorsanız muhtelemen "
+"kullanamazsınız :)"
+
+#: ../libpurple/protocols/irc/parse.c:141
+msgid "operserv: Send a command to operserv"
+msgstr "opserv: Opserv'e bir komut gönderir"
+
+#: ../libpurple/protocols/irc/parse.c:142
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [room] [message]:  Bulunulan veya belirtilen kanaldan eğer istenirse "
+"bir mesaj yazılarak ayrılınabilir."
+
+#: ../libpurple/protocols/irc/parse.c:143
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr "ping [nick]:  Bir kullanıcının ne kadar ping(lag)'a sahip olduğunu sorar."
+
+#: ../libpurple/protocols/irc/parse.c:144
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;nick&gt; &lt;message&gt;:  Kullancıya özel mesaj yollar (kanaldan "
+"ayrı)"
+
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [mesaj]:  Mesaj b�rakarak sunucudan ayr�l"
-
-#: src/protocols/irc/parse.c:134
+msgstr "quit [mesaj]:  Mesaj bırakarak sunucudan ayrıl"
+
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Sunucuya i�lenmemi� bir komut yollar"
-
-#: src/protocols/irc/parse.c:135
-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
-msgstr "remove &lt;nick&gt; [message]:  Birini odadan uzakla�t�r�r. �sterseniz atma mesaj� da yazabilirsiniz. Bunu yapmak i�in kanal operat�r� olmal�s�n�z."
-
-#: src/protocols/irc/parse.c:136
+msgstr "quote [...]:  Sunucuya işlenmemiş bir komut yollar"
+
+#: ../libpurple/protocols/irc/parse.c:147
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;nick&gt; [message]:  Birini odadan uzaklaştırır. İsterseniz atma "
+"mesajı da yazabilirsiniz. Bunu yapmak için kanal operatörü olmalısınız."
+
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
-msgstr "time: IRC sunucusundaki yerelzaman� g�sterir."
-
-#: src/protocols/irc/parse.c:137
+msgstr "time: IRC sunucusundaki yerelzamanı gösterir."
+
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [&lt;yeni konu&gt;]:  Konuyu de�i�tir veya g�r�nt�le"
-
-#: src/protocols/irc/parse.c:138
+msgstr "topic [&lt;yeni konu&gt;]:  Konuyu değiştir veya görüntüle"
+
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Kullan�c� modunu ayarlar/belirsizle�tirir."
-
-#: src/protocols/irc/parse.c:139
-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
-msgstr "voice &lt;nick1&gt; [nick2] ...:  Bir kanal operat�r�nden durumunu almak i�in bir kanal operat�r� olmak zorundas�n�z."
-
-#: src/protocols/irc/parse.c:140
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "wallops &lt;message&gt;:   Ne oldu�unu bilmiyorsan�z muhtelemen kullanamazs�n�z :)"
-
-#: src/protocols/irc/parse.c:141
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Kullanıcı modunu ayarlar/belirsizleştirir."
+
+#: ../libpurple/protocols/irc/parse.c:151
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [takma ad]: Kullanıcıya bir CTCP VERSION isteği gönder"
+
+#: ../libpurple/protocols/irc/parse.c:152
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;nick1&gt; [nick2] ...:  Bir kanal operatöründen durumunu almak "
+"için bir kanal operatörü olmak zorundasınız."
+
+#: ../libpurple/protocols/irc/parse.c:153
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;message&gt;:   Ne olduğunu bilmiyorsanız muhtelemen "
+"kullanamazsınız :)"
+
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [server] &lt;nick&gt;:  nick takma adl� ki�i hakk�nda bilgi getirir."
-
-#: src/protocols/irc/parse.c:422
+msgstr "whois [server] &lt;nick&gt;:  nick takma adlı kişi hakkında bilgi getirir."
+
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+"whowas [server] &lt;nick&gt;:  Çıkış yapmış olan nick takma adlı kişi "
+"hakkında bilgi getirir."
+
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "%s cevab� s�resi: %lu saniye"
-
-#: src/protocols/irc/parse.c:423
+msgstr "%s yanıt süresi: %lu saniye"
+
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
-msgstr "CTCP PING cevab�"
-
-#: src/protocols/irc/parse.c:526
-#: src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653
-#: src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688
-#: src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+msgstr "CTCP PING yanıtı"
+
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../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 "Sunucu ba�lant�s� kesildi"
-
-#: src/protocols/jabber/auth.c:51
-msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
-msgstr "Sunucu oturum a�mak i�in TLS/SSL gerektiriyor. Hesap �zelliklerinden \"M�mk�nse TLS kullan\" se�ene�ini i�aretleyin."
-
-#: src/protocols/jabber/auth.c:53
+msgstr "Bağlantı kesildi."
+
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Bu sunucu ba�lanmak i�in TLS/SSL gerektirir. Hi� TLS/SSL deste�i bulunamad�."
-
-#: src/protocols/jabber/auth.c:114
+msgstr "Bu sunucu bağlanmak için TLS/SSL gerektirir. Hiç TLS/SSL desteği bulunamadı."
+
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:133
-#: src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375
-#: src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485
-#: src/protocols/jabber/jabber.c:110
+msgstr "Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik doğrulama istiyor"
+
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
+msgid "Plaintext Authentication"
+msgstr "Şifresiz Metin Yetkilendirmesi"
+
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "Sunucu bir kimlik doğrulama yöntemi kulanmıyor"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
-msgstr "Hata: sunucudan ge�ersiz cevap"
-
-#: src/protocols/jabber/auth.c:163
-#: src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244
-#: src/protocols/jabber/auth.c:245
-msgid "Plaintext Authentication"
-msgstr "�ifresiz Metin Yetkilendirmesi"
-
-#: src/protocols/jabber/auth.c:165
-#: src/protocols/jabber/auth.c:246
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:173
-#: src/protocols/jabber/auth.c:254
-msgid "Server does not use any supported authentication method"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:396
-#, fuzzy
+msgstr "Hata: sunucudan geçersiz cevap"
+
+#: ../libpurple/protocols/jabber/auth.c:572
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr "Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik doğrulama istiyor.  Buna izin vererek kimlik doğrulamaya devam etmek istiyor musunuz?"
+
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
-msgstr "Invalid challenge from server"
-
-#: src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+msgstr "Sunucudan geçersiz yanıt"
+
+#: ../libpurple/protocols/jabber/auth.c:823
+msgid "SASL error"
+msgstr "SASL hatası"
+
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
-msgstr "Ad"
-
-#: src/protocols/jabber/buddy.c:250
-#: src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+msgstr "Tam İsim"
+
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Soyad"
 
-#: src/protocols/jabber/buddy.c:251
-#: src/protocols/jabber/buddy.c:684
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
-msgstr "G�r�nen �sim"
-
-#: src/protocols/jabber/buddy.c:253
-#: src/protocols/jabber/jabber.c:688
+msgstr "Görünen İsim"
+
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254
-#: src/protocols/jabber/buddy.c:726
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "Cadde"
 
-#: src/protocols/jabber/buddy.c:255
-#: src/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "Adres (devam)"
 
-#: src/protocols/jabber/buddy.c:256
-#: src/protocols/jabber/buddy.c:730
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "Yer"
 
-#: src/protocols/jabber/buddy.c:257
-#: src/protocols/jabber/buddy.c:734
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
-msgstr "B�lge"
-
-#: src/protocols/jabber/buddy.c:258
-#: src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+msgstr "Bölge"
+
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "Posta Kodu"
 
-#: src/protocols/jabber/buddy.c:259
-#: src/protocols/jabber/buddy.c:743
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
-msgstr "�lke"
-
-#: src/protocols/jabber/buddy.c:260
-#: src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+msgstr "Ülke"
+
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:262
-#: src/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../libpurple/protocols/silc/ops.c:1075
+#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
+msgid "E-Mail"
+msgstr "E-Posta"
+
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
-msgstr "Organizasyon Ad�"
-
-#: src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:799
+msgstr "Organizasyon Adı"
+
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
-msgstr "Organizasyon �nitesi"
-
-#: src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:808
+msgstr "Organizasyon Ünitesi"
+
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "Rol"
 
-#: src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
-msgstr "Do�um G�n�"
-
-#: src/protocols/jabber/buddy.c:567
-#: src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "VCard Dosyas�n� D�zenle"
-
-#: src/protocols/jabber/buddy.c:569
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: src/protocols/jabber/buddy.c:642
-#: src/protocols/jabber/jabber.c:1711
+msgstr "Doğum Günü"
+
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkprefs.c:680
+msgid "Description"
+msgstr "Açıklama"
+
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
+msgid "Edit XMPP vCard"
+msgstr "XMPP VCard Dosyasını Düzenle"
+
+#: ../libpurple/protocols/jabber/buddy.c:580
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
+msgid "Client"
+msgstr "İstemci"
+
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
+msgid "Operating System"
+msgstr "İşletim Sistemi"
+
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr "Kaynak"
 
-#: src/protocols/jabber/buddy.c:688
-#: src/protocols/silc/ops.c:814
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Priority"
+msgstr "Öncelik"
+
+#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
-msgstr "G�bek Ad"
-
-#: src/protocols/jabber/buddy.c:706
-#: src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005
-#: src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+msgstr "İkinci İsim"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adres"
 
-#: src/protocols/jabber/buddy.c:718
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "Posta Kutusu"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
-msgstr "Foto�raf"
-
-#: src/protocols/jabber/buddy.c:832
+msgstr "Fotoğraf"
+
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "Amblem"
 
-#: src/protocols/jabber/buddy.c:1035
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "Gizleme"
 
-#: src/protocols/jabber/buddy.c:1038
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
-msgstr "Ge�ici Olarak Gizlen"
+msgstr "Geçici Olarak Gizlen"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
-msgstr "Mevcudiyet Bildirimini �ptal Et"
-
-#: src/protocols/jabber/buddy.c:1051
+msgstr "Sunucuda Bulunma Bildirimini İptal Et"
+
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
-msgstr "Yeniden �zin �ste"
+msgstr "Yeniden İzin İste"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
-msgstr "Aboneli�i Kes"
-
-#: src/protocols/jabber/buddy.c:1085
-#: src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688
-#: src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
-msgid "Error"
-msgstr "Hata"
-
-#: src/protocols/jabber/buddy.c:1091
-#: src/protocols/jabber/jabber.c:1047
+msgstr "Üyelikten Çık"
+
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
-msgstr "Konu�kan"
-
-#: src/protocols/jabber/buddy.c:1095
-#: src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+msgstr "Konuşkan"
+
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
-msgstr "Uzun S�re D��ar�da!"
-
-#: src/protocols/jabber/buddy.c:1097
-#: src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701
-#: src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+msgstr "Uzun Süreli Uzakta"
+
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
-msgstr "Rahats�z Etmeyin"
-
-#: src/protocols/jabber/buddy.c:1235
-msgid "The following are the results of your search"
-msgstr "Arama sonu�lar�n�z"
-
-#: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331
-#: src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962
-#: src/protocols/silc/ops.c:810
-msgid "First Name"
-msgstr "Ad"
-
-#: src/protocols/jabber/buddy.c:1336
-#: src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+msgstr "Rahatsız Etme"
+
+#: ../libpurple/protocols/jabber/buddy.c:1583
+msgid "JID"
+msgstr "JID"
+
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "Soyad"
 
-#: src/protocols/jabber/buddy.c:1346
+#: ../libpurple/protocols/jabber/buddy.c:1619
+msgid "The following are the results of your search"
+msgstr "Arama sonuçlarınız"
+
+#. current comment from Jabber User Directory users.jabber.org
+#: ../libpurple/protocols/jabber/buddy.c:1694
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1714
+msgid "Directory Query Failed"
+msgstr "Dizin Sorgusu Başarısız Oldu"
+
+#: ../libpurple/protocols/jabber/buddy.c:1715
+msgid "Could not query the directory server."
+msgstr "Dizin sunucu sorgulanamadı."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../libpurple/protocols/jabber/buddy.c:1749
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "Sunucu Bilgileri: %s"
+
+#: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "E-Posta Adresi"
 
-#: src/protocols/jabber/buddy.c:1355
-#: src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
-msgstr "Jabber kullan�c�lar� ara"
-
-#: src/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "Bir XMPP kullanıcısı ara"
+
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+msgid "Search"
+msgstr "Ara"
+
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
-msgstr "Ge�ersiz Klas�r"
-
-#: src/protocols/jabber/buddy.c:1387
+msgstr "Geçersiz Klasör"
+
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
-msgstr "Bir Kullan�c� Dizini Se�in"
-
-#: src/protocols/jabber/buddy.c:1388
+msgstr "Bir Kullanıcı Dizini Seçin"
+
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
-msgstr "Aramak i�in bir kullan�c� dizini se�in"
-
-#: src/protocols/jabber/buddy.c:1391
+msgstr "Aramak için bir kullanıcı dizini seçin"
+
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "Arama Dizini"
 
-#: src/protocols/jabber/chat.c:41
-#: src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:979
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Oda:"
 
-#: src/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "Sunucu:"
 
-#: src/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
-msgstr "_Ele Al:"
-
-#: src/protocols/jabber/chat.c:223
+msgstr ""
+
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s ge�erli bir oda ismi de�il"
-
-#: src/protocols/jabber/chat.c:224
+msgstr "%s geçerli bir oda ismi değil"
+
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
-msgstr "Ge�ersiz Oda �smi"
-
-#: src/protocols/jabber/chat.c:229
+msgstr "Geçersiz Oda İsmi"
+
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
-msgstr "%s ge�erli bir sunucu ismi de�il"
-
-#: src/protocols/jabber/chat.c:230
-#: src/protocols/jabber/chat.c:231
+msgstr "%s geçerli bir sunucu ismi değil"
+
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
-msgstr "Ge�ersiz Sunucu �smi"
-
-#: src/protocols/jabber/chat.c:235
+msgstr "Geçersiz Sunucu İsmi"
+
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s ge�erli bir oda i�levi de�il."
-
-#: src/protocols/jabber/chat.c:236
-#: src/protocols/jabber/chat.c:237
+msgstr "%s geçerli bir oda işlevi değil."
+
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
-msgstr "Ge�ersiz Oda ��levi"
-
-#: src/protocols/jabber/chat.c:395
+msgstr "Geçersiz Oda İşlevi"
+
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
-msgstr "D�zenleme hatas�"
-
-#: src/protocols/jabber/chat.c:404
-#: src/protocols/jabber/chat.c:549
+msgstr "Düzenleme hatası"
+
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
-msgstr "D�zenlenemiyor"
-
-#: src/protocols/jabber/chat.c:420
+msgstr "Düzenlenemiyor"
+
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
-msgstr "Oda D�zenleme Hatas�"
-
-#: src/protocols/jabber/chat.c:421
+msgstr "Oda Düzenleme Hatası"
+
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:471
-#: src/protocols/jabber/chat.c:540
+msgstr "Bu kanal yapılandırılabilir değil."
+
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
-msgstr "Kay�t hatas�"
-
-#: src/protocols/jabber/chat.c:628
+msgstr "Kayıt olma hatası"
+
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:678
-#: src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
-msgstr "Oda listesi al�n�rken hata"
-
-#: src/protocols/jabber/chat.c:737
+msgstr "Oda listesi alınırken hata"
+
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
-msgstr "Ge�ersiz Sunucu"
-
-#: src/protocols/jabber/chat.c:775
+msgstr "Geçersiz Sunucu"
+
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
-msgstr "Konferans Sunucusuna Gir"
-
-#: src/protocols/jabber/chat.c:776
+msgstr "Bir Konferans Sunucusuna Gir"
+
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:779
+msgstr "Sorgulamak için bir konferans sunucusu seçin"
+
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
-msgstr "Oda Ara"
-
-#: src/protocols/jabber/jabber.c:79
+msgstr "Oda Bul"
+
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
-msgstr "Sezon ba�latma hatas�"
-
-#: src/protocols/jabber/jabber.c:215
+msgstr "Oturum başlatma hatası"
+
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
-msgstr "Yazma hatas�"
-
-#: src/protocols/jabber/jabber.c:253
-#: src/protocols/jabber/jabber.c:273
+msgstr "Yazma hatası"
+
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
-msgstr "Okuma hatas�"
-
-#: src/protocols/jabber/jabber.c:359
-#: src/protocols/jabber/jabber.c:780
+msgstr "Okuma hatası"
+
+#: ../libpurple/protocols/jabber/jabber.c:519
 msgid "Unable to create socket"
-msgstr "Ba�lant� a��lam�yor"
-
-#: src/protocols/jabber/jabber.c:403
-#: src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "Ge�ersiz Jabber ID"
-
-#: src/protocols/jabber/jabber.c:473
+msgstr "Soket oluşturulamadı"
+
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "Geçersiz XMPP Kimliği"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Geçersiz XMPP Kimliği. Alan adı ayarlanmalı."
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "%s@%s kay�d� tamamland�"
-
-#: src/protocols/jabber/jabber.c:475
-#: src/protocols/jabber/jabber.c:476
+msgstr "%s@%s kaydı başarılı oldu"
+
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
-msgstr "Kay�t Tamamland�"
-
-#: src/protocols/jabber/jabber.c:482
-#: src/protocols/jabber/jabber.c:1299
+msgstr "Kayıt Başarılı"
+
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Bilinmeyen Hata"
 
-#: src/protocols/jabber/jabber.c:484
-#: src/protocols/jabber/jabber.c:485
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
-msgstr "Kay�t Tamamlanamad�!"
-
-#: src/protocols/jabber/jabber.c:596
-#: src/protocols/jabber/jabber.c:597
+msgstr "Kayıt Başarısız Oldu"
+
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
-msgstr "Zaten Kay�tl�"
-
-#: src/protocols/jabber/jabber.c:643
-msgid "E-Mail"
-msgstr "E-Posta"
-
-#: src/protocols/jabber/jabber.c:673
-#: src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+msgstr "Zaten Kayıtlı"
+
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "Durum"
 
-#: src/protocols/jabber/jabber.c:683
-#: src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663
-#: src/protocols/silc/util.c:513
+#: ../libpurple/protocols/jabber/jabber.c:849
+msgid "Postal code"
+msgstr "Posta kodu"
+
+#: ../libpurple/protocols/jabber/jabber.c:854
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:693
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "Tarih"
 
-#: src/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
-msgstr "Kaydolmak i�in a�a��daki bilgileri tamamlay�n."
-
-#: src/protocols/jabber/jabber.c:704
-#: src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Yeni Jabber Hesab� Olu�tur"
-
-#: src/protocols/jabber/jabber.c:842
+msgstr "Kaydolmak için aşağıdaki bilgileri tamamlayın."
+
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "Yeni XMPP Hesabına Kayıt Ol"
+
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
+msgid "Register"
+msgstr "Kayıt Ol"
+
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:848
-#: src/protocols/msn/session.c:368
+#: ../libpurple/protocols/jabber/jabber.c:1053
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
-msgstr "Belgeleniyor"
-
-#: src/protocols/jabber/jabber.c:857
+msgstr "Kimlik Doğrulaması Yapılıyor"
+
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:928
-#: src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318
-#: src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:7589
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
-msgstr "Yetki Verilmedi"
-
-#: src/protocols/jabber/jabber.c:971
+msgstr "Yetki Verilmemiş"
+
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
-msgstr "Ayn�"
-
-#: src/protocols/jabber/jabber.c:973
+msgstr "İkisi de"
+
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
-msgstr "From (To pending)"
-
-#: src/protocols/jabber/jabber.c:975
-msgid "From"
-msgstr "Kimden"
-
-#: src/protocols/jabber/jabber.c:978
+msgstr "Kimden (bekletiliyor)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "Kime"
 
-#: src/protocols/jabber/jabber.c:980
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
-msgstr "None (To pending)"
-
-#: src/protocols/jabber/jabber.c:982
-#: src/protocols/yahoo/yahoo.c:2780
+msgstr "Hiçbiri (bekletiliyor)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
-msgstr "Hi�biri"
-
-#: src/protocols/jabber/jabber.c:984
+msgstr "Hiçbiri"
+
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
-msgstr "�yelik"
-
-#: src/protocols/jabber/jabber.c:1039
-#: src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055
-#: src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
-msgid "Priority"
-msgstr "�ncelik"
-
-#: src/protocols/jabber/jabber.c:1093
+msgstr "Üyelik"
+
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
-msgstr "�ifre ba�ar�yla de�i�tirildi"
-
-#: src/protocols/jabber/jabber.c:1094
+msgstr "Parola Değişti"
+
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
-msgstr "Parolan�z de�i�tirildi"
-
-#: src/protocols/jabber/jabber.c:1098
-#: src/protocols/jabber/jabber.c:1099
+msgstr "Parolanız değiştirildi."
+
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
-msgstr "�ifre de�i�tirilirken hata"
-
-#: src/protocols/jabber/jabber.c:1155
+msgstr "Parola değiştirilirken hata"
+
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
-msgstr "Yeni �ifre (tekrar)"
-
-#: src/protocols/jabber/jabber.c:1160
-#: src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Jabber �ifresini De�i�tir"
-
-#: src/protocols/jabber/jabber.c:1161
+msgstr "Yeni parola (tekrar)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "XMPP Parolası Değiştir"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
-msgstr "Yeni �ifrenizi girin"
-
-#: src/protocols/jabber/jabber.c:1171
-#: src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Kullan�c� Bilgisini De�i�tir"
+msgstr "Lütfen yeni parolanızı girin"
+
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
+#: ../libpurple/protocols/silc/silc.c:1015
+msgid "Set User Info..."
+msgstr "Kullanıcı Bilgisi Ayarla..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176
-#: src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "�ifre De�i�tir"
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
+#: ../libpurple/protocols/silc/silc.c:1011
+msgid "Change Password..."
+msgstr "Parola Değiştir..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-msgid "Search for users"
-msgstr "Kullan�c�lar i�in ara"
-
-#: src/protocols/jabber/jabber.c:1257
+#: ../libpurple/protocols/jabber/jabber.c:1404
+msgid "Search for Users..."
+msgstr "Kullanıcı Ara..."
+
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
-msgstr "K�t� �stek"
-
-#: src/protocols/jabber/jabber.c:1259
+msgstr "Kötü İstek"
+
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
-msgstr "�eli�ki"
-
-#: src/protocols/jabber/jabber.c:1261
+msgstr "Çakışma"
+
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
-msgstr "�zellik Eklenmedi"
-
-#: src/protocols/jabber/jabber.c:1263
+msgstr "Özellik Eklenmedi"
+
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "Yasak"
 
-#: src/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Gitti"
 
-#: src/protocols/jabber/jabber.c:1267
-#: src/protocols/jabber/jabber.c:1341
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
-msgstr "Yerel Sunucu Hatas�"
-
-#: src/protocols/jabber/jabber.c:1269
+msgstr "İç Sunucu Hatası"
+
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
-msgstr "Nesne Bulunamad�"
-
-#: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
-
-#: src/protocols/jabber/jabber.c:1273
+msgstr "Öge Bulunamadı"
+
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "Bozuk XMPP Kimliği"
+
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
-msgstr "Kabul Edilebilir De�il"
-
-#: src/protocols/jabber/jabber.c:1275
+msgstr "Kabul Edilebilir Değil"
+
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
-msgstr "�zinsiz"
-
-#: src/protocols/jabber/jabber.c:1279
+msgstr "İzin Verilmemiş"
+
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
-msgstr "�deme Gerekli"
-
-#: src/protocols/jabber/jabber.c:1281
+msgstr "Ödeme Gerekli"
+
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
-msgstr "Ge�ersiz Al�c�"
-
-#: src/protocols/jabber/jabber.c:1285
+msgstr "Geçersiz Alıcı"
+
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
-msgstr "Kay�t Gerekli"
-
-#: src/protocols/jabber/jabber.c:1287
+msgstr "Kayıt Gerekli"
+
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
-msgstr "Uzak Sunucu Bulunamad�"
-
-#: src/protocols/jabber/jabber.c:1289
+msgstr "Uzak Sunucu Bulunamadı"
+
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
-msgstr "Uzak Sunucu Zamana��m�na U�rad�"
-
-#: src/protocols/jabber/jabber.c:1291
+msgstr "Uzak Sunucu Zamanaşımına Uğradı"
+
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
-msgstr "Sunucuya A��r� Y�klenme"
-
-#: src/protocols/jabber/jabber.c:1293
+msgstr "Sunucuya Aşırı Yüklenme"
+
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
-msgstr "Ge�ersiz Sunucu"
-
-#: src/protocols/jabber/jabber.c:1295
+msgstr "Geçersiz Sunucu"
+
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
-msgstr "Kay�t Gerekli"
-
-#: src/protocols/jabber/jabber.c:1297
+msgstr "Kayıt Gerekli"
+
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
-msgstr "Beklenmeyen �stek"
-
-#: src/protocols/jabber/jabber.c:1304
+msgstr "Beklenmeyen İstek"
+
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
-msgstr "Yetkilendirmeden Vazge�ildi"
-
-#: src/protocols/jabber/jabber.c:1306
+msgstr "Yetkilendirmeden Vazgeçildi"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
-msgstr "�zinde hatal� �ifreleme "
-
-#: src/protocols/jabber/jabber.c:1309
+msgstr "Kimlik Doğrulamada yanlış kodlama"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
-msgstr "Hatal� izin"
-
-#: src/protocols/jabber/jabber.c:1312
+msgstr "Geçersiz izin"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
-msgstr "Hatal� izin mekanizmas�"
-
-#: src/protocols/jabber/jabber.c:1315
+msgstr "Geçersiz Kimlik Doğrulama mekanizması"
+
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
-msgstr "�zin verme mekanizmas� �ok zay�f"
-
-#: src/protocols/jabber/jabber.c:1320
+msgstr "Kimlik Doğrulama mekanizması çok zayıf"
+
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
-msgstr "Ge�ici Olarak Kimlik Denetimi Ba�ar�s�z"
-
-#: src/protocols/jabber/jabber.c:1322
+msgstr "Geçici Olarak Kimlik Denetimi Başarısız"
+
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
-msgstr "Kimlik Denetimi Hatas�"
-
-#: src/protocols/jabber/jabber.c:1326
+msgstr "Kimlik Denetimi Başarısız"
+
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
-msgstr "K�t� Format"
-
-#: src/protocols/jabber/jabber.c:1328
+msgstr "Kötü Biçem"
+
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
-msgstr "Yanl�� Alanad� �neki"
-
-#: src/protocols/jabber/jabber.c:1331
+msgstr "Yanlış İsimlendirme Öneki"
+
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
-msgstr "Kaynak �eli�kisi"
-
-#: src/protocols/jabber/jabber.c:1333
-#: src/protocols/silc/ops.c:1514
+msgstr "Kaynak Çakışması"
+
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
-msgstr "Ba�lant� Zamana��m�na U�rad�"
-
-#: src/protocols/jabber/jabber.c:1335
+msgstr "Bağlantı Zamanaşımına Uğradı"
+
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Sunucu Gitti"
 
-#: src/protocols/jabber/jabber.c:1337
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
-msgstr "Bilinmeyen Sunucu"
-
-#: src/protocols/jabber/jabber.c:1339
+msgstr "Sunucu Bilinmiyor"
+
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "Uygunsuz Adresleme"
 
-#: src/protocols/jabber/jabber.c:1343
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
-msgstr "Ge�ersiz ID"
-
-#: src/protocols/jabber/jabber.c:1345
+msgstr "Geçersiz Kimlik"
+
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
-msgstr "Ge�ersiz �sim Uzay� (Namespace)"
-
-#: src/protocols/jabber/jabber.c:1347
+msgstr "Geçersiz İsimlendirme (Namespace)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
-msgstr "Ge�ersiz XML"
-
-#: src/protocols/jabber/jabber.c:1349
+msgstr "Geçersiz XML"
+
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
-msgstr "Uyu�mayan Host'lar"
-
-#: src/protocols/jabber/jabber.c:1353
+msgstr "Uyuşmayan Host'lar"
+
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
-msgstr "Politika �hl�li"
-
-#: src/protocols/jabber/jabber.c:1355
+msgstr "Politika İhlâli"
+
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
-msgstr "Uzaktan Ba�lant� Ba�ar�s�z"
-
-#: src/protocols/jabber/jabber.c:1357
+msgstr "Uzak Bağlantı Başarısız"
+
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
-msgstr "Kaynak K�s�tlamas�"
-
-#: src/protocols/jabber/jabber.c:1359
+msgstr "Kaynak Kısıtlaması"
+
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
-msgstr "K�s�tlanm�� XML"
-
-#: src/protocols/jabber/jabber.c:1361
+msgstr "Kısıtlanmış XML"
+
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
-msgstr "Di�er Host'u G�r"
-
-#: src/protocols/jabber/jabber.c:1363
+msgstr "Diğer Host'u Gör"
+
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
-msgstr "Sistem Kapan�yor"
-
-#: src/protocols/jabber/jabber.c:1365
+msgstr "Sistem Kapanıyor"
+
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
-msgstr "Belirtilmemi� Ko�ul"
-
-#: src/protocols/jabber/jabber.c:1367
+msgstr "Tanımlanmamış Koşul"
+
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
-msgstr "Ge�ersiz Kodlama"
-
-#: src/protocols/jabber/jabber.c:1369
+msgstr "Geçersiz Kodlama"
+
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
-msgstr "Desteklenmeyen Stranza T�r�"
-
-#: src/protocols/jabber/jabber.c:1371
+msgstr "Desteklenmeyen Stranza Türü"
+
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
-msgstr "Ge�ersiz Versiyon"
-
-#: src/protocols/jabber/jabber.c:1373
+msgstr "Desteklenmeyen Sürüm"
+
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
-msgstr "XML do�ru bi�imlendirilmemi�"
-
-#: src/protocols/jabber/jabber.c:1375
+msgstr "XML Doğru Biçimlendirilmemiş"
+
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "%s yasaklanamad�"
-
-#: src/protocols/jabber/jabber.c:1464
+msgstr "%s kullanıcısına yasak konulamadı"
+
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "Bilinmeyen ili�kilendirme: %s"
-
-#: src/protocols/jabber/jabber.c:1469
+msgstr "Bilinmeyen ilişkilendirme: \"%s\""
+
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Kullan�c� %s , \"%s\" olarak yetkilendirilemedi"
-
-#: src/protocols/jabber/jabber.c:1521
+msgstr "Kullanıcı %s , \"%s\" olarak yetkilendirilemedi"
+
+#: ../libpurple/protocols/jabber/jabber.c:1714
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr "Bilinmeyen rol: \"%s\""
+
+#: ../libpurple/protocols/jabber/jabber.c:1721
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "\"%s\" rolü şu kullanıcı için ayarlanamadı: %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "%s g�nderilemedi"
-
-#: src/protocols/jabber/jabber.c:1547
+msgstr "%s kullanıcısı tekmelenemedi"
+
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
-msgstr "config:  Sohbet odas�n� d�zenle."
-
-#: src/protocols/jabber/jabber.c:1551
+msgstr "config:  Sohbet odasını düzenle."
+
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
-msgstr "configure:  Sohbet odas�n� d�zenle."
-
-#: src/protocols/jabber/jabber.c:1560
+msgstr "configure:  Sohbet odasını düzenle."
+
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
-msgstr "part [oda]:  Sohbetten ayr�l"
-
-#: src/protocols/jabber/jabber.c:1565
+msgstr "part [oda]:  Sohbetten ayrıl"
+
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
-msgstr "register:  Sohbet odas�na kaydol"
-
-#: src/protocols/jabber/jabber.c:1571
+msgstr "register:  Sohbet odasına kayıt ol"
+
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [yeni konu]:  Konuyu de�i�tir veya g�r�nt�le"
-
-#: src/protocols/jabber/jabber.c:1577
+msgstr "topic [yeni konu]:  Konuyu değiştir veya görüntüle"
+
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;user&gt; [room]:  Kullan�c�y� odadan uzun s�reli uzakla�t�r�r(banlar)."
-
-#: src/protocols/jabber/jabber.c:1583
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Bir kullan�c�n�n odayla ili�kisini ayarlar."
-
-#: src/protocols/jabber/jabber.c:1589
+msgstr ""
+"ban &lt;user&gt; [room]:  Kullanıcıyı odadan uzun süreli uzaklaştırır "
+"(banlar)."
+
+#: ../libpurple/protocols/jabber/jabber.c:1841
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Bir "
+"kullanıcının odayla ilişkisini ayarlar."
+
+#: ../libpurple/protocols/jabber/jabber.c:1847
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;kullanıcı&gt; &lt;yönetici|katılımcı|ziyaretçi|hiçbiri&gt;: Bir kullanıcının "
+"odadaki rolünü ayarla."
+
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;user&gt; [message]:  Bir kullan�c�y� odaya davet eder"
-
-#: src/protocols/jabber/jabber.c:1595
+msgstr "invite &lt;user&gt; [message]:  Bir kullanıcıyı odaya davet eder"
+
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;oda&gt; [sunucu]:  A�daki sohbete kat�l"
-
-#: src/protocols/jabber/jabber.c:1601
+msgstr "join: &lt;oda&gt; [sunucu]:  Ağdaki sohbete katıl"
+
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Birini odadan atar"
 
-#: src/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;takmaisim&gt; &lt;mesaj&gt;:  Kullan�c�ya �zel mesaj g�nder"
+msgstr "msg &lt;takmaisim&gt; &lt;mesaj&gt;:  Kullanıcıya özel mesaj gönder"
 
 #. *< type
 #. *< ui_requirement
@@ -6397,627 +4881,729 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686
-#: src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protokol Eklentisi"
-
-#: src/protocols/jabber/jabber.c:1714
-msgid "Use TLS if available"
-msgstr "M�mk�nse TLS kullan"
-
-#: src/protocols/jabber/jabber.c:1719
-msgid "Require TLS"
-msgstr "TLS Gerektirir"
-
-#: src/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protokol Eklentisi"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "Alan Adı"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "Eski (port 5223) SSL kullan"
 
-#: src/protocols/jabber/jabber.c:1727
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "�ifrelenmemi� sistemlerden gelen d�zyaz�lara (plain text) izin ver."
-
-#: src/protocols/jabber/jabber.c:1732
+msgstr "Şifrelenmemiş sistemlerden gelen düzyazılara (plain text) izin ver."
+
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
-msgstr "Ba�lant� Portu"
+msgstr "Bağlantı portu"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736
-#: src/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
-msgstr "Sunucuya ba�lan"
-
-#: src/protocols/jabber/message.c:114
+msgstr "Bağlantı sunucusu"
+
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s yazışmadan ayrıldı."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
-msgstr "Mesaj (%s)"
-
-#: src/protocols/jabber/message.c:178
+msgstr "%s konumundan ileti"
+
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s konuyu de�i�tirdi: %s"
-
-#: src/protocols/jabber/message.c:180
+msgstr "%s konuyu değiştirdi: %s"
+
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "Konu: %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "%s i�in mesaj g�nderimi ba�ar�s�z: %s"
-
-#: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber Mesaj Hatas�"
-
-#: src/protocols/jabber/message.c:297
+msgstr "%s için mesaj gönderimi başarısız: %s"
+
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP İleti Hatası"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr "(Kod %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
-msgstr "XML ayr��t�rma hatas�"
-
-#: src/protocols/jabber/presence.c:284
+msgstr "XML ayrıştırma hatası"
+
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
-msgstr "Bilinmeyen hata"
-
-#: src/protocols/jabber/presence.c:289
-#: src/protocols/msn/userlist.c:93
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "%s ,%s kullan�c�s�n� arkada� listesine eklemek istiyor."
-
-#: src/protocols/jabber/presence.c:297
-#: src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602
-#: src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Authorize"
-msgstr "Yetki Ver"
-
-#: src/protocols/jabber/presence.c:298
-#: src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604
-#: src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
-msgid "Deny"
-msgstr "�zin Verme"
-
-#: src/protocols/jabber/presence.c:345
-#: src/protocols/jabber/presence.c:346
+msgstr "Bilinmeyen Hata"
+
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
-msgstr "Yeni oda a�"
-
-#: src/protocols/jabber/presence.c:347
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:349
-msgid "Configure Room"
-msgstr "Oday� d�zenle"
-
-#: src/protocols/jabber/presence.c:351
-msgid "Accept Defaults"
-msgstr "Varsay�lanlar� uygula"
-
-#: src/protocols/jabber/presence.c:388
+msgstr "Yeni Oda Oluştur"
+
+#: ../libpurple/protocols/jabber/presence.c:354
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Yeni bir oda oluşturuyorsunuz.  Odayı yapılandırmak mı öntanımlı ayarları "
+"kullaanmak mı istersiniz?"
+
+#: ../libpurple/protocols/jabber/presence.c:360
+msgid "_Configure Room"
+msgstr "_Odayı Düzenle"
+
+#: ../libpurple/protocols/jabber/presence.c:361
+msgid "_Accept Defaults"
+msgstr "Varsayılanları _Kabul Et"
+
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "%s sohbetinde hata"
 
-#: src/protocols/jabber/presence.c:391
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
-msgstr "%s sohbetine kat�l�rken hata"
-
-#: src/protocols/jabber/si.c:591
+msgstr "%s sohbetine katılırken hata"
+
+#: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-
-#: src/protocols/jabber/si.c:592
-#: src/protocols/jabber/si.c:593
+msgstr "%s dosyası gönderilemedi, kullanıcı dosya aktarımlarını desteklemiyor"
+
+#: ../libpurple/protocols/jabber/si.c:766
+#: ../libpurple/protocols/jabber/si.c:767
 msgid "File Send Failed"
-msgstr "Dosya G�nderimi Ba�ar�s�z"
-
-#: src/protocols/msn/dialog.c:91
+msgstr "Dosya Gönderimi Başarısız"
+
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
 
-#: src/protocols/msn/dialog.c:97
-#, c-format
-msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
-msgstr ""
-
-#: src/protocols/msn/dialog.c:105
-#, c-format
-msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
-msgstr ""
-
-#: src/protocols/msn/error.c:35
+#: ../libpurple/protocols/msn/dialog.c:116
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+
+#: ../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 ""
+
+#: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
-msgstr "Mesaj ayr��t�r�lam�yor"
-
-#: src/protocols/msn/error.c:38
-msgid "Syntax Error (probably a Gaim bug)"
-msgstr "S�zdizimi hatas� (muhtemelen bir Gaim kodlama hatas�)"
-
-#: src/protocols/msn/error.c:42
+msgstr "Mesaj ayrıştırılamıyor"
+
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
+msgstr "Sözdizimi hatası (muhtemelen bir istemci hatası)"
+
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
-msgstr "Ge�ersiz e-posta adresi"
-
-#: src/protocols/msn/error.c:45
+msgstr "Geçersiz e-posta adresi"
+
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
-msgstr "Kullan�c� mevcut de�il"
-
-#: src/protocols/msn/error.c:49
-msgid "Fully Qualified Domain Name missing"
-msgstr "Fully Qualified Domain Name (FQDN) eksik"
-
-#: src/protocols/msn/error.c:52
-msgid "Already Logged In"
-msgstr "Zaten �evrimi�i"
-
-#: src/protocols/msn/error.c:55
-msgid "Invalid Username"
-msgstr "Ge�ersiz Kullan�c� Ad�"
-
-#: src/protocols/msn/error.c:58
-msgid "Invalid Friendly Name"
-msgstr "Ge�ersiz �sim"
-
-#: src/protocols/msn/error.c:61
-msgid "List Full"
-msgstr "T�m�n� Listele"
-
-#: src/protocols/msn/error.c:64
+msgstr "Kullanıcı mevcut değil"
+
+#: ../libpurple/protocols/msn/error.c:53
+msgid "Fully qualified domain name missing"
+msgstr "Fully qualified domain name (FQDN) yok"
+
+#: ../libpurple/protocols/msn/error.c:56
+msgid "Already logged in"
+msgstr "Zaten çevrimiçi"
+
+#: ../libpurple/protocols/msn/error.c:59
+msgid "Invalid screen name"
+msgstr "Geçersiz kayıtlı isim"
+
+#: ../libpurple/protocols/msn/error.c:62
+msgid "Invalid friendly name"
+msgstr "Geçersiz arkadaşlık ismi"
+
+#: ../libpurple/protocols/msn/error.c:65
+msgid "List full"
+msgstr "Tümünü listele"
+
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "Zaten orada"
 
-#: src/protocols/msn/error.c:67
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
-msgstr "Listede de�il"
-
-#: src/protocols/msn/error.c:70
-#: src/protocols/zephyr/zephyr.c:690
+msgstr "Listede değil"
+
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
-msgstr "Kullan�c� �evrimd���"
-
-#: src/protocols/msn/error.c:73
+msgstr "Kullanıcı çevrimdışı"
+
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr "Zaten modda"
 
-#: src/protocols/msn/error.c:76
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
-msgstr "Zaten kar�� listede"
-
-#: src/protocols/msn/error.c:79
+msgstr "Zaten karşı listede"
+
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
-msgstr "�ok fazla grup"
-
-#: src/protocols/msn/error.c:82
+msgstr "Çok fazla grup"
+
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
-msgstr "Ge�ersiz grup"
-
-#: src/protocols/msn/error.c:85
+msgstr "Geçersiz grup"
+
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
-msgstr "Ki�i grupta de�il"
-
-#: src/protocols/msn/error.c:88
+msgstr "Kişi grupta değil"
+
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
-msgstr "Grup ad� �ok uzun"
-
-#: src/protocols/msn/error.c:91
+msgstr "Grup adı çok uzun"
+
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
-msgstr "S�f�r grup silinemez"
-
-#: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "Bir ki�iyi, bulunmayan bir gruba eklemeye �al���ld�"
-
-#: src/protocols/msn/error.c:99
+msgstr "Sıfır grup silinemez"
+
+#: ../libpurple/protocols/msn/error.c:103
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr "Bir kişi, henüz bulunmayan bir gruba eklenilmeye çalışıldı"
+
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
-msgstr "Santral ba�ar�s�z oldu"
-
-#: src/protocols/msn/error.c:102
-msgid "Notify Transfer failed"
-msgstr "Bildirme �letimi ba�ar�s�z"
-
-#: src/protocols/msn/error.c:106
+msgstr "Santral başarısız oldu"
+
+#: ../libpurple/protocols/msn/error.c:111
+msgid "Notify transfer failed"
+msgstr "Uyarı aktarımı başarısız oldu"
+
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr "Gerekli alanlar eksik"
 
-#: src/protocols/msn/error.c:109
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
-msgstr "FND a �ok fazla vuru"
-
-#: src/protocols/msn/error.c:112
-#: src/protocols/oscar/oscar.c:206
+msgstr "FND a çok fazla vuru"
+
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
-msgstr "Oturum a��lmam��"
-
-#: src/protocols/msn/error.c:116
-msgid "Service Temporarily Unavailable"
-msgstr "Bu servis ge�ici olarak hizmet d���d�r."
-
-#: src/protocols/msn/error.c:119
+msgstr "Oturum açılmamış"
+
+#: ../libpurple/protocols/msn/error.c:128
+msgid "Service temporarily unavailable"
+msgstr "Bu servis geçici olarak hizmet dışı"
+
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
-msgstr "Sunucu veritaban� hatas�"
-
-#: src/protocols/msn/error.c:122
+msgstr "Veritabanı sunucusu hatası"
+
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
-msgstr "Ge�ersiz komut"
-
-#: src/protocols/msn/error.c:125
+msgstr "Komut pasifleştirildi"
+
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
-msgstr "Dosya i�lemi hatas�"
-
-#: src/protocols/msn/error.c:128
+msgstr "Dosya işlemi hatası"
+
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
-msgstr "Bellek ay�rma hatas�"
-
-#: src/protocols/msn/error.c:131
+msgstr "Bellek ayırma hatası"
+
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
-msgstr "Yanl�� CHL de�eri sunucuya yolland�"
-
-#: src/protocols/msn/error.c:135
+msgstr "Yanlış CHL değeri sunucuya yollandı"
+
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
-msgstr "Sunucu me�gul"
-
-#: src/protocols/msn/error.c:138
-#: src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+msgstr "Sunucu meşgul"
+
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
 msgid "Server unavailable"
-msgstr "Sunucu ge�ersiz"
-
-#: src/protocols/msn/error.c:141
-msgid "Peer Notification server down"
-msgstr "Peer Bildiri sunucusu kapal�"
-
-#: src/protocols/msn/error.c:144
+msgstr "Sunucu geçersiz"
+
+#: ../libpurple/protocols/msn/error.c:158
+msgid "Peer notification server down"
+msgstr "Peer bildirim sunucusu çalışmıyor"
+
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
-msgstr "Veritaban� ba�lant� hatas�"
-
-#: src/protocols/msn/error.c:148
+msgstr "Veritabanı bağlantı hatası"
+
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
-msgstr "Sunucu kapan�yor (terkedilmi� gemi)"
-
-#: src/protocols/msn/error.c:155
+msgstr "Sunucu kapanıyor (terkedilmiş gemi)"
+
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
-msgstr "Ba�lant� olu�turma hatas�"
-
-#: src/protocols/msn/error.c:159
+msgstr "Bağlantı oluşturma hatası"
+
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametrelerinden biri veya hepsi bilinmiyor veya izin verilmiyor"
 
-#: src/protocols/msn/error.c:162
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
-msgstr "Yaz�lam�yor"
-
-#: src/protocols/msn/error.c:165
+msgstr "Yazılamıyor"
+
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
-msgstr "Oturuma a��r� y�klenme"
-
-#: src/protocols/msn/error.c:168
+msgstr "Oturuma aşırı yüklendi"
+
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
-msgstr "Kullan�c� �ok aktif"
-
-#: src/protocols/msn/error.c:171
+msgstr "Kullanıcı çok aktif"
+
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
-msgstr "�ok fazla sezon"
-
-#: src/protocols/msn/error.c:174
+msgstr "Çok fazla oturum"
+
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
-msgstr "Passport onaylanmad�"
-
-#: src/protocols/msn/error.c:177
+msgstr "Passport onaylanmadı"
+
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
-msgstr "K�t� dosya"
-
-#: src/protocols/msn/error.c:180
+msgstr "Kötü arkadaş dosyası"
+
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr "Beklenmeyen"
 
-#: src/protocols/msn/error.c:185
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
-msgstr "Ad �ok h�zl� de�i�iyor"
-
-#: src/protocols/msn/error.c:194
+msgstr "Arkadaşlık adı çok hızlı değişiyor"
+
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
-msgstr "Sunucu �ok yo�un"
-
-#: src/protocols/msn/error.c:198
-#: src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503
-#: src/protocols/toc/toc.c:722
+msgstr "Sunucu çok yoğun"
+
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1363
+#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
-msgstr "Kimlik denetimi ba�ar�s�z"
-
-#: src/protocols/msn/error.c:201
+msgstr "Kimlik denetimi başarısız"
+
+#: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
-msgstr "�evrim d���yken izin verilmiyor"
-
-#: src/protocols/msn/error.c:209
+msgstr "Çevrim dışıyken izin verilmiyor"
+
+#: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
-msgstr "Yeni kullan�c� kabul edilmiyor"
-
-#: src/protocols/msn/error.c:213
+msgstr "Yeni kullanıcı kabul edilmiyor"
+
+#: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
-msgstr "Ebeveyn izinsiz �ocuk Passport hesab�"
-
-#: src/protocols/msn/error.c:217
+msgstr "Ebeveyn izinsiz Çocuk Passport hesabı"
+
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
-msgstr "Passport hesab� hen�z do�rulanmad�"
-
-#: src/protocols/msn/error.c:220
+msgstr "Passport hesabı henüz doğrulanmadı"
+
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
-msgstr "Hata"
-
-#: src/protocols/msn/error.c:224
+msgstr "Kötü bilet"
+
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Bilinmeyen Hata Kodu %d"
 
-#: src/protocols/msn/error.c:236
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "MSN Hatas�: %s\n"
-
-#: src/protocols/msn/msn.c:113
+msgstr "MSN Hatası: %s\n"
+
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
-msgstr "�u anda bir Titre�im g�nderdiniz!"
-
-#: src/protocols/msn/msn.c:138
+msgstr "Şimdi bir Titreşim gönderdiniz!"
+
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
-msgstr "Yeni MSN isminiz �ok uzun."
-
-#: src/protocols/msn/msn.c:246
+msgstr "Yeni MSN arkadaşlık isminiz çok uzun."
+
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
-msgstr "Arkada� ad�n�z� de�i�tirin"
-
-#: src/protocols/msn/msn.c:247
+msgstr "Arkadaşlık adınızı ayarlayın."
+
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Bu MSN arkada�lar�n�z�n sizi g�rece�i isimdir."
-
-#: src/protocols/msn/msn.c:263
+msgstr "Bu isim MSN arkadaşlarınıza görünen isminizdir."
+
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
-msgstr "Ev telefon numaran�z� ayarlay�n"
-
-#: src/protocols/msn/msn.c:278
+msgstr "Ev telefon numaranızı ayarlayın."
+
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
-msgstr "�� telefon numaran�z� ayarlay�n"
-
-#: src/protocols/msn/msn.c:293
+msgstr "İş telefon numaranızı ayarlayın."
+
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
-msgstr "Mobil telefon numaran�z� ayarlay�n."
-
-#: src/protocols/msn/msn.c:306
+msgstr "Mobil telefon numaranızı ayarlayın."
+
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
-msgstr "MSN Mobil Sayfalar�na izin ver"
-
-#: src/protocols/msn/msn.c:307
-msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-
-#: src/protocols/msn/msn.c:311
+msgstr "MSN Mobil Sayfalarına izin verilsin mi ?"
+
+#: ../libpurple/protocols/msn/msn.c:323
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
-msgstr "�zin Ver"
-
-#: src/protocols/msn/msn.c:312
+msgstr "İzin ver"
+
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
-msgstr "�zin Verme"
-
-#: src/protocols/msn/msn.c:328
+msgstr "İzin verme"
+
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
-msgstr "Bu Hotmail hesab� aktif olmayabilir"
-
-#: src/protocols/msn/msn.c:354
+msgstr "Bu Hotmail hesabı aktif olmayabilir."
+
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
-msgstr "SMS g�nder"
-
-#: src/protocols/msn/msn.c:356
+msgstr "Bir SMS gönder."
+
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "Sayfa"
 
-#: src/protocols/msn/msn.c:544
-#: src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554
-#: src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/protocols/msn/msn.c:551
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
-msgstr "Sizi Eklemi� Mi?"
-
-#: src/protocols/msn/msn.c:581
-#: src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615
-#: src/protocols/yahoo/yahoo.c:3230
+msgstr "Sizi eklemiş mi ?"
+
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
-msgstr "Hemen Gelece�im"
-
-#: src/protocols/msn/msn.c:589
-#: src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625
-#: src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
+msgstr "Hemen Dönecek"
+
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
+msgid "Busy"
+msgstr "Meşgul"
+
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
+msgid "On the Phone"
 msgstr "Telefonda"
 
-#: src/protocols/msn/msn.c:593
-#: src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629
-#: src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+msgid "Out to Lunch"
 msgstr "Yemekte"
 
-#: src/protocols/msn/msn.c:597
-#: src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
-msgid "Hidden"
-msgstr "Gizli"
-
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "�smi Ayarla"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "Ev Numaran�z� Ayarlay�n"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "�� Numaran�z� Ayarlay�n"
-
-#: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "Mobil Numaran�z� Ayarlay�n"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "Mobil S�r�c�leri Etkinle�tir/Pasifle�tir"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "Mobil S�r�c�lerini �zin Ver/Reddet"
-
-#: src/protocols/msn/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:591
+msgid "Set Friendly Name..."
+msgstr "Arkadaşlık İsmi Ayarla..."
+
+#: ../libpurple/protocols/msn/msn.c:596
+msgid "Set Home Phone Number..."
+msgstr "Ev Telefonu Numarası Ayarla..."
+
+#: ../libpurple/protocols/msn/msn.c:600
+msgid "Set Work Phone Number..."
+msgstr "İş Telefonu Numarası Ayarla..."
+
+#: ../libpurple/protocols/msn/msn.c:604
+msgid "Set Mobile Phone Number..."
+msgstr "Cep Telefonu Numarası Ayarla..."
+
+#: ../libpurple/protocols/msn/msn.c:610
+msgid "Enable/Disable Mobile Devices..."
+msgstr "Mobil Aygıtları Etkinleştir/Pasifleştir"
+
+#: ../libpurple/protocols/msn/msn.c:615
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "Mobil Sayfalarına İzin Ver/Reddet"
+
+#: ../libpurple/protocols/msn/msn.c:625
 msgid "Open Hotmail Inbox"
-msgstr "Hotmail Gelen Kutusunu A�"
-
-#: src/protocols/msn/msn.c:671
+msgstr "Hotmail Gelen Kutusunu Aç"
+
+#: ../libpurple/protocols/msn/msn.c:649
 msgid "Send to Mobile"
-msgstr "Cebine G�nder"
-
-#: src/protocols/msn/msn.c:680
-#: src/protocols/novell/novell.c:3442
+msgstr "Cebine Gönder"
+
+#: ../libpurple/protocols/msn/msn.c:659
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
-msgstr "Sohbete Ba�la"
-
-#: src/protocols/msn/msn.c:717
-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 i�in SSL deste�i gereklidir. L�tfen ge�erli bir SSL k�t�phanesi y�kleyin. Daha fazla bilgi i�in http://gaim.sf.net/faq-ssl.php adresini ziyaret edin."
-
-#: src/protocols/msn/msn.c:745
+msgstr "Kişiyle Sohbete _Başla"
+
+#: ../libpurple/protocols/msn/msn.c:697
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr "MSN için SSL desteği gereklidir. Lütfen geçerli bir SSL kütüphanesi yükleyin."
+
+#: ../libpurple/protocols/msn/msn.c:722
 msgid "Failed to connect to server."
-msgstr "Sunucuya ba�lan�lamad�"
-
-#: src/protocols/msn/msn.c:1387
-#: src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721
-#: src/protocols/zephyr/zephyr.c:1135
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>G�r�nen isim:</b> %s<br>"
-
-#. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394
-#: src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167
-#: src/util.c:801
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b> "
-
-#: src/protocols/msn/msn.c:1471
-msgid "MSN Profile"
-msgstr "MSN Profili"
-
-#: src/protocols/msn/msn.c:1476
-#: src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+msgstr "Sunucuya bağlanılamadı"
+
+#: ../libpurple/protocols/msn/msn.c:1457 ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
-msgstr "Profil al�n�rken hata"
-
-#: src/protocols/msn/msn.c:1546
-#: src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+msgstr "Profil alınırken hata"
+
+#: ../libpurple/protocols/msn/msn.c:1528 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:451
+msgid "General"
+msgstr "Genel"
+
+#: ../libpurple/protocols/msn/msn.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
-msgstr "Ya�"
-
-#: src/protocols/msn/msn.c:1553
-#: src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "Cinsiyet"
-
-#: src/protocols/msn/msn.c:1562
-#: src/protocols/yahoo/yahoo_profile.c:1020
+msgstr "Yaş"
+
+#: ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+msgid "Occupation"
+msgstr "Meslek"
+
+#: ../libpurple/protocols/msn/msn.c:1538
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
+msgid "Location"
+msgstr "Konum"
+
+#: ../libpurple/protocols/msn/msn.c:1543 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+msgid "Hobbies and Interests"
+msgstr "Hobiler ve İlgi Alanları"
+
+#: ../libpurple/protocols/msn/msn.c:1549 ../libpurple/protocols/msn/msn.c:1669
+#: ../libpurple/protocols/msn/msn.c:1675 ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1690 ../libpurple/protocols/msn/msn.c:1697
+msgid "A Little About Me"
+msgstr "Benim Hakkımda Birkaç Şey"
+
+#: ../libpurple/protocols/msn/msn.c:1566
+msgid "Social"
+msgstr "Sosyal"
+
+#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Medeni Hali"
 
-#: src/protocols/msn/msn.c:1569
-#: src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
-msgid "Location"
-msgstr "Konum"
-
-#: src/protocols/msn/msn.c:1577
-#: src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Occupation"
-msgstr "Meslek"
-
-#: src/protocols/msn/msn.c:1594
-#: src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607
-#: src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
-msgid "A Little About Me"
-msgstr "Benim Hakk�mda Birka� �ey"
-
-#: src/protocols/msn/msn.c:1631
-#: src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644
-#: src/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1569
+msgid "Interests"
+msgstr "İlgiler"
+
+#: ../libpurple/protocols/msn/msn.c:1570
+msgid "Pets"
+msgstr "Evcil hayvanlar"
+
+#: ../libpurple/protocols/msn/msn.c:1571
+msgid "Hometown"
+msgstr "Memleket"
+
+#: ../libpurple/protocols/msn/msn.c:1572
+msgid "Places Lived"
+msgstr "yaşadığı Yerler"
+
+#: ../libpurple/protocols/msn/msn.c:1573
+msgid "Fashion"
+msgstr "Moda"
+
+#: ../libpurple/protocols/msn/msn.c:1574
+msgid "Humor"
+msgstr "Mizah"
+
+#: ../libpurple/protocols/msn/msn.c:1575
+msgid "Music"
+msgstr "Müzik"
+
+#: ../libpurple/protocols/msn/msn.c:1576 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+msgid "Favorite Quote"
+msgstr "En Sevdiği Söz"
+
+#: ../libpurple/protocols/msn/msn.c:1593
+msgid "Contact Info"
+msgstr "Bağlantı Bilgileri"
+
+#: ../libpurple/protocols/msn/msn.c:1594
+msgid "Personal"
+msgstr "Kişisel"
+
+#: ../libpurple/protocols/msn/msn.c:1597
+msgid "Significant Other"
+msgstr "Önemli Diğerleri"
+
+#: ../libpurple/protocols/msn/msn.c:1598
+msgid "Home Phone"
+msgstr "Ev Telefonu"
+
+#: ../libpurple/protocols/msn/msn.c:1599
+msgid "Home Phone 2"
+msgstr "Ev Telefonu2"
+
+#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/oscar/oscar.c:3780
+msgid "Home Address"
+msgstr "Ev Adresi"
+
+#: ../libpurple/protocols/msn/msn.c:1601
+msgid "Personal Mobile"
+msgstr "Kişisel Cep Telefonu"
+
+#: ../libpurple/protocols/msn/msn.c:1602
+msgid "Home Fax"
+msgstr "Ev Faksı"
+
+#: ../libpurple/protocols/msn/msn.c:1603
+msgid "Personal E-Mail"
+msgstr "Kişisel E-posta"
+
+#: ../libpurple/protocols/msn/msn.c:1604
+msgid "Personal IM"
+msgstr "Kişisel Anında Mesajlaşma Adresi"
+
+#: ../libpurple/protocols/msn/msn.c:1606
+msgid "Anniversary"
+msgstr "Yıldönümü"
+
+#. Business
+#: ../libpurple/protocols/msn/msn.c:1622
+msgid "Work"
+msgstr "İş"
+
+#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "İşi"
+
+#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:3801
+msgid "Company"
+msgstr "Şirket"
+
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "Departman"
+
+#: ../libpurple/protocols/msn/msn.c:1627
+msgid "Profession"
+msgstr "Uzmanlık"
+
+#: ../libpurple/protocols/msn/msn.c:1628
+msgid "Work Phone"
+msgstr "İş Telefonu"
+
+#: ../libpurple/protocols/msn/msn.c:1629
+msgid "Work Phone 2"
+msgstr "İş Telefonu2"
+
+#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:3793
+msgid "Work Address"
+msgstr "İş Adresi"
+
+#: ../libpurple/protocols/msn/msn.c:1631
+msgid "Work Mobile"
+msgstr "İş Cep Telefonu"
+
+#: ../libpurple/protocols/msn/msn.c:1632
+msgid "Work Pager"
+msgstr "İş Çağrı Cihazı"
+
+#: ../libpurple/protocols/msn/msn.c:1633
+msgid "Work Fax"
+msgstr "İş Faksı"
+
+#: ../libpurple/protocols/msn/msn.c:1634
+msgid "Work E-Mail"
+msgstr "İş E-Postası"
+
+#: ../libpurple/protocols/msn/msn.c:1635
+msgid "Work IM"
+msgstr "İş Anında Mesajlaşma Adresi"
+
+#: ../libpurple/protocols/msn/msn.c:1636
+msgid "Start Date"
+msgstr "Başlama Tarihi"
+
+#: ../libpurple/protocols/msn/msn.c:1706 ../libpurple/protocols/msn/msn.c:1712
+#: ../libpurple/protocols/msn/msn.c:1719 ../libpurple/protocols/msn/msn.c:1726
 msgid "Favorite Things"
-msgstr "Hobiler"
-
-#: src/protocols/msn/msn.c:1660
-#: src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
-msgid "Hobbies and Interests"
-msgstr "Hobiler ve �lgi Alanlar�"
-
-#: src/protocols/msn/msn.c:1682
-#: src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
-msgid "Favorite Quote"
-msgstr "Favori S�z�"
-
-#: src/protocols/msn/msn.c:1696
+msgstr "Sevdiği Şeyler"
+
+#: ../libpurple/protocols/msn/msn.c:1771
 msgid "Last Updated"
-msgstr "Son G�ncelleme"
-
-#: src/protocols/msn/msn.c:1707
-#: src/protocols/silc/ops.c:846
+msgstr "Son Güncelleme"
+
+#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Anasayfa"
 
-#: src/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msn/msn.c:1803
 msgid "The user has not created a public profile."
-msgstr "Kullan�c� genel bir profil olu�turmam��."
-
-#: src/protocols/msn/msn.c:1730
-msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
-msgstr "MSN kulllan�c�n�n profilini bulam�yor. Bu durumda kullan�c� mevcut de�ildir, ya da genel bir profil olu�turmam��t�r."
-
-#: src/protocols/msn/msn.c:1734
-msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
-msgstr "Gaim kullan�c� profiline ula�am�yor. Muhtemelen ki�i ge�ersiz."
-
-#: src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167
+msgstr "Kullanıcı genel bir profil oluşturmamış."
+
+#: ../libpurple/protocols/msn/msn.c:1804
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN kulllanıcının profilini bulamıyor. Bu durumda kullanıcı mevcut değildir, "
+"ya da genel bir profil oluşturmamıştır."
+
+#: ../libpurple/protocols/msn/msn.c:1808
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profil URL"
 
@@ -7031,291 +5617,575 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942
-#: src/protocols/msn/msn.c:1944
+#: ../libpurple/protocols/msn/msn.c:2102 ../libpurple/protocols/msn/msn.c:2104
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protokol Eklentisi"
 
-#: src/protocols/msn/msn.c:1963
-msgid "Login server"
-msgstr "Sunucuya Ba�lan"
-
-#: src/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msn/msn.c:2138
 msgid "Use HTTP Method"
 msgstr "HTTP Metodunu Kullan"
 
-#: src/protocols/msn/msn.c:1980
-msgid "nudge: nudge a contact to get their attention"
-msgstr "nudge : kullan�c�lar�n sizi farketmesi i�in d�rtme uyar�s�"
-
-#: src/protocols/msn/nexus.c:103
-#: src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../libpurple/protocols/msn/msn.c:2143
+msgid "Show custom smileys"
+msgstr "Özel gülenyüzleri göster"
+
+#: ../libpurple/protocols/msn/msn.c:2151
+msgid "nudge: nudge a user to get their attention"
+msgstr "nudge : kullanıcıların sizi farketmesi için dürtme uyarısı"
+
+#: ../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 "Ba�lan�lam�yor."
-
-#: src/protocols/msn/notification.c:178
+msgstr "Bağlanılamıyor"
+
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
-msgstr "%s ge�erli bir grup de�il."
-
-#: src/protocols/msn/notification.c:184
-#: src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+msgstr "%s geçerli bir grup değil."
+
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Bilinmeyen Hata"
 
-#: src/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s - %s (%s)"
 
-#: src/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "Kullan�c� %s 'a eklenemiyor (%s)"
-
-#: src/protocols/msn/notification.c:502
+msgstr "Kullanıcı %s 'a eklenemiyor (%s)"
+
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "%s i�indeki kullan�c� engellenemiyor (%s)"
-
-#: src/protocols/msn/notification.c:506
+msgstr "%s içindeki kullanıcı engellenemiyor (%s)"
+
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "%s i�indeki kullan�c�ya izin verilemiyor (%s)"
-
-#: src/protocols/msn/notification.c:514
+msgstr "%s içindeki kullanıcıya izin verilemiyor (%s)"
+
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "%s eklenemiyor, ��nk� listeniz dolu durumda."
-
-#: src/protocols/msn/notification.c:523
+msgstr "%s eklenemiyor, çünkü listeniz dolu durumda."
+
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s ge�erli bir passport hesab� de�il."
-
-#: src/protocols/msn/notification.c:815
+msgstr "%s geçerli bir passport hesabı değil."
+
+#: ../libpurple/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "Bu Servis Geçici Olarak Hizmet Dışı"
+
+#: ../libpurple/protocols/msn/notification.c:836
 msgid "Unable to rename group"
-msgstr "Grup ad� de�i�tirilemiyor"
-
-#: src/protocols/msn/notification.c:870
+msgstr "Grup adı değiştirilemiyor"
+
+#: ../libpurple/protocols/msn/notification.c:891
 msgid "Unable to delete group"
 msgstr "Grup silinemiyor"
 
-#: src/protocols/msn/notification.c:1303
-#, c-format
-msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+#: ../libpurple/protocols/msn/notification.c:1317
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"MSN sunucusu bak�m i�in %d dakika sonra kapanacakt�r. Otomatik olarak �evrimd��� olaca��n�zdan yaz��malar�n�z� bitirmenizi �neririz.\n"
+"MSN sunucusu bakım için %d dakika sonra kapanacaktır. Otomatik olarak "
+"çevrimdışı olacağınızdan yazışmalarınızı bitirmenizi öneririz.\n"
 "\n"
-"Bak�m tamamland���nda tekrar ba�ar�yla oturum a�abileceksiniz."
-
-#: src/protocols/msn/servconn.c:129
+"Bakım tamamlandığında tekrar başarıyla oturum açabileceksiniz."
+
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
-msgstr "Yazma hatas�"
-
-#: src/protocols/msn/servconn.c:131
+msgstr "Yazma hatası"
+
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
-msgstr "Okuma hatas�"
-
-#: src/protocols/msn/servconn.c:133
-#: src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
-msgid "Unknown error"
-msgstr "Bilinmeyen Hata"
-
-#: src/protocols/msn/servconn.c:136
-#, c-format
-msgid ""
-"Connection error from %s server (%s):\n"
+msgstr "Okuma hatası"
+
+#: ../libpurple/protocols/msn/servconn.c:144
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
-"%s sunucusunda ba�lant� hatas� (%s):\n"
+"%s sunucusuna bağlanma hatası:\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
-msgstr "Bu protokol sunucu taraf�ndan desteklenmiyor."
-
-#: src/protocols/msn/session.c:321
+msgstr "Bu protokol sunucu tarafından desteklenmiyor."
+
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
-msgstr "HTTP ayr��t�rma hatas�"
-
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325
-#: src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629
-#: src/protocols/yahoo/yahoo.c:194
+msgstr "HTTP ayrıştırma hatası"
+
+#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
-msgstr "Ba�ka bir programla oturum a�t�n�z."
-
-#: src/protocols/msn/session.c:328
+msgstr "Başka bir programla oturum açtınız."
+
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "MSN sunucular ge�ici olarak servis d���d�r. L�tfen bekleyin ve tekrar deneyin."
-
-#: src/protocols/msn/session.c:333
+msgstr ""
+"MSN sunucular geçici olarak servis dışıdır. Lütfen bekleyin ve tekrar "
+"deneyin."
+
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
-msgstr "MSN sunucusu ge�ici olarak kapat�l�yor"
-
-#: src/protocols/msn/session.c:337
+msgstr "MSN sunucusu geçici olarak kapatılıyor"
+
+#: ../libpurple/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "Do�ruluk kan�tlanam�yor: %s"
-
-#: src/protocols/msn/session.c:342
+msgstr "Doğruluk kanıtlanamıyor: %s"
+
+#: ../libpurple/protocols/msn/session.c:324
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "MSN listenize ge�ici olarak ba�lan�lam�yor. L�tfen daha sonra tekrar deneyin."
-
-#: src/protocols/msn/session.c:363
-#: src/protocols/msn/session.c:365
+msgstr "MSN listenize geçici olarak bağlanılamıyor. Lütfen daha sonra tekrar deneyin."
+
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/msn/session.c:347
 msgid "Handshaking"
-msgstr "El S�k��ma"
-
-#: src/protocols/msn/session.c:364
-msgid "Transferring"
-msgstr "�letiliyor"
-
-#: src/protocols/msn/session.c:366
+msgstr "El Sıkışma"
+
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Kimlik denetleniyor"
 
-#: src/protocols/msn/session.c:367
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Getting cookie"
-msgstr "�erez al�n�yor"
-
-#: src/protocols/msn/session.c:369
+msgstr "Çerez alınıyor"
+
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Sending cookie"
-msgstr "�erez g�nderiliyor"
-
-#: src/protocols/msn/session.c:370
+msgstr "Çerez gönderiliyor"
+
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
-msgstr "Liste al�n�yor"
-
-#: src/protocols/msn/state.c:34
+msgstr "Liste alınıyor"
+
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
-msgstr "D��ar�da!"
-
-#: src/protocols/msn/switchboard.c:403
+msgstr "Bilgisayardan Uzakta"
+
+#: ../libpurple/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "Telefonda"
+
+#: ../libpurple/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "Yemekte"
+
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "�leti g�nderilmemi� olabilir ��nk� bir zaman a��m� meydana geldi:"
-
-#: src/protocols/msn/switchboard.c:411
+msgstr "İleti gönderilmemiş olabilir çünkü bir zaman aşımı meydana geldi:"
+
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "�leti g�nderilmemi� olabilir ��nk� g�r�nmez iken yollamaya izin verilmiyor:"
-
-#: src/protocols/msn/switchboard.c:415
+msgstr "İleti gönderilmemiş olabilir çünkü görünmez iken yollamaya izin verilmiyor:"
+
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
-msgstr "�leti g�nderilmemi� olabilir ��nk� kullan�c� �evrimd���:"
-
-#: src/protocols/msn/switchboard.c:419
+msgstr "İleti gönderilmemiş olabilir çünkü kullanıcı çevrimdışı:"
+
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "�leti g�nderilmemi� olabilir ��nk� bir ba�lant� hatas� olu�tu:"
-
-#: src/protocols/msn/switchboard.c:423
+msgstr "İleti gönderilmemiş olabilir çünkü bir bağlantı hatası oluştu:"
+
+#: ../libpurple/protocols/msn/switchboard.c:420
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "İleti gönderilmemiş olabilir çünkü çok çabuk gönderdik:"
+
+#: ../libpurple/protocols/msn/switchboard.c:424
 msgid "Message could not be sent because an error with the switchboard occurred:"
-msgstr "�leti g�nderilmemi� olabilir ��nk� santralle bir problem olu�tu:"
-
-#: src/protocols/msn/switchboard.c:431
+msgstr "İleti gönderilmemiş olabilir çünkü santralle bir problem oluştu:"
+
+#: ../libpurple/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "�leti g�nderilmemi� olabilir ��nk� bilinmeyen bir hata meydana geldi:"
-
-#: src/protocols/msn/switchboard.c:952
+msgstr "İleti gönderilmemiş olabilir çünkü bilinmeyen bir hata meydana geldi:"
+
+#: ../libpurple/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s size bir titre�im g�nderdi"
-
-#: src/protocols/msn/userlist.c:85
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "%s kullan�c�s� (%s), %s �gesini arkada� listesine engellemek istiyor."
-
-#: src/protocols/msn/userlist.c:275
-#, c-format
-msgid "%s has added you to his or her contact list."
-msgstr "%s sizi arkada� listesine ekledi."
-
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr "%s sizi arkada� listesinden sildi."
-
-#: src/protocols/msn/userlist.c:659
+msgstr "%s size bir titreşim gönderdi!"
+
+#: ../libpurple/protocols/msn/userlist.c:250
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s sizi kişi listesine ekledi."
+
+#: ../libpurple/protocols/msn/userlist.c:319
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s sizi kişi listesinden sildi."
+
+#: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
-msgstr " \"%s\" eklenemiyor."
-
-#: src/protocols/msn/userlist.c:661
+msgstr "\"%s\" eklenemiyor."
+
+#: ../libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
-msgstr "Belirlenen g�r�nt� ad� ge�ersiz."
-
-#: src/protocols/napster/napster.c:260
-msgid "Unable to read header from server"
-msgstr "Sunucudan �stbilgi okunam�yor"
-
-#: src/protocols/napster/napster.c:274
-#, c-format
-msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr "Sunucudan mesaj okunam�yor: %s.  Komut %hd, uzunlu�u %hd."
-
-#: src/protocols/napster/napster.c:290
-msgid "Unknown server error."
-msgstr "Bilinmeyen Sunucu Hatas�."
-
-#: src/protocols/napster/napster.c:339
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr "kullan�c�lar: %s, dosya(lar): %s, boyut: %sGB"
-
-#. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr "\"%s\" Napster favori listenize eklenemedi"
-
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "Sunucuyla ba�lant�n�z koptu."
-
-#. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
-#, c-format
-msgid "%s requested your information"
-msgstr "%s bilginizi istedi"
-
-#. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
-#, c-format
-msgid "%s requested a PING"
-msgstr "%s bir PING sorgulad�."
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501
-#: src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239
-#: src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111
-#: src/protocols/yahoo/ycht.c:481
-msgid "Unable to connect."
-msgstr "Ba�lan�lam�yor."
-
-#: src/protocols/napster/napster.c:590
-#: src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "_Grup:"
+msgstr "Belirlenen görüntü adı geçersiz."
+
+#: ../libpurple/protocols/novell/nmuser.c:1864
+msgid "Required parameters not passed in"
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1867
+msgid "Unable to write to network"
+msgstr "Ağa yazılamıyor"
+
+#: ../libpurple/protocols/novell/nmuser.c:1870
+msgid "Unable to read from network"
+msgstr "Ağdan okunamıyor"
+
+#: ../libpurple/protocols/novell/nmuser.c:1873
+msgid "Error communicating with server"
+msgstr "Sunucu ile iletişim hatası"
+
+#: ../libpurple/protocols/novell/nmuser.c:1877
+msgid "Conference not found"
+msgstr "Konferans bulunamadı"
+
+#: ../libpurple/protocols/novell/nmuser.c:1880
+msgid "Conference does not exist"
+msgstr "Konferans mevcut değil"
+
+#: ../libpurple/protocols/novell/nmuser.c:1884
+msgid "A folder with that name already exists"
+msgstr "Bu isimde bir klasör zaten mevcut"
+
+#: ../libpurple/protocols/novell/nmuser.c:1887
+msgid "Not supported"
+msgstr "Desteklenmiyor"
+
+#: ../libpurple/protocols/novell/nmuser.c:1891
+msgid "Password has expired"
+msgstr "Şifre süresi bitmiş"
+
+#: ../libpurple/protocols/novell/nmuser.c:1894
+msgid "Incorrect password"
+msgstr "Yanlış parola"
+
+#: ../libpurple/protocols/novell/nmuser.c:1897
+msgid "User not found"
+msgstr "Kullanıcı bulunamadı"
+
+#: ../libpurple/protocols/novell/nmuser.c:1900
+msgid "Account has been disabled"
+msgstr "Hesap kapatılmıştır"
+
+#: ../libpurple/protocols/novell/nmuser.c:1903
+msgid "The server could not access the directory"
+msgstr "Sunucu dizine erişemedi"
+
+#: ../libpurple/protocols/novell/nmuser.c:1906
+msgid "Your system administrator has disabled this operation"
+msgstr "Sistem yöneticiniz bu işlemi yasaklamış"
+
+#: ../libpurple/protocols/novell/nmuser.c:1909
+msgid "The server is unavailable; try again later"
+msgstr "Sunucu kullanılamıyor; lütfen tekrar deneyin"
+
+#: ../libpurple/protocols/novell/nmuser.c:1912
+msgid "Cannot add a contact to the same folder twice"
+msgstr "Aynı kişiyi iki kez dizine ekleyemezsiniz"
+
+#: ../libpurple/protocols/novell/nmuser.c:1915
+msgid "Cannot add yourself"
+msgstr "Kendinizi ekleyemezsiniz"
+
+#: ../libpurple/protocols/novell/nmuser.c:1918
+msgid "Master archive is misconfigured"
+msgstr "Ana arşiv yanlış yapılandırılmış."
+
+#: ../libpurple/protocols/novell/nmuser.c:1922
+msgid "Incorrect screen name or password"
+msgstr "Yanlış takma ad veya parola"
+
+#: ../libpurple/protocols/novell/nmuser.c:1925
+msgid "Could not recognize the host of the screen name you entered"
+msgstr "Girdiğiniz kullanıcı adınının sunucusu tanınamadı"
+
+#: ../libpurple/protocols/novell/nmuser.c:1928
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr "Hesabınız bir süreliğine kilitlendi çünkü çok fazla hatalı parola girildi"
+
+#: ../libpurple/protocols/novell/nmuser.c:1931
+msgid "You cannot add the same person twice to a conversation"
+msgstr "Bir yazışmaya aynı kişiyi iki kez ekleyemezsiniz"
+
+#: ../libpurple/protocols/novell/nmuser.c:1935
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "Eklemenize izin verilen kişi sayısı limitine ulaştınız"
+
+#: ../libpurple/protocols/novell/nmuser.c:1938
+msgid "You have entered an incorrect screen name"
+msgstr "Yanlış bir kullanıcı adı girdiniz"
+
+#: ../libpurple/protocols/novell/nmuser.c:1941
+msgid "An error occurred while updating the directory"
+msgstr "Dizin güncellenirken bir hata oluştu"
+
+#: ../libpurple/protocols/novell/nmuser.c:1944
+msgid "Incompatible protocol version"
+msgstr "Uyumsuz protokol sürümü"
+
+#: ../libpurple/protocols/novell/nmuser.c:1947
+msgid "The user has blocked you"
+msgstr "Kullanıcı sizi engellemiş"
+
+#: ../libpurple/protocols/novell/nmuser.c:1950
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Deneme sürümü bir anda on kullanıcıdan fazla kişinin bağlanmasına izin "
+"vermiyor"
+
+#: ../libpurple/protocols/novell/nmuser.c:1953
+msgid "The user is either offline or you are blocked"
+msgstr "Kullanıcı çevrimdışı ya da sizi engellemiş"
+
+#: ../libpurple/protocols/novell/nmuser.c:1956
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "Bilinmeyen hata: 0x%X"
+
+#: ../libpurple/protocols/novell/novell.c:124
+#, c-format
+msgid "Login failed (%s)."
+msgstr "Oturum açma işlemi başarısız (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:247
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "İleti gönderilemedi. Kullanıcının ayrıntıları alınamadı (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:396
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "%s listenize eklenemedi (%s)."
+
+#. TODO: Improve this! message to who or for what conference?
+#: ../libpurple/protocols/novell/novell.c:422
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "İleti gönderilemedi (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "Kullanıcı davet edilemedi (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:532
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "%s kullanıcısına ileti gönderilemedi. Konferans başlatılamıyor (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:537
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "İleti gönderilemiyor. Konferans başlatılamadı (%s)."
+
+#: ../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 ""
+"Kullanıcı %s dizini %s sunucudaki listeye taşınamıyor. Dizin oluşturma "
+"hatası (%s)."
+
+#: ../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 ""
+"Kullanıcı listenize %s eklenemedi. Sunucudaki listede klasör oluşturma "
+"hatası (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:705
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "%s için bilgiler alınamadı (%s)"
+
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "Kullanıcı özel listeye eklenemedi (%s)"
+
+#: ../libpurple/protocols/novell/novell.c:798
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "%s engelleme listesine eklenemedi (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:851
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "%s izin verilenler listesine eklenemedi (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:919
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "%s ögesini gizlilik listesinden silerken hata (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "Sunucu taraflı gizilik ayarlarını değiştirmede hata. (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:1012
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "Konferans oluşturulamadı (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
+msgid "Error communicating with server. Closing connection."
+msgstr "Sunucuyla iletişimde kurulurken hata oluştu. Bağlantı kapatılıyor."
+
+#: ../libpurple/protocols/novell/novell.c:1476
+msgid "Telephone Number"
+msgstr "Telefon Numarası"
+
+#: ../libpurple/protocols/novell/novell.c:1482
+msgid "Personal Title"
+msgstr "Başlık"
+
+#: ../libpurple/protocols/novell/novell.c:1486
+msgid "Mailstop"
+msgstr "Mailstop"
+
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
+msgid "User ID"
+msgstr "Kullanıcı Kimliği"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#.
+#: ../libpurple/protocols/novell/novell.c:1515
+msgid "Full name"
+msgstr "Tam Ad"
+
+#: ../libpurple/protocols/novell/novell.c:1637
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise Konferansı %d"
+
+#: ../libpurple/protocols/novell/novell.c:1668
+msgid "Unable to make SSL connection to server."
+msgstr "Sunucuya SSL bağlantısı yapılamıyor."
+
+#: ../libpurple/protocols/novell/novell.c:1720
+msgid "Authenticating..."
+msgstr "Kimlik doğrulaması yapılıyor..."
+
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "Sunucuya bağlanılamadı."
+
+#: ../libpurple/protocols/novell/novell.c:1735
+msgid "Waiting for response..."
+msgstr "Sunucudan yanıt bekleniyor..."
+
+#: ../libpurple/protocols/novell/novell.c:1870
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s bu yazışmaya davet edildi."
+
+#: ../libpurple/protocols/novell/novell.c:1898
+msgid "Invitation to Conversation"
+msgstr "Yazışmaya Davet"
+
+#: ../libpurple/protocols/novell/novell.c:1899
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"Davet eden: %s\n"
+"\n"
+"Gönderilen: %s"
+
+#: ../libpurple/protocols/novell/novell.c:1901
+msgid "Would you like to join the conversation?"
+msgstr "Yazışmaya katılmak istiyor musunuz?"
+
+#. we don't want to reconnect in this case
+#: ../libpurple/protocols/novell/novell.c:2012
+msgid "You have been logged out because you logged in at another workstation."
+msgstr "Oturumunuz kapandı, çünkü başka bir yerden oturum açtınız."
+
+#: ../libpurple/protocols/novell/novell.c:2069
+#, c-format
+msgid "%s appears to be offline and did not receive the message that you just sent."
+msgstr "%s çevrimdışı gözüküyor ve henüz gönderdiğiniz iletileri alamıyor."
+
+#. TODO: Would be nice to prompt if not set!
+#. *  purple_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: ../libpurple/protocols/novell/novell.c:2167
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr "Sunucuya bağlanılamadı. Lütfen bağlanmak istediğiniz adresi giriniz."
+
+#: ../libpurple/protocols/novell/novell.c:2195
+msgid "Error. SSL support is not installed."
+msgstr "Hata. SSL desteği kurulmamış."
+
+#: ../libpurple/protocols/novell/novell.c:2504
+msgid "This conference has been closed. No more messages can be sent."
+msgstr "Bu konferans kapandı. Artık iletiler gönderilmeyecek."
 
 #. *< type
 #. *< ui_requirement
@@ -7327,338 +6197,71 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687
-#: src/protocols/napster/napster.c:689
-msgid "NAPSTER Protocol Plugin"
-msgstr "NAPSTER Protokol Eklentisi"
-
-#: src/protocols/novell/nmuser.c:1868
-msgid "Required parameters not passed in"
-msgstr ""
-
-#: src/protocols/novell/nmuser.c:1871
-msgid "Unable to write to network"
-msgstr "Sunucuya yaz�lam�yor"
-
-#: src/protocols/novell/nmuser.c:1874
-msgid "Unable to read from network"
-msgstr "Sunucudan okunam�yor"
-
-#: src/protocols/novell/nmuser.c:1877
-msgid "Error communicating with server"
-msgstr "Sunucu ba�lant� hatas�"
-
-#: src/protocols/novell/nmuser.c:1881
-msgid "Conference not found"
-msgstr "Konferans bulunamad�"
-
-#: src/protocols/novell/nmuser.c:1884
-msgid "Conference does not exist"
-msgstr "Konferans mevcut de�il"
-
-#: src/protocols/novell/nmuser.c:1888
-msgid "A folder with that name already exists"
-msgstr "Bu isimde bir klas�r zaten mevcut"
-
-#: src/protocols/novell/nmuser.c:1891
-msgid "Not supported"
-msgstr "Desteklenmiyor"
-
-#: src/protocols/novell/nmuser.c:1895
-msgid "Password has expired"
-msgstr "�ifre s�resi bitmi�"
-
-#: src/protocols/novell/nmuser.c:1898
-msgid "Invalid password"
-msgstr "Ge�ersiz �ifre"
-
-#: src/protocols/novell/nmuser.c:1901
-msgid "User not found"
-msgstr "Kullan�c� bulunamad�"
-
-#: src/protocols/novell/nmuser.c:1904
-msgid "Account has been disabled"
-msgstr "Hesap kapat�lm��t�r"
-
-#: src/protocols/novell/nmuser.c:1907
-msgid "The server could not access the directory"
-msgstr "Sunucu dizine eri�emedi"
-
-#: src/protocols/novell/nmuser.c:1910
-msgid "Your system administrator has disabled this operation"
-msgstr "Sistem y�neticiniz bu i�lemi yasaklam��"
-
-#: src/protocols/novell/nmuser.c:1913
-msgid "The server is unavailable; try again later"
-msgstr "Sunucu kullan�lam�yor; l�tfen tekrar deneyin"
-
-#: src/protocols/novell/nmuser.c:1916
-msgid "Cannot add a contact to the same folder twice"
-msgstr "Ayn� ki�iyi iki kez dizine ekleyemezsiniz"
-
-#: src/protocols/novell/nmuser.c:1919
-msgid "Cannot add yourself"
-msgstr "Kendinizi ekleyemezsiniz"
-
-#: src/protocols/novell/nmuser.c:1922
-msgid "Master archive is misconfigured"
-msgstr "Ana ar�iv yanl�� yap�land�r�lm��."
-
-#: src/protocols/novell/nmuser.c:1926
-msgid "Invalid username or password"
-msgstr "Ge�ersiz kullan�c� ad� veya �ifre"
-
-#: src/protocols/novell/nmuser.c:1929
-msgid "Could not recognize the host of the username you entered"
-msgstr "Girdi�iniz kullan�c� ad�n�n�n sunucusu tan�namad�"
-
-#: src/protocols/novell/nmuser.c:1932
-msgid "Your account has been disabled because too many invalid passwords were entered"
-msgstr "Hesab�n�z bir s�reli�ine kilitlendi ��nk� �ok fazla hatal� parola girildi"
-
-#: src/protocols/novell/nmuser.c:1935
-msgid "You cannot add the same person twice to a conversation"
-msgstr "Ayn� ki�iyi iki kez yaz��maya ekleyemezsiniz"
-
-#: src/protocols/novell/nmuser.c:1939
-msgid "You have reached your limit for the number of contacts allowed"
-msgstr "Ekleyebilece�iniz ki�i say�s� limitine ula�t�n�z."
-
-#: src/protocols/novell/nmuser.c:1942
-msgid "You have entered an invalid username"
-msgstr "Ge�ersiz bir kullan�c� ad� girdiniz."
-
-#: src/protocols/novell/nmuser.c:1945
-msgid "An error occurred while updating the directory"
-msgstr "Dizini g�ncellerken bir hata olu�tu"
-
-#: src/protocols/novell/nmuser.c:1948
-msgid "Incompatible protocol version"
-msgstr "Uyumsuz protokol versiyonu"
-
-#: src/protocols/novell/nmuser.c:1951
-msgid "The user has blocked you"
-msgstr "Kullan�c� sizi engellemi�"
-
-#: src/protocols/novell/nmuser.c:1954
-msgid "This evaluation version does not allow more than ten users to log in at one time"
-msgstr "Deneme s�r�m� bir anda on kullan�c�dan fazla bir anda ba�lanmaya izin vermiyor."
-
-#: src/protocols/novell/nmuser.c:1957
-msgid "The user is either offline or you are blocked"
-msgstr "Kullan�c� �evrimd��� veya sizi engellemi�"
-
-#: src/protocols/novell/nmuser.c:1960
-#, c-format
-msgid "Unknown error: 0x%X"
-msgstr "Bilinmeyen hata: 0x%X"
-
-#: src/protocols/novell/novell.c:117
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Oturum a�ma ba�ar�s�z (%s)."
-
-#: src/protocols/novell/novell.c:232
-#, c-format
-msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Mesaj yollanam�yor. Kullan�c�n�n ayr�nt�lar� al�namad� (%s)."
-
-#: src/protocols/novell/novell.c:381
-#, c-format
-msgid "Unable to add %s to your buddy list (%s)."
-msgstr "%s listenize eklenemedi (%s)."
-
-#. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
-#, c-format
-msgid "Unable to send message (%s)."
-msgstr "Mesaj g�nderilemedi (%s)."
-
-#: src/protocols/novell/novell.c:478
-#: src/protocols/novell/novell.c:972
-#, c-format
-msgid "Unable to invite user (%s)."
-msgstr "Kullan�c� davet edilemedi (%s)."
-
-#: src/protocols/novell/novell.c:517
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr "%s kullan�c�s�na mesaj yollanam�yor. Konferans ba�lat�lam�yor (%s)."
-
-#: src/protocols/novell/novell.c:522
-#, c-format
-msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Mesaj yollanam�yor. Konferans ba�lat�lam�yor (%s)."
-
-#: src/protocols/novell/novell.c:569
-#, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
-msgstr "Kullan�c� %s klas�r� %s sunucu taraf� listesinde ta��nam�yor. Klas�r yaratmada hata (%s)."
-
-#: src/protocols/novell/novell.c:617
-#, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
-msgstr "Kullan�c� listenize %s eklenemedi. Sunucu taraf� listesinde klas�r yaratma hatas� (%s)."
-
-#: src/protocols/novell/novell.c:690
-#, c-format
-msgid "Could not get details for user %s (%s)."
-msgstr "%s i�in bilgiler al�namad� (%s)"
-
-#: src/protocols/novell/novell.c:736
-#: src/protocols/novell/novell.c:882
-#, c-format
-msgid "Unable to add user to privacy list (%s)."
-msgstr "Kullan�c� �zel listeye eklenemedi (%s)"
-
-#: src/protocols/novell/novell.c:783
-#, c-format
-msgid "Unable to add %s to deny list (%s)."
-msgstr "%s engelleme listesine eklenemedi (%s)."
-
-#: src/protocols/novell/novell.c:836
-#, c-format
-msgid "Unable to add %s to permit list (%s)."
-msgstr "%s izinli listeye eklenemedi (%s)."
-
-#: src/protocols/novell/novell.c:904
-#, c-format
-msgid "Unable to remove %s from privacy list (%s)."
-msgstr "%s �gesini gizlilik listesinden silerken hata (%s)"
-
-#: src/protocols/novell/novell.c:927
-#: src/protocols/novell/novell.c:1628
-#, c-format
-msgid "Unable to change server side privacy settings (%s)."
-msgstr "Sunucu tarafl� gizilik ayarlar�n� de�i�tirmede hata. (%s)."
-
-#: src/protocols/novell/novell.c:999
-#, c-format
-msgid "Unable to create conference (%s)."
-msgstr "Konferans olu�turulamad� (%s)."
-
-#: src/protocols/novell/novell.c:1110
-#: src/protocols/novell/novell.c:1667
-msgid "Error communicating with server. Closing connection."
-msgstr "Sunucuyla ileti�imde hata. Ba�lant� kapat�l�yor."
-
-#: src/protocols/novell/novell.c:1452
-msgid "Telephone Number"
-msgstr "Telefon Numaras�"
-
-#: src/protocols/novell/novell.c:1456
-msgid "Department"
-msgstr "�ube"
-
-#: src/protocols/novell/novell.c:1458
-msgid "Personal Title"
-msgstr "Ba�l�k"
-
-#: src/protocols/novell/novell.c:1462
-msgid "Mailstop"
-msgstr "Mailstop"
-
-#: src/protocols/novell/novell.c:1464
-#: src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
-msgid "Email Address"
-msgstr "E-posta adresi:"
-
-#: src/protocols/novell/novell.c:1480
-msgid "User ID"
-msgstr "Ki�i ID"
-
-#. tag = _("DN");
-#. value = nm_user_record_get_dn(user_record);
-#. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
-#. tag, value);
-#. }
-#.
-#: src/protocols/novell/novell.c:1494
-msgid "Full name"
-msgstr "Tam Ad"
-
-#: src/protocols/novell/novell.c:1618
-#, c-format
-msgid "GroupWise Conference %d"
-msgstr "GroupWise Konferans� %d"
-
-#: src/protocols/novell/novell.c:1643
-msgid "Unable to make SSL connection to server."
-msgstr "Sunucuya SSL ba�lant�s� yap�lam�yor."
-
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr "Olay� ger�ekle�tirirken hata (%s)."
-
-#: src/protocols/novell/novell.c:1707
-msgid "Authenticating..."
-msgstr "Kimlik do�rulan�yor..."
-
-#: src/protocols/novell/novell.c:1719
-msgid "Unable to connect to server."
-msgstr "Ana bilgisayara ba�lan�lamad�"
-
-#: src/protocols/novell/novell.c:1722
-msgid "Waiting for response..."
-msgstr "Cevap i�in bekleniyor..."
-
-#: src/protocols/novell/novell.c:1857
-#, c-format
-msgid "%s has been invited to this conversation."
-msgstr "%s bu yaz��maya davet edildi."
-
-#: src/protocols/novell/novell.c:1885
-msgid "Invitation to Conversation"
-msgstr "Yaz��maya Davet"
-
-#: src/protocols/novell/novell.c:1886
-#, c-format
-msgid ""
-"Invitation from: %s\n"
-"\n"
-"Sent: %s"
-msgstr ""
-"Davet eden: %s\n"
-"\n"
-"G�nderilen: %s"
-
-#: src/protocols/novell/novell.c:1888
-msgid "Would you like to join the conversation?"
-msgstr "Yaz��maya kat�lmak ister misiniz?"
-
-#: src/protocols/novell/novell.c:1995
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Oturumunuz kapand�, ba�ka bir yerden oturum a�t�n�z"
-
-#: src/protocols/novell/novell.c:2051
-#, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
-msgstr "%s �evrimd��� g�z�k�yor ve hen�z g�nderdi�iniz iletileri alam�yor."
-
-#. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
-msgstr "Sunucuya ba�lan�lamad�. L�tfen ba�lanmak istedi�iniz adresi giriniz."
-
-#: src/protocols/novell/novell.c:2171
-msgid "Error. SSL support is not installed."
-msgstr "Hata. SSL deste�i kurulmam��."
-
-#: src/protocols/novell/novell.c:2475
-msgid "This conference has been closed. No more messages can be sent."
-msgstr "Bu konferans kapand�. Art�k mesajlar g�nderilmeyecek."
-
-#: src/protocols/novell/novell.c:2965
-#: src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
-msgid "Appear Offline"
-msgstr "�evrimd��� G�r�n"
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr "Novell GroupWise Messenger Protokolü Eklentisi"
+
+#: ../libpurple/protocols/novell/novell.c:3545
+msgid "Server address"
+msgstr "Sunucu adresi"
+
+#: ../libpurple/protocols/novell/novell.c:3549
+msgid "Server port"
+msgstr "Sunucu portu"
+
+#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
+#: ../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 "Sunucu bağlantıyı kapattı."
+
+#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr ""
+"Sunucu ile bağlantı kesildi:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
+#: ../libpurple/proxy.c:1449
+msgid "Received invalid data on connection with server."
+msgstr "Sunucu bağlantısından geçersiz veri alındı."
+
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Sunucu ile bağlantı sağlanamadı:\n"
+"%s"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
+msgid "AIM Protocol Plugin"
+msgstr "AIM Protokolü Eklentisi"
 
 #. *< type
 #. *< ui_requirement
@@ -7670,501 +6273,482 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540
-#: src/protocols/novell/novell.c:3542
-msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr ""
-
-#: src/protocols/novell/novell.c:3561
-msgid "Server address"
-msgstr "Sunucu adresi"
-
-#: src/protocols/novell/novell.c:3565
-msgid "Server port"
-msgstr "Sunucu portu"
-
-#: src/protocols/oscar/oscar.c:202
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Protokolü Eklentisi"
+
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
+msgid "Encoding"
+msgstr "Kodlama"
+
+#: ../libpurple/protocols/oscar/odc.c:40
+msgid "The remote user has closed the connection."
+msgstr "Uzaktaki kullanıcı bağlantıyı kapattı."
+
+#: ../libpurple/protocols/oscar/odc.c:42
+msgid "The remote user has declined your request."
+msgstr "Uzaktaki kullanıcı isteğinizi kabul etmedi."
+
+#: ../libpurple/protocols/oscar/odc.c:44
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:47
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:49
+msgid "Could not establish a connection with the remote user."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/odc.c:560
+msgid "Direct IM established"
+msgstr "Doğrudan Anında Mesajlaşma sağlandı"
+
+#: ../libpurple/protocols/oscar/oft.c:657
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
-msgstr "Ge�ersiz hata"
-
-#: src/protocols/oscar/oscar.c:203
+msgstr "Geçersiz hata"
+
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
-msgstr "Ge�ersiz SNAC"
-
-#: src/protocols/oscar/oscar.c:204
+msgstr "Geçersiz SNAC"
+
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
-msgstr "Host'u De�erlendir"
-
-#: src/protocols/oscar/oscar.c:205
+msgstr "Hostu değerlendir"
+
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:207
+msgstr "İstemciyi değerlendir"
+
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
-msgstr "Bu servis ge�ici olarak hizmet d���d�r."
-
-#: src/protocols/oscar/oscar.c:208
+msgstr "Bu servis hizmet dışı"
+
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr "Servis belirtilmedi"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:210
+msgstr "Gereksiz SNAC"
+
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
-msgstr "Sunucu taraf�ndan desteklenmiyor"
-
-#: src/protocols/oscar/oscar.c:211
+msgstr "Sunucu tarafından desteklenmiyor"
+
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
-msgstr "�stemci taraf�ndan desteklenmiyor"
-
-#: src/protocols/oscar/oscar.c:212
+msgstr "İstemci tarafından desteklenmiyor"
+
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
-msgstr "�stemci reddetti"
-
-#: src/protocols/oscar/oscar.c:213
+msgstr "İstemci tarafından reddedildi"
+
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
-msgstr "Cevap �ok uzun"
-
-#: src/protocols/oscar/oscar.c:214
+msgstr "Yanıtçok uzun"
+
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
-msgstr "Cevaplar kay�p"
-
-#: src/protocols/oscar/oscar.c:215
+msgstr "Yanıtlar kayıp"
+
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
-msgstr "�stek reddedildi"
-
-#: src/protocols/oscar/oscar.c:216
+msgstr "İstek reddedildi"
+
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:217
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr "Yetersiz hak"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:219
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
-msgstr "�ok G�nahkar (yollay�c�)"
-
-#: src/protocols/oscar/oscar.c:220
+msgstr "Çok Günahkar (yollayıcı)"
+
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
-msgstr "�ok G�nahkar (al�c�)"
-
-#: src/protocols/oscar/oscar.c:221
+msgstr "Çok Günahkar (alıcı)"
+
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
-msgstr "Kullan�c� ge�ici olarak hizmet d���"
-
-#: src/protocols/oscar/oscar.c:222
+msgstr "Kullanıcı geçici olarak erişilemez durumda"
+
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
-msgstr "E�lenen yok"
-
-#: src/protocols/oscar/oscar.c:223
+msgstr "Eşlenen yok"
+
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
-msgstr "Liste ta�mas�"
-
-#: src/protocols/oscar/oscar.c:224
+msgstr "Liste taşması"
+
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
-msgstr "Belirsiz �ste�i"
-
-#: src/protocols/oscar/oscar.c:225
+msgstr "İstek berlirsizliği"
+
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr "Liste dolu"
 
-#: src/protocols/oscar/oscar.c:226
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
-msgstr "AOL'de de�il"
-
-#: src/protocols/oscar/oscar.c:417
-#: src/protocols/oscar/oscar.c:502
-msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:616
+msgstr "AOL'de değil"
+
+#: ../libpurple/protocols/oscar/oscar.c:330
+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 "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:439
+#, 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 ""
+
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+msgid "Buddy Icon"
+msgstr "Kişi Simgesi"
+
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "Ses"
 
-#: src/protocols/oscar/oscar.c:619
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-#: src/protocols/oscar/oscar.c:622
-#: src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+msgstr "AIM Doğrudan IM"
+
+#: ../libpurple/protocols/oscar/oscar.c:630
+#: ../libpurple/protocols/silc/silc.c:687
+#: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Sohbet"
 
-#: src/protocols/oscar/oscar.c:625
-#: src/protocols/oscar/oscar.c:7898
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
-msgstr "Dosyay� Al"
-
-#: src/protocols/oscar/oscar.c:632
+msgstr "Dosyayı Al"
+
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "Oyunlar"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "Eklentiler"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
-msgstr "Liste G�nder"
-
-#: src/protocols/oscar/oscar.c:641
+msgstr "Kişi Listesi Gönder"
+
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
-
-#: src/protocols/oscar/oscar.c:644
+msgstr "ICQ Doğrudan Bağlantı"
+
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
-msgstr "AP Kullan�c�s�"
-
-#: src/protocols/oscar/oscar.c:647
+msgstr "AP Kullanıcısı"
+
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
-msgstr "Nihilit"
-
-#: src/protocols/oscar/oscar.c:653
+msgstr "Nihilist"
+
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:656
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "Eski ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
-msgstr "Trillian �ifrelemesi"
-
-#: src/protocols/oscar/oscar.c:662
+msgstr "Trillian Şifrelemesi"
+
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:665
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:668
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
-msgstr "G�venlik Aktif"
-
-#: src/protocols/oscar/oscar.c:671
+msgstr "Güvenlik Aktif"
+
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
-msgstr "G�r�nt�l� Sohbet"
-
-#: src/protocols/oscar/oscar.c:675
+msgstr "Görüntülü Sohbet"
+
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
-msgstr "Canl� G�r�nt�"
-
-#: src/protocols/oscar/oscar.c:681
+msgstr "Canlı Görüntü"
+
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:699
-#: src/protocols/oscar/oscar.c:7781
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
-msgstr "Sohbet i�in Bekliyor"
-
-#: src/protocols/oscar/oscar.c:703
-#: src/protocols/oscar/oscar.c:7796
+msgstr "Sohbet için Hazır"
+
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
-msgstr "Mevcut De�il"
-
-#: src/protocols/oscar/oscar.c:705
-#: src/protocols/oscar/oscar.c:7786
+msgstr "Erişilebilir Değil"
+
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
-msgstr "Me�gul"
-
-#: src/protocols/oscar/oscar.c:709
+msgstr "Meşgul"
+
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:786
-#: src/protocols/oscar/oscar.c:5050
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
+msgid "Invisible"
+msgstr "Görünmez"
+
+#: ../libpurple/protocols/oscar/oscar.c:721
+msgid "Online"
+msgstr "Çevrimiçi"
+
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+msgid "IP Address"
+msgstr "IP Adresi"
+
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
-msgstr "Uyar� Seviyesi"
-
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "Yetenekler"
-
-#: src/protocols/oscar/oscar.c:801
+msgstr "Uyarı Seviyesi"
+
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
-msgstr "Ki�i Hakk�nda Yorum"
-
-#: src/protocols/oscar/oscar.c:958
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "%s ile anl�k mesajla�ma kapat�ld�"
-
-#: src/protocols/oscar/oscar.c:960
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "%s ile anl�k mesajla�ma yap�lamad�."
-
-#: src/protocols/oscar/oscar.c:968
-msgid "Direct Connect failed"
-msgstr "Direk Ba�lant� hatas�"
-
-#: src/protocols/oscar/oscar.c:1045
-#: src/protocols/oscar/oscar.c:1176
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "%s ile anl�k mesajla�ma sa�land�"
-
-#: src/protocols/oscar/oscar.c:1126
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "%s kullan�c�s�na aktif mesajla�ma ba�lanma %s:%hu saatinde deneniyor."
-
-#: src/protocols/oscar/oscar.c:1547
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "%s kullan�c�s�na anl�k mesajla�ma i�in ba�lanma iste�i soruldu. (%s:%hu)"
-
-#: src/protocols/oscar/oscar.c:1552
-msgid "Unable to open Direct IM"
-msgstr "Direct IM a��lamad�"
-
-#: src/protocols/oscar/oscar.c:1587
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "%s ile direkt anl�k mesajlla�ma ba�lant�s�n� a�may� se�tiniz."
-
-#: src/protocols/oscar/oscar.c:1591
-msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
-msgstr "��nk� bu IP adresinizi g�sterir ve bu bir g�venlik tehdidi i�erir. Devam etmek istiyor musunuz?"
-
-#: src/protocols/oscar/oscar.c:1595
-#: src/protocols/oscar/oscar.c:4361
-msgid "Connect"
-msgstr "Ba�lan"
-
-#: src/protocols/oscar/oscar.c:1661
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "%s sohbet odas�yla ba�lant�n�z� kayvettiniz."
-
-#: src/protocols/oscar/oscar.c:1684
-msgid "Chat is currently unavailable"
-msgstr "Sohbet ge�ici olarak hizmet d���d�r."
-
-#: src/protocols/oscar/oscar.c:1754
+msgstr "Kişi Hakkında Yorum"
+
+#: ../libpurple/protocols/oscar/oscar.c:977
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr ""
+"Kimlik doğrulaması için sunucuya bağlanılamıyor:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:985
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
+msgstr ""
+"BOS sunucuya bağlanılamadı:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
-msgstr "Kay�tl� isim g�nderildi"
-
-#: src/protocols/oscar/oscar.c:1770
-#, c-format
-msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Oturum a��lamad�: %s olarak ba�lan�lamad�, ��nk� ad�n�z uygun de�il. Takma adlar bir hafle ba�lamal� ve harfler, rakamlar, bo�luk ile devam etmelidir."
-
-#: src/protocols/oscar/oscar.c:1799
-msgid "Unable to login to AIM"
-msgstr "AIM'de oturum a��lam�yor"
-
-#: src/protocols/oscar/oscar.c:1903
-#: src/protocols/oscar/oscar.c:2846
-msgid "Could Not Connect"
-msgstr "Ba�lan�lamad�"
-
-#: src/protocols/oscar/oscar.c:1911
+msgstr "Kayıtlı isim gönderildi"
+
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
-msgstr "Ba�lant� kuruldu, �erezler yolland�"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
-msgid "Attempting connection redirect..."
-msgstr "Ba�lant� y�nlendirmesi deneniyor..."
-
-#. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/ICQ."
-msgstr ""
-"%s dosyas�n�n transferi zaman a��m�na u�rad�.\n"
-"Dosya transferleri i�in proxy ayarlar�n� aktifle�tirmek i�in Ara�lar->Tercihler->AIM/ICQ b�l�m�ne gidiniz."
-
-#: src/protocols/oscar/oscar.c:2206
-#: src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
-msgid "Unable to establish file descriptor."
-msgstr "Dosya a��klay�c�s� (tan�mlay�c�s�) kurulamad�."
-
-#: src/protocols/oscar/oscar.c:2211
-msgid "Unable to create new connection."
-msgstr "Yeni ba�lant� kurulamad�"
-
-#: src/protocols/oscar/oscar.c:2445
-#: src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468
-#: src/protocols/oscar/oscar.c:2478
-msgid "Unable to log into file transfer proxy."
-msgstr "Dosya aktar�m proxy'si dosyaya kaydedilemiyor."
-
-#: src/protocols/oscar/oscar.c:2532
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2733
-#: src/protocols/toc/toc.c:543
-msgid "Incorrect nickname or password."
-msgstr "Yanl�� nickname (takma ad) veya parola"
-
-#: src/protocols/oscar/oscar.c:2738
+msgstr "Bağlantı kuruldu, çerezler yollandı"
+
+#. TODO: Don't call this with ssi
+#: ../libpurple/protocols/oscar/oscar.c:1059
+msgid "Finalizing connection"
+msgstr "Bağlantı sonlandırılıyor"
+
+#: ../libpurple/protocols/oscar/oscar.c:1243
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must either start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Oturum açılamadı: %s olarak bağlanılamadı, çünkü adınız uygun değil. Takma "
+"adlar bir hafle başlamalı ve harfler, rakamlar, boşluk ile devam etmelidir."
+
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
+msgid "Invalid screen name."
+msgstr "Geçersiz kullanıcı adı"
+
+#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
+msgid "Incorrect password."
+msgstr "Yanlış parola."
+
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
-msgstr "Hesab�n�z �uan i�in durdurulmu�tur."
+msgstr "Hesabınız şuan için durdurulmuştur."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "AOL Instant Messenger (Anl�k �leti) Servisi ge�ici olarak servis d���."
-
-#: src/protocols/oscar/oscar.c:2747
-msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
-msgstr "�ok s�k ba�lan�p kopuyorsunuz. L�tfen on dakika bekledikten sonra tekrar deneyin. E�er denemeye devam ederseniz daha uzun beklemek zorunda kalacaks�n�z."
-
-#: src/protocols/oscar/oscar.c:2752
+msgstr "AOL Instant Messenger (Anlık İleti) Servisi geçici olarak servis dışı."
+
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Çok sık bağlanıp kopuyorsunuz. Lütfen on dakika bekledikten sonra tekrar "
+"deneyin. Eğer denemeye devam ederseniz daha uzun beklemek zorunda "
+"kalacaksınız."
+
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Program versiyonunuz �ok eski. L�tfen g�ncelleyin: %s"
-
-#: src/protocols/oscar/oscar.c:2783
-msgid "Internal Error"
-msgstr "�� hata"
-
-#: src/protocols/oscar/oscar.c:2853
+msgstr "İstemci sürümünüz çok eski. Lütfen şuadan güncelleyin: %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1394
+msgid "Could Not Connect"
+msgstr "Bağlanılamadı"
+
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
-msgstr "�zin al�nd�."
-
-#: src/protocols/oscar/oscar.c:2877
+msgstr "İzin alındı."
+
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
-msgstr "SecurID anahtar� ge�ersiz."
-
-#: src/protocols/oscar/oscar.c:2891
+msgstr "Girilen SecurID anahtarı geçersiz."
+
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
-msgstr "SecurID (g�venlik nosu) Giriniz"
-
-#: src/protocols/oscar/oscar.c:2892
+msgstr "SecurID (güvenlik nosu) Giriniz"
+
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
-msgstr "Dijital g�r�n�mden 6 rakam� giriniz."
-
-#: src/protocols/oscar/oscar.c:2932
-#: src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
-#, c-format
-msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
-msgstr "K�sa bir s�reli�ine ba�lant� kopmu� olabilir. Bu onar�lana kadar TOC kullanmal�s�n�z. G�ncellemeler i�in ziyaret edin : %s "
-
-#: src/protocols/oscar/oscar.c:2935
-#: src/protocols/oscar/oscar.c:2965
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr "Gaim doru AIM giri� hash'i alamad�."
-
-#: src/protocols/oscar/oscar.c:3054
-msgid "Gaim was unable to get a valid login hash."
-msgstr "Gaim do�ru giri� hash'ini alam�yor."
-
-#: src/protocols/oscar/oscar.c:3085
+msgstr "Dijital görünümden 6 rakamı giriniz."
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
+msgid "_OK"
+msgstr "_Tamam"
+
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+"Kısa bir süreliğine bağlantı kopmuş olabilir. Bu onarılana kadar TOC "
+"kullanmalısınız. Güncellemeler için ziyaret edin : %s "
+
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
+msgid "Unable to get a valid AIM login hash."
+msgstr "Geçerli AIM giriş hash'i alınamadı."
+
+#: ../libpurple/protocols/oscar/oscar.c:1610
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Kısa bir süreliğine bağlantı koptu.  Güncellemeler için %s adresine bakın."
+
+#: ../libpurple/protocols/oscar/oscar.c:1613
+msgid "Unable to get a valid login hash."
+msgstr "Geçerli bir giriş hash'i alınamadı."
+
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
-msgstr "�ifre g�nderildi"
-
-#: src/protocols/oscar/oscar.c:4352
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s direkt olarak %s �gesine ba�lanmak i�in izin istedi"
-
-#: src/protocols/oscar/oscar.c:4355
-msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
-msgstr "Bu iki bilgisayar aras�nda direkt bir ba�lant� gerektirir ve anl�k ileti resimleri i�in gereklidir. ��nk� IP adresiniz g�sterilecek, bu da bir g�venlik tehdidi olu�turabilir."
-
-#: src/protocols/oscar/oscar.c:4394
+msgstr "Parola gönderildi"
+
+#: ../libpurple/protocols/oscar/oscar.c:1695
+msgid "Unable to initialize connection"
+msgstr "Bağlantı başlatılamadı"
+
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "L�tfen bana izin ver, bu �ekilde seni arkada� listeme ekleyebilirim."
-
-#: src/protocols/oscar/oscar.c:4402
+msgstr "Lütfen bana izin ver, bu şekilde seni arkadaş listeme ekleyebilirim."
+
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
-msgstr "�zin �steme Mesaj�:"
-
-#: src/protocols/oscar/oscar.c:4403
+msgstr "İzin İsteme İletisi:"
+
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
-msgstr "L�tfen seni eklememe izin ver."
-
-#: src/protocols/oscar/oscar.c:4433
-#, c-format
-msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
-msgstr "%s kullan�c�s� listeye eklemek i�in izin istiyor. Bir izin iste�i g�ndermek istiyor musunuz?"
-
-#: src/protocols/oscar/oscar.c:4438
-#: src/protocols/oscar/oscar.c:4440
-msgid "Request Authorization"
-msgstr "�zin �ste"
-
-#: src/protocols/oscar/oscar.c:4478
-#: src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588
-#: src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234
-#: src/protocols/oscar/oscar.c:7286
+msgstr "Lütfen sizi eklememe izin verin!"
+
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
-msgstr "Sebep yaz�lmam��."
-
-#: src/protocols/oscar/oscar.c:4483
+msgstr "Sebep yazılmamış."
+
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
-msgstr "�zin Reddetme Mesaj�:"
-
-#: src/protocols/oscar/oscar.c:4590
-#, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"%u kullan�c�s� %s �gesini �u sebepten dolay� ki�i listesine eklemek istiyor:\n"
+msgstr "İzin Reddetme İletisi:"
+
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
-
-#: src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:7246
-msgid "Authorization Request"
-msgstr "�zin �ste�i"
-
-#: src/protocols/oscar/oscar.c:4612
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+msgstr ""
+"%u kullanıcısı onu kişi listenize eklemenize şu sebepten dolayı izin "
+"vermiyor:\n"
 "%s"
-msgstr ""
-"%u kullan�c�s� onu ki�i listenize eklemenize �u sebepten dolay� izin vermiyor:\n"
-"%s"
-
-#: src/protocols/oscar/oscar.c:4613
+
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
-msgstr "ICQ izin (yetkisi) reddedildi."
+msgstr "ICQ izni (yetkisi) reddedildi."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "%u kullan�c�s� onu ki�i listenize eklemenize izin verdi."
-
-#: src/protocols/oscar/oscar.c:4628
+msgstr "%u kullanıcısı onu kişi listenize eklemenize izin verdi."
+
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8172,12 +6756,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"�zel bir mesaj ald�n�z\n"
+"Özel bir mesaj aldınız\n"
 "\n"
 "Kimden: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8185,12 +6769,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"Bir ICQ sayfas� ald�n�z\n"
+"Bir ICQ sayfası aldınız\n"
 "\n"
 "Kimden: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8198,570 +6782,1205 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"%s den bir ICQ e-postas� ald�n�z [%s]\n"
+"%s den bir ICQ e-postası aldınız [%s]\n"
 "\n"
 "Mesaj:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "ICQ kullan�c�s� %u size bir arkada� yollad�: %s (%s)"
-
-#: src/protocols/oscar/oscar.c:4671
+msgstr "ICQ kullanıcısı %u size bir arkadaş yolladı: %s (%s)"
+
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Bunu arkada� listenize eklemek istiyor musunuz?"
-
-#: src/protocols/oscar/oscar.c:4675
-msgid "Decline"
-msgstr "Reddet"
-
-#: src/protocols/oscar/oscar.c:4759
+msgstr "Bunu arkadaş listenize eklemek istiyor musunuz?"
+
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "_Ekle"
+
+#: ../libpurple/protocols/oscar/oscar.c:2468
+msgid "_Decline"
+msgstr "_Reddet"
+
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] "%hu mesaj� %s g�nderinden ge�ersiz oldu�u i�in ka��rd�n�z."
-
-#: src/protocols/oscar/oscar.c:4768
+msgstr[0] "%hu mesajı %s gönderinden geçersiz olduğu için kaçırdınız."
+
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] "%hu mesaj� %s g�nderinden �ok uzun oldu�u i�in ka��rd�n�z."
-
-#: src/protocols/oscar/oscar.c:4777
+msgstr[0] "%hu mesajı %s gönderinden çok uzun olduğu için kaçırdınız."
+
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "%hu mesaj� %s g�nderinden limiti a�t���n�z i�in ka��rd�n�z."
-
-#: src/protocols/oscar/oscar.c:4786
+msgstr[0] "%hu mesajı %s gönderinden limiti aştığınız için kaçırdınız."
+
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
-msgstr[0] "%hu mesaj� %s g�nderinden, o �ok g�nahkar oldu�u i�in ka��rd�n�z."
-
-#: src/protocols/oscar/oscar.c:4795
+msgstr[0] "%hu mesajı %s gönderinden, o çok günahkar olduğu için kaçırdınız."
+
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] "%hu mesaj� %s g�nderinden �ok g�nahkar oldu�unuz i�in ka��rd�n�z."
-
-#: src/protocols/oscar/oscar.c:4804
+msgstr[0] "%hu mesajı %s gönderinden çok günahkar olduğunuz için kaçırdınız."
+
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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] "%hu mesaj� %s g�nderinden bilinmeyen bir sebepten dolay� ka��rd�n�z."
-
-#: src/protocols/oscar/oscar.c:4863
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Durum:</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:4924
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr "SNAC f�rlatma hatas�: %s\n"
+msgstr[0] "%hu mesajı %s gönderinden bilinmeyen bir sebepten dolayı kaçırdınız."
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
-msgstr "Mesaj g�nderilemedi: %s"
-
-#: src/protocols/oscar/oscar.c:4961
-#: src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024
-#: src/protocols/oscar/oscar.c:5028
+msgstr "Mesaj gönderilemedi: %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "Bilinmeyen Sebep."
 
-#: src/protocols/oscar/oscar.c:4964
+#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
-msgstr "Mesaj %s e g�nderilemedi:"
-
-#: src/protocols/oscar/oscar.c:5024
+msgstr "Mesaj %s e gönderilemedi:"
+
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
-msgstr "%s kullan�c� bilgisi mevcut de�il."
-
-#: src/protocols/oscar/oscar.c:5027
+msgstr "%s kullanıcı bilgisi mevcut değil."
+
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
-msgstr "%s adl� kullan�c�n�n bilgisi mevcut de�il."
-
-#: src/protocols/oscar/oscar.c:5054
+msgstr "%s adlı kullanıcının bilgisi mevcut değil."
+
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
-msgstr "Ba�l� oldu�u s�re:"
-
-#: src/protocols/oscar/oscar.c:5059
-#: src/protocols/yahoo/yahoo_profile.c:1118
+msgstr "Bağlı olduğu süre:"
+
+#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
-msgstr "�ye oldu�u s�re:"
-
-#: src/protocols/oscar/oscar.c:5142
+msgstr "Üye olduğu süre:"
+
+#: ../libpurple/protocols/oscar/oscar.c:2861
+msgid "Capabilities"
+msgstr "Yetenekler"
+
+#: ../libpurple/protocols/oscar/oscar.c:2891
+msgid "Available Message"
+msgstr "Erişilebilir İletisi"
+
+#: ../libpurple/protocols/oscar/oscar.c:2917
+msgid "Profile"
+msgstr "Profil"
+
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
-msgstr "AIM ba�lant�n�z kaybolmu� olabilir."
+msgstr "AIM bağlantınız kaybolmuş olabilir."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
-msgstr "[��erdi�i ge�ersiz karakterlerden dolay� bu kullan�c�dan gelen mesaj g�sterilemiyor.]"
-
-#: src/protocols/oscar/oscar.c:5554
-msgid "Rate limiting error."
-msgstr "De�erlendirme limiti hatas�."
-
-#: src/protocols/oscar/oscar.c:5555
-msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
-msgstr "Yapt���n�z son i�lem ger�ekle�tirilemiyor ��nk� deneme limitini a�t�n�z. L�tfen 10 saniye daha bekleyin ve tekrar deneyin."
-
-#: src/protocols/oscar/oscar.c:5631
+#: ../libpurple/protocols/oscar/oscar.c:3181
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[İçerdiği geçersiz karakterlerden dolayı bu kullanıcıdan gelen mesaj "
+"gösterilemiyor.]"
+
+#: ../libpurple/protocols/oscar/oscar.c:3384
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+"Yaptığınız son işlem gerçekleştirilemiyor çünkü deneme limitini aştınız. "
+"Lütfen 10 saniye daha bekleyin ve tekrar deneyin."
+
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
-msgstr "Bilinmeyen bir sebepten dolay� oturumunuz kapand�."
-
-#: src/protocols/oscar/oscar.c:5644
-#: src/protocols/toc/toc.c:971
+msgstr "Bilinmeyen bir sebepten dolayı oturumunuz kapandı."
+
+#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "%s sohbet odas�ndan ba�lant�n�z koptu."
-
-#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
-msgid "Finalizing connection"
-msgstr "Ba�lant� Sonu�land�r�l�yor"
-
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5977
-#: src/protocols/silc/util.c:541
+msgstr "%s sohbet odasından bağlantınız koptu."
+
+#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Cep Telefonu"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "Bayan"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr " Bay"
-
-#: src/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
-msgstr "Ki�isel Web Sayfas�"
-
-#: src/protocols/oscar/oscar.c:5999
+msgstr "Kişisel Web Sayfası"
+
+#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Ek Bilgi"
 
-#: src/protocols/oscar/oscar.c:6004
-msgid "Home Address"
-msgstr "Ev Adresi"
-
-#: src/protocols/oscar/oscar.c:6008
-#: src/protocols/oscar/oscar.c:6016
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "Posta Kodu"
 
-#: src/protocols/oscar/oscar.c:6012
-msgid "Work Address"
-msgstr "�� Adresi"
-
-#: src/protocols/oscar/oscar.c:6020
-msgid "Work Information"
-msgstr "�� Bilgileri"
-
-#: src/protocols/oscar/oscar.c:6021
-msgid "Company"
-msgstr "�irket"
-
-#: src/protocols/oscar/oscar.c:6022
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
-msgstr "B�l�m"
-
-#: src/protocols/oscar/oscar.c:6023
+msgstr "Bölüm"
+
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "Pozisyon"
 
-#: src/protocols/oscar/oscar.c:6025
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
-msgstr "Web Sayfas�"
-
-#: src/protocols/oscar/oscar.c:6082
+msgstr "Web Sayfası"
+
+#: ../libpurple/protocols/oscar/oscar.c:3808
+msgid "Work Information"
+msgstr "İş Bilgileri"
+
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
-msgstr "A��l�r Pencere Mesaj�"
-
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, c-format
-msgid "The following screen names are associated with %s"
-msgstr "�u g�r�nt� isimleri %s ile ili�kilendirilmi�"
-
-#: src/protocols/oscar/oscar.c:6140
+msgstr "Açılır Pencere Mesajı"
+
+#: ../libpurple/protocols/oscar/oscar.c:3904
+#, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "Katyıtlı olan şu isimler %s ile ilişkilendirilmiş"
+
+#: ../libpurple/protocols/oscar/oscar.c:3909
+msgid "Screen name"
+msgstr "Kayıtlı isim"
+
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
-msgstr "%s e-posta adresi i�in sonu� bulunamad�"
-
-#: src/protocols/oscar/oscar.c:6161
+msgstr "%s e-posta adresi için sonuç bulunamadı"
+
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
-msgstr "%s onay� soracak bir e-posta almal�s�n�z."
-
-#: src/protocols/oscar/oscar.c:6163
+msgstr "%s onayı soracak bir e-posta almalısınız."
+
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
-msgstr "Hesap Do�rulama �stendi"
-
-#: src/protocols/oscar/oscar.c:6194
+msgstr "Hesap Doğrulama İstendi"
+
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
-msgstr "Hesap Bilgileri De�i�tirilirken Hata"
-
-#: src/protocols/oscar/oscar.c:6197
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
-msgstr "Hata 0x%04x: G�r�nt� ad� bi�imlendirilemiyor. ��nk� orjinal addan farkl�."
-
-#: src/protocols/oscar/oscar.c:6200
+msgstr "Hesap Bilgileri Değiştirilirken Hata"
+
+#: ../libpurple/protocols/oscar/oscar.c:3992
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr "Hata 0x%04x: Görüntü adı biçimlendirilemiyor. Çünkü orjinal addan farklı."
+
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "Hata 0x%04x: G�r�nt� ismi bi�imlendirilemiyor ��nk� ge�ersiz."
-
-#: src/protocols/oscar/oscar.c:6203
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
-msgstr "Hata 0x%04x: G�r�nt� ismi bi�imlendirilemiyor ��nk� istedi�iniz isim �ok uzun."
-
-#: src/protocols/oscar/oscar.c:6206
-#, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
-msgstr "Hata 0x%04x: E-posta adresi bi�imlendirilemiyor ��nk� zaten bir g�r�nt� ad� de�i�tirmesi bekleniyor."
-
-#: src/protocols/oscar/oscar.c:6209
-#, 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 "Hata 0x%04x: E-posta adresi bi�imlendirilemiyor ��nk� birden fazla g�r�nt� ad� bu adresle e�le�tirilmi�."
-
-#: src/protocols/oscar/oscar.c:6212
-#, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
-msgstr "Hata 0x%04x: E-posta adresi bi�imlendirilemiyor ��nk� ge�ersiz."
-
-#: src/protocols/oscar/oscar.c:6215
+msgstr "Hata 0x%04x: Görüntü ismi biçimlendirilemiyor çünkü geçersiz."
+
+#: ../libpurple/protocols/oscar/oscar.c:3998
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+"Hata 0x%04x: Görüntü ismi biçimlendirilemiyor çünkü istediğiniz isim çok "
+"uzun."
+
+#: ../libpurple/protocols/oscar/oscar.c:4001
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because there is already a "
+"request pending for this screen name."
+msgstr ""
+"Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü zaten bir görüntü adı "
+"değiştirmesi bekleniyor."
+
+#: ../libpurple/protocols/oscar/oscar.c:4004
+#, 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 ""
+"Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü birden fazla görüntü "
+"adı bu adresle eşleştirilmiş."
+
+#: ../libpurple/protocols/oscar/oscar.c:4007
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address is "
+"invalid."
+msgstr "Hata 0x%04x: E-posta adresi biçimlendirilemiyor çünkü geçersiz."
+
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr "Hata 0x%04x: Bilin�eyen hata"
-
-#: src/protocols/oscar/oscar.c:6225
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"G�r�nt� ad�n�z ��yle bi�imlendirildi:\n"
-"%s"
-
-#: src/protocols/oscar/oscar.c:6226
-#: src/protocols/oscar/oscar.c:6233
+msgstr "Hata 0x%04x: Bilinöeyen hata"
+
+#: ../libpurple/protocols/oscar/oscar.c:4020
+#, c-format
+msgid "The e-mail address for %s is %s"
+msgstr "%s için e-posta adresi %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "Hesap Bilgileri"
 
-#: src/protocols/oscar/oscar.c:6231
-#, c-format
-msgid "The e-mail address for %s is %s"
-msgstr "%s i�in e-posta adresi %s"
-
-#: src/protocols/oscar/oscar.c:6298
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "IM Resminiz g�nderilemedi. Anl�k ileti resminizi g�nderebilmeniz i�in Direkt Ba�lanm�� olman�z gerekmektedir."
-
-#: src/protocols/oscar/oscar.c:6480
+msgstr ""
+"IM Resminiz gönderilemedi. Anlık ileti resminizi gönderebilmeniz için Direkt "
+"Bağlanmış olmanız gerekmektedir."
+
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "AIM profili belirlenemiyor"
 
-#: src/protocols/oscar/oscar.c:6481
-msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
-msgstr "Muhtemelen oturum a�ma prosed�r� tamamlanmadan profilinizi de�i�tirmeye �al��t�n�z. Profiliniz belirsizle�tirildi, tamamen ba�land���n�zda tekrar ayarlamay� deneyin."
-
-#: src/protocols/oscar/oscar.c:6495
-#, c-format
-msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
-msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
-msgstr[0] "Maksimum profil uzunlu�u%d bayt(harf) a��ld�. Gaim sizin yerinize onu k�saltt�."
-
-#: src/protocols/oscar/oscar.c:6500
+#: ../libpurple/protocols/oscar/oscar.c:4440
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+"Muhtemelen oturum açma prosedürü tamamlanmadan profilinizi değiştirmeye "
+"çalıştınız. Profiliniz belirsizleştirildi, tamamen bağlandığınızda tekrar "
+"ayarlamayı deneyin."
+
+#: ../libpurple/protocols/oscar/oscar.c:4454
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] "Maksimum profil uzunluğu olan %d bayt aşıldığından profiliniz kısaltıldı."
+
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
-msgstr "Profil �ok uzun"
-
-#: src/protocols/oscar/oscar.c:6523
-#: src/protocols/oscar/oscar.c:6596
-#, c-format
-msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
-msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
-msgstr[0] "Maksimum d��ar�da mesaj� uzunlu�u%d bayt(harf) a��ld�. Gaim sizin yerinize onu k�saltt�."
-
-#: src/protocols/oscar/oscar.c:6528
-#: src/protocols/oscar/oscar.c:6601
+msgstr "Profil çok uzun."
+
+#: ../libpurple/protocols/oscar/oscar.c:4504
+#, 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.  It has been "
+"truncated for you."
+msgstr[0] "Maksimum uzakta iletisi uzunluğu %d bayt aşıldığından iletiniz kısaltıldı."
+
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
-msgstr "D��ar�da mesaj�n�z �ok uzun."
-
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "AIM D��ar�da mesaj� belirlenemiyor"
-
-#: src/protocols/oscar/oscar.c:6561
-msgid "You have probably requested to set your away message before the login procedure completed.  You remain in a \"present\" state; try setting it again when you are fully connected."
-msgstr "Muhtemelen oturum a�ma prosed�r� tamamlanmadan d��ar�da mesaj�n�z� de�i�tirmeye �al��t�n�z. �imdiki durumunuzda kalacaks�n�z, tamamen ba�land���n�zda de�i�tirmeyi deneyin."
-
-#: src/protocols/oscar/oscar.c:6691
-#, c-format
-msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "%s ki�isi eklenemiyor ��nk� g�r�nt� ad� ge�ersiz. G�r�nt� ad� bir harfle ba�lamal� ve sadece harf, rakam, bo�luk ve numaralarla devam etmelidir."
-
-#: src/protocols/oscar/oscar.c:6693
-#: src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106
-#: src/protocols/simple/simple.c:203
+msgstr "Uzakta iletiniz çok uzun."
+
+#: ../libpurple/protocols/oscar/oscar.c:4578
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers."
+msgstr ""
+"%s kişisi eklenemiyor çünkü görüntü adı geçersiz. Görüntü adı bir harfle "
+"başlamalı ve sadece harf, rakam, boşluk ve numaralarla devam etmelidir."
+
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "Eklenemiyor"
 
-#: src/protocols/oscar/oscar.c:6798
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
-msgstr "Ki�i Listesi Getirme Hatas�"
-
-#: src/protocols/oscar/oscar.c:6799
-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 ge�ici olarak arkada� listenizi AIM sunucular�ndan alam�yor. Arkada� listeniz kaybolmam��t�r, birka� saat i�inde yeniden aktif olacakt�r."
-
-#: src/protocols/oscar/oscar.c:6983
-#: src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989
-#: src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151
-#: src/protocols/oscar/oscar.c:7156
+msgstr "Kişi Listesi Getirme Hatası"
+
+#: ../libpurple/protocols/oscar/oscar.c:4685
+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 sunucuları kişi listenizi gönderebilmeniz açısından geçici olarak "
+"erişilemez durumda.  Kişi listeniz kaybolmadı, muhtemelen birkaç saat içinde "
+"yeniden aktif olacaktır."
+
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7090
-#, c-format
-msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
-msgstr "%s ki�isi eklenemedi ��nk� ki�i listenizde �ok ki�i var. Bir tanesini silin ve i�lemi tekrarlay�n."
-
-#: src/protocols/oscar/oscar.c:7090
-#: src/protocols/oscar/oscar.c:7104
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#, c-format
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+"%s kişisi eklenemedi çünkü kişi listenizde çok kişi var. Bir tanesini silin "
+"ve işlemi tekrarlayın."
+
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(isimsiz)"
 
-#: src/protocols/oscar/oscar.c:7104
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
-msgstr "%s ki�isi bilinmeyen bir sebepten dolay� eklenemedi. Genelde bu problemin sebebi ki�i listenizde izin verilen say�da ki�iden fazlay� ekleyememenizdir."
-
-#: src/protocols/oscar/oscar.c:7187
-#, c-format
-msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7193
+#: ../libpurple/protocols/oscar/oscar.c:5015
+#, c-format
+msgid ""
+"Could not add the buddy %s for an unknown reason.  The most common reason "
+"for this is that you have the maximum number of allowed buddies in your "
+"buddy list."
+msgstr ""
+"%s kişisi bilinmeyen bir sebepten dolayı eklenemedi. Genelde bu problemin "
+"sebebi kişi listenizde izin verilen sayıda kişiden fazlayı ekleyememenizdir."
+
+#: ../libpurple/protocols/oscar/oscar.c:5108
+#, c-format
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "Yetki Verildi"
 
-#: src/protocols/oscar/oscar.c:7237
-#, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
-"%s"
-msgstr ""
-"%s kullan�c�s� %s kullan�c�s�n� listesine �u sebepten eklemek istiyor:\n"
-"%s"
-
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "%s kullan�c�s� onu listenize ekleme iznini sa�lad�."
-
-#: src/protocols/oscar/oscar.c:7283
+msgstr "%s kullanıcısı onu listenize ekleme iznini sağladı."
+
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
-msgstr "�zin Sa�land�"
+msgstr "İzin Sağlandı"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
-msgstr "%s kullan�c�s� onu listenize ekleme iznini vermiyor. �u sebepten: n%s"
-
-#: src/protocols/oscar/oscar.c:7287
+msgstr "%s kullanıcısı onu listenize ekleme iznini vermiyor. Şu sebepten: n%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
-msgstr "�zin Verilmedi"
-
-#: src/protocols/oscar/oscar.c:7324
-#: src/protocols/toc/toc.c:1372
+msgstr "İzin Verilmedi"
+
+#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
-msgstr "_De�i�im:"
-
-#: src/protocols/oscar/oscar.c:7360
+msgstr "_Değişim:"
+
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
-msgstr "Ge�ersiz sohbet ad� belirlendi."
-
-#: src/protocols/oscar/oscar.c:7430
+msgstr "Geçersiz sohbet adı belirlendi."
+
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Anl�k �letici (IM) resminiz yollanmad�. AIM sohbetlerinde ki�isel g�r�nt�leri yollayamazs�n�z."
-
-#: src/protocols/oscar/oscar.c:7565
+msgstr ""
+"Anlık İletici (IM) resminiz yollanmadı. AIM sohbetlerinde kişisel "
+"görüntüleri yollayamazsınız."
+
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
-msgstr "D��ar�da Mesaj�"
-
-#: src/protocols/oscar/oscar.c:7854
+msgstr "Uzakta İletisi"
+
+#: ../libpurple/protocols/oscar/oscar.c:5484
+msgid "<i>(retrieving)</i>"
+msgstr "<i>(alınıyor)</i>"
+
+#: ../libpurple/protocols/oscar/oscar.c:5684
+msgid "iTunes Music Store Link"
+msgstr "iTunes Müzik Deposu Bağlantısı"
+
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "%s ki�isi i�in A��klama"
-
-#: src/protocols/oscar/oscar.c:7855
+msgstr "%s kişisi için açıklama"
+
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
-msgstr "Ki�i A��klamas�:"
-
-#: src/protocols/oscar/oscar.c:7874
+msgstr "Kişi Açıklaması:"
+
+#: ../libpurple/protocols/oscar/oscar.c:5840
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "%s ile direkt anlık mesajllaşma bağlantısını açmayı seçtiniz."
+
+#: ../libpurple/protocols/oscar/oscar.c:5844
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Çünkü bu IP adresinizi gösterir ve bu bir güvenlik tehdidi içerir.  Devam "
+"etmek istiyor musunuz?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5850
+msgid "C_onnect"
+msgstr "_Bağlan"
+
+#: ../libpurple/protocols/oscar/oscar.c:5885
+msgid "Get AIM Info"
+msgstr "AIM Bilgilerini Al"
+
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
-msgstr "Ki�i A��klamas� D�zenle"
-
-#: src/protocols/oscar/oscar.c:7880
+msgstr "Kişi Açıklaması Düzenle"
+
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
-msgstr "Durum Mesaj� Al"
-
-#: src/protocols/oscar/oscar.c:7892
+msgstr "Durum İletisi Al"
+
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
-msgstr "_Mesaj penceresi"
-
-#: src/protocols/oscar/oscar.c:7909
+msgstr "Doğrudan IM"
+
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
-msgstr "Yeniden �zin �ste"
-
-#: src/protocols/oscar/oscar.c:7969
+msgstr "Yeniden İzin İste"
+
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
-msgstr "�zin Gerekiyor"
-
-#: src/protocols/oscar/oscar.c:7972
-msgid "Hide IP address"
-msgstr "IP Adresi Gizle"
-
-#: src/protocols/oscar/oscar.c:7975
-msgid "Web aware"
-msgstr "Web aware"
-
-#: src/protocols/oscar/oscar.c:7980
+msgstr "İzin gereksin"
+
+#: ../libpurple/protocols/oscar/oscar.c:5996
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
-msgstr "ICQ Gizlilik Se�enekleri"
-
-#: src/protocols/oscar/oscar.c:7997
+msgstr "ICQ Gizlilik Seçenekleri"
+
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "The new formatting is invalid."
-msgstr "Yeni bi�imlendirme ge�ersiz."
-
-#: src/protocols/oscar/oscar.c:7998
+msgstr "Yeni biçimlendirme geçersiz."
+
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:8005
-msgid "New screen name formatting:"
-msgstr "Yeni ekran ad� bi�imlendirmesi:"
-
-#: src/protocols/oscar/oscar.c:8057
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
-msgstr "Adresi �una De�i�tir:"
-
-#: src/protocols/oscar/oscar.c:8102
+msgstr "Adresi Şöyle Değiştir:"
+
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>izin i�in beklemiyorsunuz</i>"
-
-#: src/protocols/oscar/oscar.c:8105
+msgstr "<i>izin için beklemiyorsunuz</i>"
+
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
-msgstr "�u kullan�c�lardan izin bekliyorsunuz"
-
-#: src/protocols/oscar/oscar.c:8106
-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr "Kullan�c�ya sa� t�klay�p \"Yeniden �zin �ste\" ye t�klayarak yeniden bu kullan�c�dan izin isteyebilirsiniz."
-
-#: src/protocols/oscar/oscar.c:8123
+msgstr "Şu kullanıcılardan izin bekliyorsunuz"
+
+#: ../libpurple/protocols/oscar/oscar.c:6124
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"Kullanıcıya sağ tıklayıp \"Yeniden İzin İste\" ye tıklayarak yeniden bu "
+"kullanıcıdan izin isteyebilirsiniz."
+
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
-msgstr "E-Posta ile Arkada� Bul"
-
-#: src/protocols/oscar/oscar.c:8124
+msgstr "E-Posta ile Arkadaş Bul"
+
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
-msgstr "E-Posta adresiyle bir arkada� ara"
-
-#: src/protocols/oscar/oscar.c:8125
+msgstr "E-Posta adresiyle bir arkadaş ara"
+
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Arad���n�z arkada��n e-posta adresini yaz�n."
-
-#: src/protocols/oscar/oscar.c:8212
-#: src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "Kullan�c� Bilgisini De�i�tir..."
-
-#: src/protocols/oscar/oscar.c:8218
+msgstr "Aradığınız arkadaşın e-posta adresini yazın."
+
+#: ../libpurple/protocols/oscar/oscar.c:6146
+msgid "_Search"
+msgstr "_Ara"
+
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
-msgstr "Kullan�c� Bilgisini De�i�tir (URL)..."
-
-#: src/protocols/oscar/oscar.c:8223
-#: src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "Parola De�i�tir"
-
-#: src/protocols/oscar/oscar.c:8229
+msgstr "Kullanıcı Bilgisini Ayarla (URL)..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
-msgstr "Parola De�i�tir (URL)"
-
-#: src/protocols/oscar/oscar.c:8233
+msgstr "Parola değiştir (URL)"
+
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
-msgstr "IM Y�nlendirmeyi yap�land�r (URL)"
+msgstr "IM Yönlendirmeyi yapılandır (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-msgid "Show privacy options..."
-msgstr "Gizlilik se�eneklerini g�ster..."
+#: ../libpurple/protocols/oscar/oscar.c:6329
+msgid "Set Privacy Options..."
+msgstr "Gizlilik Seçeneklerini Ayarla..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
-msgid "Format Screen Name..."
-msgstr "G�r�nt� Ad� Bi�imi..."
-
-#: src/protocols/oscar/oscar.c:8254
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
-msgstr "Hesab� Onayla"
-
-#: src/protocols/oscar/oscar.c:8258
-msgid "Display Currently Registered Address"
-msgstr "Kay�t olunmu� adresi g�ster"
-
-#: src/protocols/oscar/oscar.c:8262
-msgid "Change Currently Registered Address..."
-msgstr "Kay�t olunmu� adresi de�i�tir..."
-
-#: src/protocols/oscar/oscar.c:8269
+msgstr "Hesabı Doğrula"
+
+#: ../libpurple/protocols/oscar/oscar.c:6340
+msgid "Display Currently Registered E-Mail Address"
+msgstr "Halen Kayıtlı Olan E-posta Adreslerini Göster"
+
+#: ../libpurple/protocols/oscar/oscar.c:6344
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "Şimdiki Katıtlı Olunan E-posta Adresini Değiştir..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
-msgstr "�zin Bekleyen Ki�ileri G�ster"
-
-#: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by E-Mail..."
-msgstr "E-Posta ile arkada� ara"
-
-#: src/protocols/oscar/oscar.c:8280
+msgstr "İzin Bekleyen Kişileri Göster"
+
+#: ../libpurple/protocols/oscar/oscar.c:6357
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "E-Posta Adresine Göre Kişi Ara..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
-msgstr "Bilgiler ile arkada� ara"
-
-#: src/protocols/oscar/oscar.c:8350
+msgstr "Kişi Bilgilerine Göre Kişi Ara"
+
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
-msgstr "En son ki�i grubunu kullan"
-
-#: src/protocols/oscar/oscar.c:8353
+msgstr "En son kişi grubunu kullan"
+
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
-msgstr "Ne kadar s�redir ba�l� oldu�unuzu g�ster"
-
-#: src/protocols/oscar/oscar.c:8362
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr "AIM/ICQ proxy sunucusunu kullan (Daha Yava�/Daha G�venli/Genelde �al���r Halde)"
+msgstr "Ne kadar süredir bağlı olduğunuzu göster"
+
+#: ../libpurple/protocols/oscar/oscar.c:6588
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Dosya aktarımları için herzaman ICQ proxy sunucularını kullan\n"
+"(yavaştır ama IP adresinizi göstermez)"
+
+#: ../libpurple/protocols/oscar/peer.c:674
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "%s kullanıcısına anlık mesajlaşma için bağlanma isteği soruldu. (%s:%hu)"
+
+#: ../libpurple/protocols/oscar/peer.c:759
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "%s kullanıcısına bağlantı sağlanmaya çalışılıyor:%hu."
+
+#: ../libpurple/protocols/oscar/peer.c:833
+msgid "Attempting to connect via proxy server."
+msgstr "Bir proxy sunucu üzerinden bağlanmaya çalışılıyor."
+
+#: ../libpurple/protocols/oscar/peer.c:1010
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s direkt olarak %s ögesine bağlanmak için izin istedi"
+
+#: ../libpurple/protocols/oscar/peer.c:1014
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"Bu iki bilgisayar arasında direkt bir bağlantı gerektirir ve anlık ileti "
+"resimleri için gereklidir. Çünkü IP adresiniz gösterilecek, bu da bir "
+"güvenlik tehdidi oluşturabilir."
+
+#: ../libpurple/protocols/oscar/peer.c:1022
+msgid "_Connect"
+msgstr "_Bağlan"
+
+#: ../libpurple/protocols/qq/buddy_info.c:39
+msgid "Primary Information"
+msgstr "Öncelikli Bilgiler"
+
+#: ../libpurple/protocols/qq/buddy_info.c:41
+msgid "Personal Introduction"
+msgstr "Kişisel Giriş"
+
+#: ../libpurple/protocols/qq/buddy_info.c:42
+msgid "QQ Number"
+msgstr "QQ Numarası"
+
+#: ../libpurple/protocols/qq/buddy_info.c:47
+msgid "Country/Region"
+msgstr "Ülke/Bölge"
+
+#: ../libpurple/protocols/qq/buddy_info.c:48
+msgid "Province/State"
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_info.c:50
+msgid "Horoscope Symbol"
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_info.c:52
+msgid "Zodiac Sign"
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_info.c:53
+msgid "Blood Type"
+msgstr "Kan Grubu"
+
+#: ../libpurple/protocols/qq/buddy_info.c:54
+msgid "College"
+msgstr "Kolej"
+
+#: ../libpurple/protocols/qq/buddy_info.c:55
+msgid "Email"
+msgstr "E-Posta"
+
+#: ../libpurple/protocols/qq/buddy_info.c:57
+msgid "Zipcode"
+msgstr "Posta Kodu"
+
+#: ../libpurple/protocols/qq/buddy_info.c:58
+msgid "Cellphone Number"
+msgstr "Cep Numarası"
+
+#: ../libpurple/protocols/qq/buddy_info.c:59
+msgid "Phone Number"
+msgstr "Telefon Numarası"
+
+#: ../libpurple/protocols/qq/buddy_info.c:64
+msgid "Aquarius"
+msgstr "Kova"
+
+#: ../libpurple/protocols/qq/buddy_info.c:64
+msgid "Pisces"
+msgstr "Balık"
+
+#: ../libpurple/protocols/qq/buddy_info.c:64
+msgid "Aries"
+msgstr "Koç"
+
+#: ../libpurple/protocols/qq/buddy_info.c:64
+msgid "Taurus"
+msgstr "Boğa"
+
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Gemini"
+msgstr "İkizler"
+
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Cancer"
+msgstr "Yengeç"
+
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Leo"
+msgstr "Aslan"
+
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Virgo"
+msgstr "Başak"
+
+#: ../libpurple/protocols/qq/buddy_info.c:65
+msgid "Libra"
+msgstr "Terazi"
+
+#: ../libpurple/protocols/qq/buddy_info.c:66
+msgid "Scorpio"
+msgstr "Akrep"
+
+#: ../libpurple/protocols/qq/buddy_info.c:66
+msgid "Sagittarius"
+msgstr "Yay"
+
+#: ../libpurple/protocols/qq/buddy_info.c:66
+msgid "Capricorn"
+msgstr "Oğlak"
+
+#: ../libpurple/protocols/qq/buddy_info.c:71
+msgid "Rat"
+msgstr "Fare"
+
+#: ../libpurple/protocols/qq/buddy_info.c:71
+msgid "Ox"
+msgstr "Öküz"
+
+#: ../libpurple/protocols/qq/buddy_info.c:71
+msgid "Tiger"
+msgstr "Kaplan"
+
+#: ../libpurple/protocols/qq/buddy_info.c:71
+msgid "Rabbit"
+msgstr "Tavşan"
+
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Dragon"
+msgstr "Ejderha"
+
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Snake"
+msgstr "Yılan"
+
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Horse"
+msgstr "At"
+
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Goat"
+msgstr "Keçi"
+
+#: ../libpurple/protocols/qq/buddy_info.c:72
+msgid "Monkey"
+msgstr "Maymun"
+
+#: ../libpurple/protocols/qq/buddy_info.c:73
+msgid "Rooster"
+msgstr "Horoz"
+
+#: ../libpurple/protocols/qq/buddy_info.c:73
+msgid "Dog"
+msgstr "Köpek"
+
+#: ../libpurple/protocols/qq/buddy_info.c:73
+msgid "Pig"
+msgstr "Domuz"
+
+#: ../libpurple/protocols/qq/buddy_info.c:78
+msgid "Other"
+msgstr "Diğer"
+
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
+msgid "Modify my information"
+msgstr "Bilgilerimi düzenle"
+
+#: ../libpurple/protocols/qq/buddy_info.c:483
+msgid "Update my information"
+msgstr "Bilgilerimi güncelle"
+
+#: ../libpurple/protocols/qq/buddy_info.c:507
+msgid "Your information has been updated"
+msgstr "Bilgileriniz güncellendi"
+
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
+msgid "Invalid QQ Face"
+msgstr "Geçersiz QQ Yüzü"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:135
+#, c-format
+msgid "You rejected %d's request"
+msgstr "%d kişisinin isteğini kabul etmediniz"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:209
+#: ../libpurple/protocols/qq/group_opt.c:136
+msgid "Input your reason:"
+msgstr "Sebbinizi girin:"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:212
+msgid "Reject request"
+msgstr "İsteği reddet"
+
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
+msgid "Sorry, you are not my type..."
+msgstr "Üzgünüm, benim tipim değilsin..."
+
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
+msgid "Reject"
+msgstr "Reddet"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:277
+msgid "Add buddy with auth request fails"
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_opt.c:308
+msgid "You have successfully removed a buddy"
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_opt.c:336
+msgid "You have successfully removed yourself from a buddy"
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_opt.c:402
+#, c-format
+msgid "User %d needs authentication"
+msgstr "%d kullanıcısı kimlik doğrulamaya gereksinim duyuyor"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/group_join.c:134
+msgid "Input request here"
+msgstr "İsteğinizi buraya girin"
+
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/group_join.c:135
+msgid "Would you be my friend?"
+msgstr "Arkadaşım olmak ister misiniz?"
+
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/group_opt.c:142
+msgid "Send"
+msgstr "Gönder"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:416
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "%d kişisini kişi listenize eklediniz"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:513
+msgid "QQid Error"
+msgstr "QQ Kimlik Hatası"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:514
+msgid "Invalid QQid"
+msgstr "Geçersiz QQ Kimliği"
+
+#: ../libpurple/protocols/qq/group.c:65
+msgid "ID: "
+msgstr "Kimlik: "
+
+#: ../libpurple/protocols/qq/group.c:98
+msgid "Group ID"
+msgstr "Grup Kimliği"
+
+#: ../libpurple/protocols/qq/group.c:100
+msgid "Creator"
+msgstr "Oluşturucu"
+
+#: ../libpurple/protocols/qq/group.c:103
+msgid "Group Description"
+msgstr "Grup Tanımlaması"
+
+#: ../libpurple/protocols/qq/group.c:109
+msgid "Auth"
+msgstr "Yetki"
+
+#: ../libpurple/protocols/qq/group.c:119
+msgid "QQ Qun"
+msgstr "QQ Qun"
+
+#: ../libpurple/protocols/qq/group.c:120
+msgid "Please input external group ID"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group.c:121
+msgid "You can only search for permanent QQ groups\n"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:124
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "%d kullanıcısı %d grubuna katılmak istedi"
+
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
+#, c-format
+msgid "Reason: %s"
+msgstr "Sebep: %s"
+
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
+msgid "QQ Qun Operation"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:139
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
+msgid "Approve"
+msgstr "Onayla"
+
+#: ../libpurple/protocols/qq/group_im.c:178
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:219
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:255
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:289
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:290
+msgid "This group has been added to your buddy list"
+msgstr "Bu grup kişi listenize eklendi"
+
+#: ../libpurple/protocols/qq/group_internal.c:41
+msgid "I am not member"
+msgstr "Ben bir üye değilim"
+
+#: ../libpurple/protocols/qq/group_internal.c:44
+msgid "I am a member"
+msgstr "Ben bir üyeyim"
+
+#: ../libpurple/protocols/qq/group_internal.c:47
+msgid "I am applying to join"
+msgstr "Katılmak için başvuruyorum"
+
+#: ../libpurple/protocols/qq/group_internal.c:50
+msgid "I am the admin"
+msgstr "Ben yöneticiyim"
+
+#: ../libpurple/protocols/qq/group_internal.c:53
+msgid "Unknown status"
+msgstr "Bilinmeyen durum"
+
+#: ../libpurple/protocols/qq/group_join.c:80
+msgid "This group does not allow others to join"
+msgstr "Bu grup diğerlerinin katılmasına izin vermiyor"
+
+#: ../libpurple/protocols/qq/group_join.c:231
+msgid "You have successfully exited the group"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_join.c:255
+msgid "QQ Group Auth"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_join.c:256
+msgid "Your authorization operation has been accepted by the QQ server"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_join.c:327
+msgid "You inputted a group id outside the acceptable range"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_join.c:358
+msgid "Are you sure to exit this Qun?"
+msgstr "Bu Qun'dan çıkmak istediğinizden emin misiniz?"
+
+#: ../libpurple/protocols/qq/group_join.c:360
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_join.c:365
+msgid "Go ahead"
+msgstr "Doğru git"
+
+#: ../libpurple/protocols/qq/group_network.c:90
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr "Kod [0x%02X]: %s"
+
+#: ../libpurple/protocols/qq/group_network.c:91
+msgid "Group Operation Error"
+msgstr ""
+
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
+msgid "Do you wanna approve the request?"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_opt.c:234
+msgid "You have successfully modify Qun member"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_opt.c:304
+msgid "You have successfully modify Qun information"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_opt.c:391
+msgid "You have successfully created a Qun"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_opt.c:393
+msgid "Would you like to set up the Qun details now?"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_opt.c:397
+msgid "Setup"
+msgstr "Kur"
+
+#: ../libpurple/protocols/qq/im.c:430
+msgid "System Message"
+msgstr "Sistem İletisi"
+
+#: ../libpurple/protocols/qq/im.c:574
+msgid "Server ACK"
+msgstr "Sunucu ACK"
+
+#: ../libpurple/protocols/qq/im.c:574
+msgid "Send IM fail\n"
+msgstr "IM Gönderimi başarısız\n"
+
+#: ../libpurple/protocols/qq/keep_alive.c:85
+msgid "Keep alive error, seems connection lost!"
+msgstr ""
+
+#: ../libpurple/protocols/qq/login_logout.c:408
+msgid "Request login token error!"
+msgstr ""
+
+#: ../libpurple/protocols/qq/login_logout.c:486
+msgid "Unable to login, check debug log"
+msgstr "Oturum açılamıyor, hata aıklama kayıtlarına bakın"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#. TODO: Include error_message in the message below
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
+#: ../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 "Bağlanılamıyor."
+
+#: ../libpurple/protocols/qq/qq.c:186
+#, c-format
+msgid "Unknown-%d"
+msgstr "Bilinmeyen-%d"
+
+#: ../libpurple/protocols/qq/qq.c:209
+#, c-format
+msgid "%s Address"
+msgstr "%s Adres"
+
+#: ../libpurple/protocols/qq/qq.c:240
+msgid "Level"
+msgstr "Seviye"
+
+#: ../libpurple/protocols/qq/qq.c:278
+msgid "QQ: Available"
+msgstr "QQ: Uygun"
+
+#: ../libpurple/protocols/qq/qq.c:282
+msgid "QQ: Away"
+msgstr "QQ: Uzakta"
+
+#: ../libpurple/protocols/qq/qq.c:286
+msgid "QQ: Invisible"
+msgstr "QQ: Görünmez"
+
+#: ../libpurple/protocols/qq/qq.c:290
+msgid "QQ: Offline"
+msgstr "QQ: Çevrimdışı"
+
+#: ../libpurple/protocols/qq/qq.c:371
+msgid "Invalid name"
+msgstr "Geçersiz ad"
+
+#: ../libpurple/protocols/qq/qq.c:437
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>Şimdi Çevrimiçi</b>: %d<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:438
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>Son Yenileme:</b> %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:442
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>Bağlantı Kipi</b>: %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:443
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>Sunucunun IP numarası</b>: %s: %d<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:444
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>Benim Görünen IP numaram</b>: %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:449
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>Giriş Zamanı</b>: %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:450
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>Son Girişin IP numarası</b>: %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:451
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr "<b>Son Görülme Zamanı</b>: %s\n"
+
+#: ../libpurple/protocols/qq/qq.c:455
+msgid "Login Information"
+msgstr "Giriş Bilgileri"
+
+#: ../libpurple/protocols/qq/qq.c:531
+msgid "Modify My Information"
+msgstr "Bilgilerimi Düzenle"
+
+#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+msgid "Change Password"
+msgstr "Parola Değiştir"
+
+#: ../libpurple/protocols/qq/qq.c:537
+msgid "Show Login Information"
+msgstr "Giriş Bilgilerini Göster"
+
+#: ../libpurple/protocols/qq/qq.c:558
+msgid "Exit this QQ Qun"
+msgstr ""
+
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "Bu kişiyi engelle"
 
 #. *< type
 #. *< ui_requirement
@@ -8773,852 +7992,1278 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476
-#: src/protocols/oscar/oscar.c:8478
-msgid "AIM/ICQ Protocol Plugin"
-msgstr "AIM/ICQ Protokol Eklentisi"
-
-#: src/protocols/oscar/oscar.c:8497
-msgid "Auth host"
-msgstr "Yetki Hostu"
-
-#: src/protocols/oscar/oscar.c:8500
-msgid "Auth port"
-msgstr "Yetki Portu"
-
-#: src/protocols/oscar/oscar.c:8503
-#: src/protocols/zephyr/zephyr.c:2892
-msgid "Encoding"
-msgstr "Kodlama"
-
-#: src/protocols/sametime/sametime.c:1134
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+msgid "QQ Protocol\tPlugin"
+msgstr "QQ Protokolü\t Eklentisi"
+
+#: ../libpurple/protocols/qq/qq.c:750
+msgid "Login in TCP"
+msgstr ""
+
+#: ../libpurple/protocols/qq/qq.c:753
+msgid "Login Hidden"
+msgstr "Gizli Bağlan"
+
+#: ../libpurple/protocols/qq/qq_proxy.c:497
+msgid "Socket send error"
+msgstr "Soket gönderme hatası"
+
+#: ../libpurple/protocols/qq/qq_proxy.c:500
+msgid "Connection refused"
+msgstr "Bağlantı reddedildi"
+
+#: ../libpurple/protocols/qq/recv_core.c:309
+msgid "Socket error"
+msgstr "Soket hatası"
+
+#: ../libpurple/protocols/qq/recv_core.c:319
+msgid "Unable to read from socket"
+msgstr "Soketten okunamıyor"
+
+#: ../libpurple/protocols/qq/send_file.c:706
+#, c-format
+msgid "%d has declined the file %s"
+msgstr "%d dosyayı kabul etmedi %s"
+
+#: ../libpurple/protocols/qq/send_file.c:709
+#: ../libpurple/protocols/qq/send_file.c:738
+msgid "File Send"
+msgstr "Dosya Gönder"
+
+#: ../libpurple/protocols/qq/send_file.c:735
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr "%d şu dosyayı göndermekten vazgeçti %s"
+
+#: ../libpurple/protocols/qq/sendqueue.c:122
+msgid "Connection lost"
+msgstr "Bağlantı kapandı"
+
+#. cancel login progress
+#: ../libpurple/protocols/qq/sendqueue.c:130
+msgid "Login failed, no reply"
+msgstr "Oturum açma işlemi başarısız oldu, yanıt yok"
+
+#: ../libpurple/protocols/qq/sys_msg.c:112
+msgid "Do you wanna add this buddy?"
+msgstr "Bu kişiyi listenize eklemek istiyor musunuz?"
+
+#. only need to get value
+#: ../libpurple/protocols/qq/sys_msg.c:168
+#, c-format
+msgid "You have been added by %s"
+msgstr "%s tarafından eklendiniz"
+
+#: ../libpurple/protocols/qq/sys_msg.c:171
+msgid "Would like to add him?"
+msgstr "Onu eklemek ister misiniz?"
+
+#: ../libpurple/protocols/qq/sys_msg.c:178
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "%s sizi ekledi [%s]"
+
+#: ../libpurple/protocols/qq/sys_msg.c:194
+#, c-format
+msgid "User %s rejected your request"
+msgstr "%s kullanıcısı isteğinizi reddetti"
+
+#: ../libpurple/protocols/qq/sys_msg.c:214
+#, c-format
+msgid "User %s has approved your request"
+msgstr "%s kullanıcısı isteğinizi kabul etti."
+
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
+#, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s sizi [%s] olarak kişi listesine eklemek istiyor"
+
+#: ../libpurple/protocols/qq/sys_msg.c:242
+#, c-format
+msgid "Message: %s"
+msgstr "İleti: %s"
+
+#: ../libpurple/protocols/qq/sys_msg.c:264
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s kişi listenizde değil"
+
+#: ../libpurple/protocols/qq/sys_msg.c:266
+msgid "Would you like to add him?"
+msgstr "Onu eklemek ister misiniz?"
+
+#: ../libpurple/protocols/sametime/sametime.c:417
+msgid "Connection closed (writing)"
+msgstr "Bağlantı kapandı (yazılıyor)"
+
+#: ../libpurple/protocols/sametime/sametime.c:1290
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Grup Başlığı:</b> %s<br>"
+
+#: ../libpurple/protocols/sametime/sametime.c:1291
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1293
+#, c-format
+msgid "Info for Group %s"
+msgstr "Grup %s için Bilgiler"
+
+#: ../libpurple/protocols/sametime/sametime.c:1295
+msgid "Notes Address Book Information"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1327
+msgid "Invite Group to Conference..."
+msgstr "Grubu Konferansa Davet Et"
+
+#: ../libpurple/protocols/sametime/sametime.c:1337
+msgid "Get Notes Address Book Info"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
-msgstr "El S�k��ma G�nderiliyor"
-
-#: src/protocols/sametime/sametime.c:1139
+msgstr "El Sıkışma Gönderiliyor"
+
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "El S�k��ma Onay� i�in Bekleniyor"
-
-#: src/protocols/sametime/sametime.c:1144
+msgstr "El Sıkışma Onayı için Bekleniyor"
+
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "El s�k��ma onayland�, Oturum Yollan�yor"
-
-#: src/protocols/sametime/sametime.c:1149
+msgstr "El sıkışma onaylandı, Oturum Yollanıyor"
+
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
-msgstr "Oturum Onaylanmas� i�in bekleniyor"
-
-#: src/protocols/sametime/sametime.c:1154
+msgstr "Oturum Onaylanması için bekleniyor"
+
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
-msgstr "Oturum A�ma Y�nlendirildi"
-
-#: src/protocols/sametime/sametime.c:1159
+msgstr "Oturum Açma Yönlendirildi"
+
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
-msgstr "Ba�lan�l�yor"
-
-#: src/protocols/sametime/sametime.c:1163
+msgstr "Bağlanılıyor"
+
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
-msgstr "Oturum Onayland�"
-
-#: src/protocols/sametime/sametime.c:1168
-#, fuzzy
-msgid "Connected to Sametime Community Server"
-msgstr "Ana bilgisayara ba�lan�lamad�"
-
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
-msgid "Admin Alert"
-msgstr "Y�netici Uyar�s�"
-
-#: src/protocols/sametime/sametime.c:2758
-msgid "Active"
-msgstr "Aktif"
-
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid "Could not add the buddy %s because every simple user has to start with 'sip:'."
-msgstr "%s kullan�c�s� arkada� listenize eklenemiyor ��nk� her basit kullan�c� 'sip:' ile ba�lamak zorundad�r."
-
-#: src/protocols/simple/simple.c:1209
-msgid "Could not create listen socket"
-msgstr "Dinleme soketi yarat�lamad�"
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "IRC isimler bo�luk karakteri i�eremez"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Gadu-Gadu Protokol Eklentisi"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Gadu-Gadu Protokol Eklentisi"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr "Thomas Butter <butter@uni-mannheim.de>"
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr "Durumu Yay�mla (not: herkes sizi g�rebilir)"
-
-#: src/protocols/simple/simple.c:1434
-msgid "Use UDP"
-msgstr "UDP Kullan"
-
-#: src/protocols/simple/simple.c:1436
-msgid "Use Proxy"
-msgstr "Proxy Kullan"
-
-#: src/protocols/simple/simple.c:1438
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/protocols/silc/buddy.c:51
-#: src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544
-#: src/protocols/silc/buddy.c:711
-#: src/protocols/silc/ft.c:338
+msgstr "Oturum Onaylandı"
+
+#: ../libpurple/protocols/sametime/sametime.c:1539
+msgid "Starting Services"
+msgstr "Servisler Başlatılıyor"
+
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Bağlandı"
+
+#: ../libpurple/protocols/sametime/sametime.c:1645
+#, c-format
+msgid "A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1650
+msgid "Sametime Administrator Announcement"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1702
+msgid "Connection reset"
+msgstr "Bağlantı kesildi"
+
+#: ../libpurple/protocols/sametime/sametime.c:1709
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "Soket okuma hatası: %s"
+
+#. this is a regular connect, error out
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3726
+msgid "Unable to connect to host"
+msgstr "Ana bilgisayara bağlanılamadı"
+
+#: ../libpurple/protocols/sametime/sametime.c:1770
+#, c-format
+msgid "Announcement from %s"
+msgstr "%s kişisinden Anons"
+
+#: ../libpurple/protocols/sametime/sametime.c:1944
+msgid "Conference Closed"
+msgstr "Konferans Kapandı"
+
+#: ../libpurple/protocols/sametime/sametime.c:2403
+msgid "Unable to send message: "
+msgstr "İleti gönderilemedi: "
+
+#: ../libpurple/protocols/sametime/sametime.c:2959
+msgid "Place Closed"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3229
+msgid "Microphone"
+msgstr "Mikrofon"
+
+#: ../libpurple/protocols/sametime/sametime.c:3230
+msgid "Speakers"
+msgstr "Hoparlör"
+
+#: ../libpurple/protocols/sametime/sametime.c:3231
+msgid "Video Camera"
+msgstr "Video Kamera"
+
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "Dosya Aktarımı"
+
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
+msgid "Supports"
+msgstr "Destekler"
+
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
+msgid "External User"
+msgstr "Dış Kullanıcı"
+
+#: ../libpurple/protocols/sametime/sametime.c:3380
+msgid "Create conference with user"
+msgstr "Kullanıcı ile konfreans oluştur"
+
+#: ../libpurple/protocols/sametime/sametime.c:3381
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3385
+msgid "New Conference"
+msgstr "Yeni Konferans"
+
+#: ../libpurple/protocols/sametime/sametime.c:3387
+msgid "Create"
+msgstr "Oluştur"
+
+#: ../libpurple/protocols/sametime/sametime.c:3452
+msgid "Available Conferences"
+msgstr "Erişilebilir Konferanslar"
+
+#: ../libpurple/protocols/sametime/sametime.c:3458
+msgid "Create New Conference..."
+msgstr "Yeni Konferans Oluştur..."
+
+#: ../libpurple/protocols/sametime/sametime.c:3465
+msgid "Invite user to a conference"
+msgstr "Kullanıcıyı konferansa davet et"
+
+#: ../libpurple/protocols/sametime/sametime.c:3466
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3471
+msgid "Invite to Conference"
+msgstr "Konferansa Davet Et"
+
+#: ../libpurple/protocols/sametime/sametime.c:3562
+msgid "Invite to Conference..."
+msgstr "Konferansa Davet Et..."
+
+#: ../libpurple/protocols/sametime/sametime.c:3567
+msgid "Send TEST Announcement"
+msgstr "TEST Anonsu Gönder"
+
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4165
+msgid "Topic:"
+msgstr "Konu:"
+
+#: ../libpurple/protocols/sametime/sametime.c:3614
+msgid "No Sametime Community Server specified"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3636
+#, 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 ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3641
+msgid "Meanwhile Connection Setup"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:3642
+msgid "No Sametime Community Server Specified"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4135
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "Bilinmeyen (0x%04x)<br>"
+
+#: ../libpurple/protocols/sametime/sametime.c:4137
+msgid "Last Known Client"
+msgstr "Bilinen Son İstemci"
+
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
+msgid "User Name"
+msgstr "Kullanıcı Adı"
+
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
+msgid "Sametime ID"
+msgstr "Sametime Kimliği"
+
+#: ../libpurple/protocols/sametime/sametime.c:4328
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4329
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4334
+msgid "Select User"
+msgstr "Kullanıcı Seç"
+
+#: ../libpurple/protocols/sametime/sametime.c:4418
+msgid "Unable to add user: user not found"
+msgstr "Kullanıcı eklenemiyor: kullanıcı bulunamadı"
+
+#: ../libpurple/protocols/sametime/sametime.c:4420
+#, 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 ""
+
+#: ../libpurple/protocols/sametime/sametime.c:4425
+msgid "Unable to add user"
+msgstr "Kullanıcı eklenemedi"
+
+#: ../libpurple/protocols/sametime/sametime.c:5011
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"Dosya okuma hatası %s: \n"
+"%s.\n"
+
+#: ../libpurple/protocols/sametime/sametime.c:5146
+msgid "Remotely Stored Buddy List"
+msgstr "Uzakta Depolanmış Kişi Listesi"
+
+#: ../libpurple/protocols/sametime/sametime.c:5151
+msgid "Buddy List Storage Mode"
+msgstr "Kişi Listesi Depolama Kipi"
+
+#: ../libpurple/protocols/sametime/sametime.c:5154
+msgid "Local Buddy List Only"
+msgstr "Sadece Yerel Kişi Listesi"
+
+#: ../libpurple/protocols/sametime/sametime.c:5156
+msgid "Merge List from Server"
+msgstr "Arkadaş Listesini Sunucudak İle Birleştir"
+
+#: ../libpurple/protocols/sametime/sametime.c:5158
+msgid "Merge and Save List to Server"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5160
+msgid "Synchronize List with Server"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5215
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5255
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5309
+msgid "Unable to add group: group exists"
+msgstr "Grup eklenemedi: grup zaten var"
+
+#: ../libpurple/protocols/sametime/sametime.c:5310
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
+msgid "Unable to add group"
+msgstr "Grup eklenemedi"
+
+#: ../libpurple/protocols/sametime/sametime.c:5372
+msgid "Possible Matches"
+msgstr "Muhtemel Eşlemeler"
+
+#: ../libpurple/protocols/sametime/sametime.c:5388
+msgid "Notes Address Book group results"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5389
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5394
+msgid "Select Notes Address Book"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5437
+msgid "Unable to add group: group not found"
+msgstr "Grup eklenemedi: grup bulunamadı"
+
+#: ../libpurple/protocols/sametime/sametime.c:5439
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5480
+msgid "Notes Address Book Group"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5481
+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 ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5530
+#, c-format
+msgid "Search results for '%s'"
+msgstr "'%s' için arama sonuçları"
+
+#: ../libpurple/protocols/sametime/sametime.c:5531
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
+msgid "Search Results"
+msgstr "Arama Sonuçları"
+
+#: ../libpurple/protocols/sametime/sametime.c:5563
+msgid "No matches"
+msgstr "Eşlenen yok"
+
+#: ../libpurple/protocols/sametime/sametime.c:5564
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5568
+msgid "No Matches"
+msgstr "Eşlenen Yok"
+
+#: ../libpurple/protocols/sametime/sametime.c:5605
+msgid "Search for a user"
+msgstr "Bir kullanıcı ara"
+
+#: ../libpurple/protocols/sametime/sametime.c:5606
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5609
+msgid "User Search"
+msgstr "Kullanıcı Ara"
+
+#: ../libpurple/protocols/sametime/sametime.c:5622
+msgid "Import Sametime List..."
+msgstr "Sametime Listesi Ekle..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5626
+msgid "Export Sametime List..."
+msgstr "Sametime Listesi Aktar..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5630
+msgid "Add Notes Address Book Group..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5634
+msgid "User Search..."
+msgstr "Kullanıcı Ara..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5740
+msgid "Force login (ignore server redirects)"
+msgstr "Oturum açmayı zorla (sunucu yönlendirmelerini yoksay)"
+
+#. pretend to be Sametime Connect
+#: ../libpurple/protocols/sametime/sametime.c:5750
+msgid "Hide client identity"
+msgstr "İstemci kimliğini sakla"
+
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
-msgstr "<I>%s</I> �u anda a�da mevcut de�il"
-
-#: src/protocols/silc/buddy.c:52
-#: src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119
-#: src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128
-#: src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138
-#: src/protocols/silc/buddy.c:256
+msgstr "<I>%s</I> şu anda ağda mevcut değil"
+
+#: ../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 "Anahtar Uyu�umu"
-
-#: src/protocols/silc/buddy.c:53
+msgstr "Anahtar Uyuşumu"
+
+#: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
-msgstr "Anahtar uyu�mas� sa�lanamad�"
-
-#: src/protocols/silc/buddy.c:115
+msgstr "Anahtar uyuşması sağlanamadı"
+
+#: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
-msgstr "Anahtar uyu�mas� esanas�nda hata olu�tu"
-
-#: src/protocols/silc/buddy.c:119
+msgstr "Anahtar uyuşması esanasında hata oluştu"
+
+#: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
-msgstr "Anahtar Uyu�umu Ger�ekle�medi"
-
-#: src/protocols/silc/buddy.c:124
+msgstr "Anahtar Uyuşumu Gerçekleşmedi"
+
+#: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
-msgstr "Anahtar uyu�mas� esnas�nda zaman a��m�"
-
-#: src/protocols/silc/buddy.c:129
+msgstr "Anahtar uyuşması esnasında zaman aşımı"
+
+#: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
-msgstr "Anahtar uyu�mas� iptal edildi"
-
-#: src/protocols/silc/buddy.c:134
+msgstr "Anahtar uyuşması iptal edildi"
+
+#: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
-msgstr "Anahtar uyu�mas� zaten ba�lam��"
-
-#: src/protocols/silc/buddy.c:139
+msgstr "Anahtar uyuşması zaten başlamış"
+
+#: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
-msgstr "Anahtar uyu�mas� kendinizce ba�lat�lamaz"
-
-#: src/protocols/silc/buddy.c:257
-#: src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+msgstr "Anahtar uyuşması kendinizce başlatılamaz"
+
+#: ../libpurple/protocols/silc/buddy.c:258
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
-msgstr "Uzaktaki kullan�c� �uan a�da bulunmuyor"
-
-#: src/protocols/silc/buddy.c:293
-#, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
-msgstr "%s taraf�ndan anahtar uyu�mas� al�nd�. Anahtar uyu�mas�n� ger�ekle�tirmek istiyor musunuz?"
-
-#: src/protocols/silc/buddy.c:297
+msgstr "Uzaktaki kullanıcı şuan ağda bulunmuyor"
+
+#: ../libpurple/protocols/silc/buddy.c:295
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"%s tarafından anahtar uyuşması alındı. Anahtar uyuşmasını gerçekleştirmek "
+"istiyor musunuz?"
+
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"Uzaktaki kullanc� anahtar uyu�mas� i�in bekleniyor:\n"
+"Uzaktaki kullancı anahtar uyuşması için bekleniyor:\n"
 "Uzaktaki host: %s\n"
 "Uzaktaki port: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
-msgstr "Anahtar Uyu�umu �ste�i"
-
-#: src/protocols/silc/buddy.c:386
-#: src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+msgstr "Anahtar Uyuşumu İsteği"
+
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
-msgstr "Parolal� IM"
-
-#: src/protocols/silc/buddy.c:422
+msgstr "Parolalı IM"
+
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
-msgstr "IM Anahtar� ayarlanamad�"
-
-#: src/protocols/silc/buddy.c:464
+msgstr "IM Anahtarı ayarlanamadı"
+
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
-msgstr "IM Parolas� Belirle"
-
-#: src/protocols/silc/buddy.c:511
-#: src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278
-#: src/protocols/silc/ops.c:1289
+msgstr "IM Parolası Belirle"
+
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/ops.c:1494
+#: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Genel Anahtar Al"
 
-#: src/protocols/silc/buddy.c:547
-#: src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/buddy.c:549
+#: ../libpurple/protocols/silc/ops.c:1495
+#: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:634
-#: src/protocols/silc/buddy.c:1583
+msgstr "Public key eşlenemedi"
+
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
-msgstr "Genel Anahtar G�ster"
-
-#: src/protocols/silc/buddy.c:635
-#: src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+msgstr "Genel Anahtar Göster"
+
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
-msgstr "Genel Anahtar Y�klenemiyor"
-
-#: src/protocols/silc/buddy.c:712
-#: src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945
-#: src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1099
+msgstr "Genel Anahtar Yüklenemiyor"
+
+#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/ops.c:1087
+#: ../libpurple/protocols/silc/ops.c:1159
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1313
 msgid "User Information"
-msgstr "Kullan�c�n�n bilgisi"
-
-#: src/protocols/silc/buddy.c:713
-#: src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+msgstr "Kullanıcının bilgisi"
+
+#: ../libpurple/protocols/silc/buddy.c:714
+#: ../libpurple/protocols/silc/ops.c:1160
+#: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
-msgstr "Kullan�c� bilgisi al�nam�yor"
-
-#: src/protocols/silc/buddy.c:734
+msgstr "Kullanıcı bilgisi alınamıyor"
+
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
-msgstr "%s ki�isi g�venilir de�il"
-
-#: src/protocols/silc/buddy.c:737
-msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "%s kişisi güvenilir değil"
+
+#: ../libpurple/protocols/silc/buddy.c:738
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
 msgstr ""
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
-msgstr "A�..."
-
-#: src/protocols/silc/buddy.c:1037
+msgstr "Aç..."
+
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr "%s ki�isi �uan a�da de�il"
-
-#: src/protocols/silc/buddy.c:1040
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
-msgstr ""
-
-#: src/protocols/silc/buddy.c:1043
-msgid "Import..."
-msgstr "��e Aktar..."
-
-#: src/protocols/silc/buddy.c:1130
+msgstr "%s kişisi şuan ağda değil"
+
+#: ../libpurple/protocols/silc/buddy.c:1081
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+
+#: ../libpurple/protocols/silc/buddy.c:1085
+msgid "_Import..."
+msgstr "_İçeriye Aktar..."
+
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
-msgstr "Do�ru kullan�c�y� se�iniz"
-
-#: src/protocols/silc/buddy.c:1132
-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 "Ayn� genel anahtarda birden �ok kullan�c� bulundu. Arkada� listenize eklemek i�in listeden do�ru kullan�c�y� se�iniz."
-
-#: src/protocols/silc/buddy.c:1134
-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 "Ayn� adda birden �ok kullan�c� bulundu. Arkada� listenize eklemek i�in listeden do�ru kullan�c�y� se�iniz."
-
-#: src/protocols/silc/buddy.c:1415
+msgstr "Doğru kullanıcıyı seçiniz"
+
+#: ../libpurple/protocols/silc/buddy.c:1183
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"Aynı genel anahtarda birden çok kullanıcı bulundu. Arkadaş listenize eklemek "
+"için listeden doğru kullanıcıyı seçiniz."
+
+#: ../libpurple/protocols/silc/buddy.c:1185
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"Aynı adda birden çok kullanıcı bulundu. Arkadaş listenize eklemek için "
+"listeden doğru kullanıcıyı seçiniz."
+
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
-msgstr "Yanl�z"
-
-#: src/protocols/silc/buddy.c:1419
-#: src/protocols/silc/silc.c:56
+msgstr "Yanlız"
+
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "Keyifsiz"
 
-#: src/protocols/silc/buddy.c:1423
-#: src/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
-msgstr "Beni Uyand�r"
-
-#: src/protocols/silc/buddy.c:1425
-#: src/protocols/silc/silc.c:50
+msgstr "Beni Uyandır"
+
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperaktif"
 
-#: src/protocols/silc/buddy.c:1427
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434
-#: src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:662
+#: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Mutlu"
 
-#: src/protocols/silc/buddy.c:1436
-#: src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
-msgstr "�zg�n"
-
-#: src/protocols/silc/buddy.c:1438
-#: src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+msgstr "Üzgün"
+
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:666
+#: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
-msgstr "K�zg�n"
-
-#: src/protocols/silc/buddy.c:1440
-#: src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+msgstr "Kızgın"
+
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:668
+#: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
-msgstr "K�skan�"
-
-#: src/protocols/silc/buddy.c:1442
-#: src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+msgstr "Kıskanç"
+
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:670
+#: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
-msgstr "Mah�up"
-
-#: src/protocols/silc/buddy.c:1444
-#: src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+msgstr "Mahçup"
+
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:672
+#: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Yenilmez"
 
-#: src/protocols/silc/buddy.c:1446
-#: src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
-msgstr "A��k"
-
-#: src/protocols/silc/buddy.c:1448
-#: src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+msgstr "Aşık"
+
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:676
+#: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Uykulu"
 
-#: src/protocols/silc/buddy.c:1450
-#: src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:678
+#: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
-msgstr "S�k�lm��"
-
-#: src/protocols/silc/buddy.c:1452
-#: src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+msgstr "Sıkılmış"
+
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
-msgstr "Heyecanl�"
-
-#: src/protocols/silc/buddy.c:1454
-#: src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+msgstr "Heyecanlı"
+
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:682
+#: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
-msgstr "S�k�nt�l�"
-
-#: src/protocols/silc/buddy.c:1486
-#: src/protocols/silc/ops.c:982
+msgstr "Sıkıntılı"
+
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
-msgstr "Kullan�c� Modlar�"
-
-#: src/protocols/silc/buddy.c:1495
-#: src/protocols/silc/ops.c:991
+msgstr "Kullanıcı Modları"
+
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Ruh Hali"
 
-#: src/protocols/silc/buddy.c:1499
-#: src/protocols/silc/ops.c:997
-msgid "Status Text"
-msgstr "Durum Yaz�s�"
-
-#: src/protocols/silc/buddy.c:1504
-#: src/protocols/silc/ops.c:1003
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
-msgstr "�nerilen �rtibat"
-
-#: src/protocols/silc/buddy.c:1509
-#: src/protocols/silc/ops.c:1008
+msgstr "Önerilen İrtibat"
+
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
-msgstr "�nerilen Dil"
-
-#: src/protocols/silc/buddy.c:1514
-#: src/protocols/silc/ops.c:1013
+msgstr "Önerilen Dil"
+
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
-msgstr "Ayg�t"
-
-#: src/protocols/silc/buddy.c:1519
-#: src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702
-#: src/protocols/silc/silc.c:704
+msgstr "Aygıt"
+
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc/silc.c:730
+#: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Zaman Dilimi"
 
-#: src/protocols/silc/buddy.c:1524
-#: src/protocols/silc/ops.c:1023
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
-msgstr "Co�rafi B�lge"
-
-#: src/protocols/silc/buddy.c:1567
+msgstr "Coğrafi Bölge"
+
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
-msgstr "Anl�k �leti Anahtar�n� S�f�rla"
-
-#: src/protocols/silc/buddy.c:1572
+msgstr "Anlık İleti Anahtarını Sıfırla"
+
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
-msgstr "IM ile Anahtar De�i�im"
-
-#: src/protocols/silc/buddy.c:1576
+msgstr "IM ile Anahtar Değişim"
+
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
-msgstr "Parolal� IM"
-
-#: src/protocols/silc/buddy.c:1588
+msgstr "Parolalı IM"
+
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Genel(Public) Anahtar Al..."
 
-#: src/protocols/silc/buddy.c:1595
-#: src/protocols/silc/ops.c:1409
+#: ../libpurple/protocols/silc/buddy.c:1667
+#: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
-msgstr "Kullan�c�y� Blokla"
-
-#: src/protocols/silc/chat.c:38
+msgstr "Kullanıcıyı Blokla"
+
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
+msgid "Draw On Whiteboard"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Parola:"
 
-#: src/protocols/silc/chat.c:79
+#: ../libpurple/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr "%s kanal� a�da bulunmuyor"
-
-#: src/protocols/silc/chat.c:80
-#: src/protocols/silc/chat.c:172
+msgstr "%s kanalı ağda bulunmuyor"
+
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Kanal Bilgisi"
 
-#: src/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
-msgstr "Kanal bilgisi al�namad�"
-
-#: src/protocols/silc/chat.c:118
+msgstr "Kanal bilgisi alınamadı"
+
+#: ../libpurple/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "<b>Kanal Ad�:</b> %s"
-
-#: src/protocols/silc/chat.c:121
+msgstr "<b>Kanal Adı:</b> %s"
+
+#: ../libpurple/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<br><b>Kullan�c� say�s�:</b> %d"
-
-#: src/protocols/silc/chat.c:128
+msgstr "<br><b>Kullanıcı sayısı:</b> %d"
+
+#: ../libpurple/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanal kurucusu:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: ../libpurple/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>Kanal �ifresi:</b> %s"
-
-#: src/protocols/silc/chat.c:140
+msgstr "<br><b>Kanal şifresi:</b> %s"
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../libpurple/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanal HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: ../libpurple/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanal Konusu:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: ../libpurple/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>Kanal Modlar�:</b> "
-
-#: src/protocols/silc/chat.c:163
+msgstr "<br><b>Kanal Modları:</b> "
+
+#: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Kurucu Anahtar Parmakizi:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Kurucu Anahtar Babbleprint'i:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
-msgstr "Kanal �zel Anahtar� Ekle"
+msgstr "Kanal Özel Anahtarı Ekle"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
-msgstr "Kay�t Anahtar� A�..."
-
-#: src/protocols/silc/chat.c:398
+msgstr "Kayıt Anahtarı Aç..."
+
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
-msgstr "Kanal Parolas�"
-
-#: src/protocols/silc/chat.c:405
+msgstr "Kanal Parolası"
+
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
-msgstr "Kanal �zel Anahtarlar� Listele"
-
-#: src/protocols/silc/chat.c:410
-msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
-msgstr ""
-
-#: src/protocols/silc/chat.c:419
-#: src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457
-#: src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+msgstr "Kanal Özel Anahtarları Listele"
+
+#: ../libpurple/protocols/silc/chat.c:413
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:422
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "Yanal Yetkisi"
 
-#: src/protocols/silc/chat.c:421
-#: src/protocols/silc/chat.c:459
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
-msgstr "Ekle / Kald�r"
-
-#: src/protocols/silc/chat.c:576
+msgstr "Ekle / Kaldır"
+
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
-msgstr "Grup ad�"
-
-#: src/protocols/silc/chat.c:580
-#: src/protocols/silc/ops.c:1694
+msgstr "Grup adı"
+
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "Parola"
 
-#: src/protocols/silc/chat.c:591
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "%s kanal� �zel grup ad� ve parolas�n� giriniz."
-
-#: src/protocols/silc/chat.c:593
+msgstr "%s kanalı özel grup adı ve parolasını giriniz."
+
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
-msgstr "Kanal �zel Grubu Ekle"
-
-#: src/protocols/silc/chat.c:720
+msgstr "Kanal Özel Grubu Ekle"
+
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
-msgstr "Kullan�c� Limiti"
-
-#: src/protocols/silc/chat.c:721
+msgstr "Kullanıcı Limiti"
+
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "Kanaldaki kullan�c� limitini ayarla. S�f�rlamak i�in s�f�ra ayarlay�n."
-
-#: src/protocols/silc/chat.c:863
-msgid "Get Info"
-msgstr "Bilgiyi Al"
-
-#: src/protocols/silc/chat.c:871
+msgstr "Kanaldaki kullanıcı limitini ayarla. Sıfırlamak için sıfıra ayarlayın."
+
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "Davetli Listesi"
 
-#: src/protocols/silc/chat.c:876
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "Engelli Listesi"
 
-#: src/protocols/silc/chat.c:884
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
-msgstr "Grup ekle"
-
-#: src/protocols/silc/chat.c:897
+msgstr "Özel Grup Ekle"
+
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
-msgstr "S�f�rla"
-
-#: src/protocols/silc/chat.c:902
+msgstr "Sıfırla"
+
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "Ayarla"
 
-#: src/protocols/silc/chat.c:910
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
-msgstr "Kullan�c� Limitini De�i�tir"
-
-#: src/protocols/silc/chat.c:916
+msgstr "Kullanıcı Limitini Değiştir"
+
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
-msgstr "Konu Yasaklamas�n� S�f�rla"
-
-#: src/protocols/silc/chat.c:921
+msgstr "Konu Yasaklamasını Sıfırla"
+
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
-msgstr "Konu Yasaklamas� Belirle"
-
-#: src/protocols/silc/chat.c:928
+msgstr "Konu Yasaklaması Belirle"
+
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
-msgstr "�zel Kanal S�f�rla"
-
-#: src/protocols/silc/chat.c:933
+msgstr "Özel Kanal Sıfırla"
+
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
-msgstr "�zel Kanal Belirle"
-
-#: src/protocols/silc/chat.c:940
+msgstr "Özel Kanal Belirle"
+
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
-msgstr "Gizli Kanal S�f�rla"
-
-#: src/protocols/silc/chat.c:945
+msgstr "Gizli Kanal Sıfırla"
+
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Gizli Kanal Belirle"
 
-#: src/protocols/silc/chat.c:1008
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr "<I>%s</I> kanal�nda kurucusunuz"
-
-#: src/protocols/silc/chat.c:1012
+msgstr "<I>%s</I> kanalında kurucusunuz"
+
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr " <I>%s</I> kanal kurucusu <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid "You have to join the %s channel before you are able to join the private group"
-msgstr "�zel gruba kat�lmak i�in �nce %s kanal�na kat�lmal�s�n�z"
-
-#: src/protocols/silc/chat.c:1073
+msgstr "Özel gruba katılmak için önce %s kanalına katılmalısınız"
+
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
-msgstr "�zel Gruba Kat�l"
-
-#: src/protocols/silc/chat.c:1074
+msgstr "Özel Gruba Katıl"
+
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
-msgstr "�zel grubu kat�l�nam�yor"
-
-#: src/protocols/silc/chat.c:1267
-#: src/protocols/silc/silc.c:917
+msgstr "Özel grubu katılınamıyor"
+
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
+msgid "Call Command"
+msgstr "Komut Çalıştır"
+
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
-msgstr "Komut �a�r��t�r�lam�yor."
-
-#: src/protocols/silc/chat.c:1268
-#: src/protocols/silc/silc.c:918
+msgstr "Komut çağrıştırılamıyor."
+
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "Bilinmeyen komut"
 
-#: src/protocols/silc/ft.c:89
-#: src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96
-#: src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104
-#: src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210
-#: src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221
-#: src/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 "G�venli Dosya Transferi"
-
-#: src/protocols/silc/ft.c:90
-#: src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97
-#: src/protocols/silc/ft.c:101
-#: src/protocols/silc/ft.c:105
+msgstr "Güvenli Dosya Transferi"
+
+#: ../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 "Dosya Transferi Esnas�nda Hata"
-
-#: src/protocols/silc/ft.c:94
+msgstr "Dosya Transferi Esnasında Hata"
+
+#: ../libpurple/protocols/silc/ft.c:94
 msgid "Permission denied"
-msgstr "Giri� onaylanmad�"
-
-#: src/protocols/silc/ft.c:98
+msgstr "Giriş onaylanmadı"
+
+#: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
-msgstr "Anahtar Uyu�mazl���"
-
-#: src/protocols/silc/ft.c:102
+msgstr "Anahtar Uyuşmazlığı"
+
+#: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
-msgstr "Dosya transfer oturumu mevcut de�il"
-
-#: src/protocols/silc/ft.c:206
+msgstr "Dosya transfer oturumu mevcut değil"
+
+#: ../libpurple/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Aktif Dosya Transfer oturumu yok"
 
-#: src/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:211
 msgid "File transfer already started"
-msgstr "Dosya transveri zaten ba�lad�"
-
-#: src/protocols/silc/ft.c:216
+msgstr "Dosya transveri zaten başladı"
+
+#: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr "Dosya transferi i�in anahtar uyu�mas� yap�lam�yor"
-
-#: src/protocols/silc/ft.c:222
+msgstr "Dosya transferi için anahtar uyuşması yapılamıyor"
+
+#: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
-msgstr "Dosya transferi ba�lat�lam�yor"
-
-#: src/protocols/silc/ft.c:341
+msgstr "Dosya transferi başlatılamıyor"
+
+#: ../libpurple/protocols/silc/ft.c:341
 msgid "Cannot send file"
-msgstr "Dosya g�nderilemiyor"
-
-#: src/protocols/silc/ops.c:341
-#: src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+msgstr "Dosya gönderilemiyor"
+
+#: ../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 ki�isi <I>%s</I> konusunu %s olarak de�i�tirdi"
-
-#: src/protocols/silc/ops.c:425
+msgstr "%s kişisi <I>%s</I> konusunu %s olarak değiştirdi"
+
+#: ../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> kanal modunu %s olarak de�i�tirdi."
-
-#: src/protocols/silc/ops.c:429
+msgstr "<I>%s</I>, <I>%s</I> kanal modunu %s olarak değiştirdi."
+
+#: ../libpurple/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr "<I>%s</I> t�m kanal� temizledi, <I>%s</I> modlar�"
-
-#: src/protocols/silc/ops.c:462
+msgstr "<I>%s</I> tüm kanalı temizledi, <I>%s</I> modları"
+
+#: ../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>'n�n modlar�n� �una de�i�tirdi: %s "
-
-#: src/protocols/silc/ops.c:470
+msgstr "<I>%s</I> , <I>%s</I>'nın modlarını şuna değiştirdi: %s "
+
+#: ../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>'n�n t�m modlar�n� sildi"
-
-#: src/protocols/silc/ops.c:499
+msgstr "<I>%s</I>, <I>%s</I>'nın tüm modlarını sildi"
+
+#: ../libpurple/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "<I>%s</I>'den <I>%s</I> taraf�ndan kovuldunuz. (%s)"
-
-#: src/protocols/silc/ops.c:529
-#: src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+msgstr "<I>%s</I>'den <I>%s</I> tarafından kovuldunuz. (%s)"
+
+#: ../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 taraf�ndan at�ld�n�z. (%s)"
-
-#: src/protocols/silc/ops.c:560
-#: src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+msgstr "%s tarafından atıldınız. (%s)"
+
+#: ../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 taraf�ndan at�ld�n�z. (%s)"
-
-#: src/protocols/silc/ops.c:616
+msgstr "%s tarafından atıldınız. (%s)"
+
+#: ../libpurple/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr "Sunucu koptu"
 
-#: src/protocols/silc/ops.c:803
+#: ../libpurple/protocols/silc/ops.c:1017
 msgid "Personal Information"
-msgstr "Ki�isel Bilgiler"
-
-#: src/protocols/silc/ops.c:826
+msgstr "Kişisel Bilgiler"
+
+#: ../libpurple/protocols/silc/ops.c:1040
 msgid "Birth Day"
-msgstr "Do�um G�n�"
-
-#: src/protocols/silc/ops.c:830
-msgid "Job Title"
-msgstr "��"
-
-#: src/protocols/silc/ops.c:834
+msgstr "Doğum Günü"
+
+#: ../libpurple/protocols/silc/ops.c:1048
 msgid "Job Role"
-msgstr "�� Rol�"
-
-#: src/protocols/silc/ops.c:838
+msgstr "İş Rolü"
+
+#: ../libpurple/protocols/silc/ops.c:1052
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
-msgstr "�irket"
-
-#: src/protocols/silc/ops.c:842
+msgstr "Şirket"
+
+#: ../libpurple/protocols/silc/ops.c:1056
 msgid "Unit"
-msgstr "�nite"
-
-#: src/protocols/silc/ops.c:861
-msgid "EMail"
-msgstr "E-Posta"
-
-#: src/protocols/silc/ops.c:866
+msgstr "Ünite"
+
+#: ../libpurple/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Not"
 
-#: src/protocols/silc/ops.c:914
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Join Chat"
-msgstr "Sohbete Ba�la..."
-
-#: src/protocols/silc/ops.c:1070
-#: src/protocols/silc/ops.c:1140
+msgstr "Sohbete Başla..."
+
+#: ../libpurple/protocols/silc/ops.c:1183
+#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+msgid "Real Name"
+msgstr "Gerçek İsim"
+
+#: ../libpurple/protocols/silc/ops.c:1213
+msgid "Status Text"
+msgstr "Durum Yazısı"
+
+#: ../libpurple/protocols/silc/ops.c:1285
+#: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Genel Anahtar Parmakizi"
 
-#: src/protocols/silc/ops.c:1071
-#: src/protocols/silc/ops.c:1141
+#: ../libpurple/protocols/silc/ops.c:1286
+#: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Genel Anahtar Babble izi"
 
-#: src/protocols/silc/ops.c:1084
-msgid "More..."
-msgstr "Daha..."
-
-#: src/protocols/silc/ops.c:1155
-#: src/protocols/silc/silc.c:805
+#: ../libpurple/protocols/silc/ops.c:1298
+msgid "_More..."
+msgstr "_Daha fazla..."
+
+#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
-msgstr "Sunucudan Ay�rma"
-
-#: src/protocols/silc/ops.c:1155
+msgstr "Sunucudan Ayırma"
+
+#: ../libpurple/protocols/silc/ops.c:1371
 msgid "Cannot detach"
-msgstr "Ayr�lam�yor"
-
-#: src/protocols/silc/ops.c:1166
+msgstr "Ayrılamıyor"
+
+#: ../libpurple/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
-msgstr "Konu de�i�tirilemedi"
-
-#: src/protocols/silc/ops.c:1198
+msgstr "Konu değiştirilemedi"
+
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
-msgstr "�sim de�i�tirirken hata"
-
-#: src/protocols/silc/ops.c:1246
+msgstr "İsim değiştirirken hata"
+
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr "Oda Listesi"
 
-#: src/protocols/silc/ops.c:1246
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
-msgstr "Sohbet odas� listesi al�nam�yor"
-
-#: src/protocols/silc/ops.c:1291
+msgstr "Sohbet odası listesi alınamıyor"
+
+#: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
-msgstr "�zel anahtar getirilemedi"
-
-#: src/protocols/silc/ops.c:1304
-#: src/protocols/silc/ops.c:1317
+msgstr "Özel anahtar getirilemedi"
+
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr "Sunucu Bilgileri"
 
-#: src/protocols/silc/ops.c:1305
+#: ../libpurple/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
-msgstr "Sunucu bilgileri al�nam�yor"
-
-#: src/protocols/silc/ops.c:1334
-#: src/protocols/silc/ops.c:1343
+msgstr "Sunucu bilgileri alınamıyor"
+
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr "Sunucu istatistikleri"
 
-#: src/protocols/silc/ops.c:1335
+#: ../libpurple/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
-msgstr "Sunucu istatistikleri al�nam�yor"
-
-#: src/protocols/silc/ops.c:1344
+msgstr "Sunucu istatistikleri alınamıyor"
+
+#: ../libpurple/protocols/silc/ops.c:1559
 msgid "No server statistics available"
-msgstr "Sunucu istatistikleri mevcut de�il"
-
-#: src/protocols/silc/ops.c:1366
+msgstr "Sunucu istatistikleri mevcut değil"
+
+#: ../libpurple/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9637,128 +9282,134 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-"Yerel sunucu ba�lang�� zaman�: %s\n"
-"Yerel sunucu a��k kalma s�resi: %s\n"
-"Yerel sunucu program�: %d\n"
-"Yerel sunucu kanallar�: %d\n"
-"Yerel sunucu operat�rleri: %d\n"
-"Yerel y�nlendirici �perat�rleri: %d\n"
-"Yerel h�cre program�: %d\n"
-"Yerel h�cre kanallar�: %d\n"
-"Yerel h�cre sunucular�: %d\n"
-"Toplam kullan�mlar: %d\n"
+"Yerel sunucu başlangıç zamanı: %s\n"
+"Yerel sunucu açık kalma süresi: %s\n"
+"Yerel sunucu programı: %d\n"
+"Yerel sunucu kanalları: %d\n"
+"Yerel sunucu operatörleri: %d\n"
+"Yerel yönlendirici öperatörleri: %d\n"
+"Yerel hücre programı: %d\n"
+"Yerel hücre kanalları: %d\n"
+"Yerel hücre sunucuları: %d\n"
+"Toplam kullanımlar: %d\n"
 "Toplam kanallar: %d\n"
 "Toplam suncucular: %d\n"
-"Toplam y�nlendiriciler: %d\n"
-"Toplam sunucu operat�rleri: %d\n"
-"Toplam y�nlendirici operat�rleri: %d\n"
-
-#: src/protocols/silc/ops.c:1389
+"Toplam yönlendiriciler: %d\n"
+"Toplam sunucu operatörleri: %d\n"
+"Toplam yönlendirici operatörleri: %d\n"
+
+#: ../libpurple/protocols/silc/ops.c:1604
 msgid "Network Statistics"
-msgstr "A� istatistikleri"
-
-#: src/protocols/silc/ops.c:1397
-#: src/protocols/silc/ops.c:1402
+msgstr "Ağ istatistikleri"
+
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: ../libpurple/protocols/silc/ops.c:1612
 msgid "Ping failed"
-msgstr "Ping ba�ar�s�z oldu"
-
-#: src/protocols/silc/ops.c:1402
+msgstr "Ping başarısız oldu"
+
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
-msgstr "Sunucudan ping cevab� al�nd�"
-
-#: src/protocols/silc/ops.c:1410
+msgstr "Sunucudan ping cevabı alındı"
+
+#: ../libpurple/protocols/silc/ops.c:1625
 msgid "Could not kill user"
-msgstr "Kullan�c� at�lam�yor"
-
-#: src/protocols/silc/ops.c:1494
+msgstr "Kullanıcı atılamıyor"
+
+#: ../libpurple/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
-msgstr "SILC Sunucusuna ba�lan�rken hata"
-
-#: src/protocols/silc/ops.c:1499
+msgstr "SILC Sunucusuna bağlanırken hata"
+
+#: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
-msgstr "Anahtar De�i�imi yap�lamad�"
-
-#: src/protocols/silc/ops.c:1508
+msgstr "Anahtar Değişimi yapılamadı"
+
+#: ../libpurple/protocols/silc/ops.c:1723
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Ayr�lm�� oturuma devam edilemedi. Yeni bir ba�lant� olu�turmak i�in Yeniden Ba�lan'a bas�n�z."
-
-#: src/protocols/silc/ops.c:1543
+msgstr ""
+"Ayrılmış oturuma devam edilemedi. Yeni bir bağlantı oluşturmak için Yeniden "
+"Bağlan'a basınız."
+
+#: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
-msgstr "Sunucu ba�lant�s� kesildi"
-
-#: src/protocols/silc/ops.c:1605
-#: src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+msgstr "Sunucu bağlantısı kesildi"
+
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1867
+#: ../libpurple/protocols/silc/silc.c:182
 msgid "Resuming session"
 msgstr "Oturuma devam ediliyor"
 
-#: src/protocols/silc/ops.c:1607
+#: ../libpurple/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
-msgstr "Kimlik do�rulama ba�lant�s�"
-
-#: src/protocols/silc/ops.c:1654
+msgstr "Kimlik doğrulama bağlantısı"
+
+#: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
-msgstr "Sunucunun �zel anahtar� do�rulan�yor"
-
-#: src/protocols/silc/ops.c:1695
+msgstr "Sunucunun özel anahtarı doğrulanıyor"
+
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "Parola gerekli"
 
-#: src/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Ba�ar�s�z: S�r�m uyu�mazl���, program� g�ncelle�tirin"
-
-#: src/protocols/silc/ops.c:1727
+msgstr "Başarısız: Sürüm uyuşmazlığı, programı güncelleştirin"
+
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Ba�ar�s�z: Kontrol �zel anahtar�n�za g�venmiyor veya onu desteklemiyor"
-
-#: src/protocols/silc/ops.c:1730
+msgstr "Başarısız: Kontrol özel anahtarınıza güvenmiyor veya onu desteklemiyor"
+
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "Ba�ar�s�z: Kontrol, KE grup teklifini desteklemiyor"
-
-#: src/protocols/silc/ops.c:1733
+msgstr "Başarısız: Kontrol, KE grup teklifini desteklemiyor"
+
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "Ba�ar�s�z: Kontrol, �ifreleme teklifini desteklemiyor"
-
-#: src/protocols/silc/ops.c:1736
+msgstr "Başarısız: Kontrol, şifreleme teklifini desteklemiyor"
+
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Ba�ar�s�z: Kontrol, PKCS teklifini desteklemiyor"
-
-#: src/protocols/silc/ops.c:1739
+msgstr "Başarısız: Kontrol, PKCS teklifini desteklemiyor"
+
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "Ba�ar�s�z: Kontrol, hash fonksiyonunun teklifini desteklemiyor"
-
-#: src/protocols/silc/ops.c:1742
+msgstr "Başarısız: Kontrol, hash fonksiyonunun teklifini desteklemiyor"
+
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Ba�ar�s�z: Kontrol, HMAC teklifini desteklemiyor."
-
-#: src/protocols/silc/ops.c:1744
+msgstr "Başarısız: Kontrol, HMAC teklifini desteklemiyor."
+
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
-msgstr "Hata: Yanl�� imza"
-
-#: src/protocols/silc/ops.c:1746
+msgstr "Hata: Yanlış imza"
+
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
-msgstr "Hata: Ge�ersiz �erez"
-
-#: src/protocols/silc/ops.c:1757
+msgstr "Hata: Geçersiz çerez"
+
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
-msgstr "Hata: Kimlik denetimi ba�ar�s�z"
-
-#: src/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'n�n �zel anahtar�n� ald�n�z. Yerel anahtar kopyan�z bu anahtarla uyu�muyor. Hala bu �zel anahtar� kabul etmek istiyor musunuz?"
-
-#: src/protocols/silc/pk.c:108
+msgstr "Hata: Kimlik denetimi başarısız"
+
+#: ../libpurple/protocols/silc/pk.c:104
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"%s'nın özel anahtarını aldınız. Yerel anahtar kopyanız bu anahtarla "
+"uyuşmuyor. Hala bu özel anahtarı kabul etmek istiyor musunuz?"
+
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "%s'n�n �zel anahtar�n� ald�n�z. Bu �zel anahtar� kabul etmek istiyor musunuz?"
-
-#: src/protocols/silc/pk.c:112
+msgstr "%s'nın özel anahtarını aldınız. Bu özel anahtarı kabul etmek istiyor musunuz?"
+
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9766,302 +9417,363 @@
 "%s\n"
 "%s\n"
 msgstr ""
-"Parmak ve babble izleri %s anahtar� i�in:\n"
+"Parmak ve babble izleri %s anahtarı için:\n"
 "\n"
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115
-#: src/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
-msgstr "Genel anahtar� do�rulay�n"
-
-#: src/protocols/silc/pk.c:119
-msgid "View..."
-msgstr "G�ster..."
-
-#: src/protocols/silc/pk.c:141
+msgstr "Genel anahtarı doğrulayın"
+
+#: ../libpurple/protocols/silc/pk.c:121
+msgid "_View..."
+msgstr "_Göster..."
+
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
-msgstr "Desteklenmeyen anahtar de�eri"
-
-#: src/protocols/silc/silc.c:154
+msgstr "Desteklenmeyen anahtar değeri"
+
+#: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
-msgstr "Ba�lant� Kurulam�yor"
-
-#: src/protocols/silc/silc.c:186
+msgstr "Bağlantı Kurulamıyor"
+
+#: ../libpurple/protocols/silc/silc.c:174
 msgid "Cannot initialize SILC Client connection"
-msgstr "SILC Client ba�lant�s� ba�lat�lamad�"
-
-#: src/protocols/silc/silc.c:197
+msgstr "SILC Client bağlantısı başlatılamadı"
+
+#: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
-msgstr "Anahtar de�i�imi yap�l�yor"
-
-#: src/protocols/silc/silc.c:270
+msgstr "Anahtar değişimi yapılıyor"
+
+#: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
-msgstr "Bellek A��m�"
+msgstr "Bellek Aşımı"
+
+#: ../libpurple/protocols/silc/silc.c:294
+msgid "John Noname"
+msgstr "Serdar İsimsiz"
+
+#: ../libpurple/protocols/silc/silc.c:317
+msgid "Cannot initialize SILC protocol"
+msgstr "SILC protokolü başlatılamadı"
+
+#: ../libpurple/protocols/silc/silc.c:324
+msgid "Cannot find/access ~/.silc directory"
+msgstr ""
 
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: ../libpurple/protocols/silc/silc.c:329
 msgid "Connecting to SILC Server"
-msgstr "SILC sunucusuna ba�lan�l�yor"
-
-#: src/protocols/silc/silc.c:630
+msgstr "SILC sunucusuna bağlanılıyor"
+
+#: ../libpurple/protocols/silc/silc.c:338
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:359
+msgid "Unable to create connection"
+msgstr "Bağlantı oluşturulamadı"
+
+#: ../libpurple/protocols/silc/silc.c:658
 msgid "Your Current Mood"
 msgstr "Ruh Haliniz"
 
-#: src/protocols/silc/silc.c:632
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:657
+#: ../libpurple/protocols/silc/silc.c:674
+msgid "In love"
+msgstr "Aşık"
+
+#: ../libpurple/protocols/silc/silc.c:685
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 "\n"
-"Tercih etti�iniz ileti�im y�ntemleri"
-
-#: src/protocols/silc/silc.c:665
-#: src/protocols/silc/util.c:517
+"Tercih ettiğiniz iletişim yöntemleri"
+
+#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667
-#: src/protocols/silc/util.c:519
+#: ../libpurple/protocols/silc/silc.c:695
+#: ../libpurple/protocols/silc/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669
-#: src/protocols/silc/util.c:521
-msgid "Video Conferencing"
-msgstr "G�r�nt�l� Konferans"
-
-#: src/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:697
+msgid "Video conferencing"
+msgstr "Görüntülü konferans"
+
+#: ../libpurple/protocols/silc/silc.c:702
 msgid "Your Current Status"
 msgstr "Durumunuz"
 
-#: src/protocols/silc/silc.c:681
+#: ../libpurple/protocols/silc/silc.c:709
 msgid "Online Services"
-msgstr "�evrimi�i Servisler"
-
-#: src/protocols/silc/silc.c:684
+msgstr "Çevrimiçi Servisler"
+
+#: ../libpurple/protocols/silc/silc.c:712
 msgid "Let others see what services you are using"
-msgstr "Ba�kalar�n�n sizin hangi servisleri kulland���n�z� g�rmesine izin ver"
-
-#: src/protocols/silc/silc.c:690
+msgstr "Başkalarının sizin hangi servisleri kullandığınızı görmesine izin ver"
+
+#: ../libpurple/protocols/silc/silc.c:718
 msgid "Let others see what computer you are using"
-msgstr "Ba�kalar�n�z�n hangi bilgisayar� kulland���n�z� g�rmesine izin ver"
-
-#: src/protocols/silc/silc.c:697
+msgstr "Başkalarınızın hangi bilgisayarı kullandığınızı görmesine izin ver"
+
+#: ../libpurple/protocols/silc/silc.c:725
 msgid "Your VCard File"
-msgstr "VCard Dosyan�z"
-
-#: src/protocols/silc/silc.c:710
-#: src/protocols/silc/silc.c:711
+msgstr "VCard Dosyanız"
+
+#: ../libpurple/protocols/silc/silc.c:737
+#: ../libpurple/protocols/silc/silc.c:738
 msgid "User Online Status Attributes"
-msgstr "Kullan�c� �evrimi�i Durumu �znitelikleri"
-
-#: src/protocols/silc/silc.c:712
-msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
-msgstr "Kullan�c�lar�n sizin ba�lant� durumunuzu ve �zel bilgilerinizi g�rmelerine izin verebilirsiniz. L�tfen g�sterece�iniz bilgileri doldurun."
-
-#: src/protocols/silc/silc.c:752
-#: src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+msgstr "Kullanıcı Çevrimiçi Durumu Öznitelikleri"
+
+#: ../libpurple/protocols/silc/silc.c:739
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+"Kullanıcıların sizin bağlantı durumunuzu ve özel bilgilerinizi görmelerine "
+"izin verebilirsiniz. Lütfen göstereceğiniz bilgileri doldurun."
+
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
-msgstr "G�n�n Mesaj�"
-
-#: src/protocols/silc/silc.c:752
+msgstr "Günün Mesajı"
+
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
-msgstr "G�n�n Mesaj� mevcut de�il"
-
-#: src/protocols/silc/silc.c:753
-#: src/protocols/silc/silc.c:1157
+msgstr "Günün Mesajı mevcut değil"
+
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
-msgstr "Bu ba�lant�yla ili�kili G�n�n Mesaj� yok."
-
-#: src/protocols/silc/silc.c:800
+msgstr "Bu bağlantıyla ilişkili Günün Mesajı yok."
+
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
+msgid "Create New SILC Key Pair"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:832
+msgid "Passphrases do not match"
+msgstr "Parolalar aynı değil"
+
+#: ../libpurple/protocols/silc/silc.c:876
+msgid "Key Pair Generation failed"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:915
+msgid "Key length"
+msgstr "Anahtar uzunluğu"
+
+#: ../libpurple/protocols/silc/silc.c:917
+msgid "Public key file"
+msgstr "Genel anahtar dosyası"
+
+#: ../libpurple/protocols/silc/silc.c:919
+msgid "Private key file"
+msgstr "Özel anahtar dosyası"
+
+#: ../libpurple/protocols/silc/silc.c:942
+msgid "Passphrase (retype)"
+msgstr "Parola (tekrar)"
+
+#: ../libpurple/protocols/silc/silc.c:949
+msgid "Generate Key Pair"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
-msgstr "�evrimi�i Durum"
-
-#: src/protocols/silc/silc.c:809
+msgstr "Çevrimiçi Durum"
+
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
-msgstr "G�n�n Mesaj�n� G�ster"
-
-#: src/protocols/silc/silc.c:882
+msgstr "Günün Mesajını Göster"
+
+#: ../libpurple/protocols/silc/silc.c:1007
+msgid "Create SILC Key Pair..."
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
-msgstr "<I>%s</I> �u anda a�da mevcut de�il"
-
-#: src/protocols/silc/silc.c:1033
+msgstr "<I>%s</I> şu anda ağda mevcut değil"
+
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
-msgstr "Konu �ok uzun"
-
-#: src/protocols/silc/silc.c:1114
+msgstr "Konu çok uzun"
+
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "Bir takma isim belirtmelisiniz"
 
-#: src/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
-msgstr "%s kanal� bulunamad�"
-
-#: src/protocols/silc/silc.c:1221
+msgstr "%s kanalı bulunamadı"
+
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
-msgstr "%s i�in kanal modlar�: %s"
-
-#: src/protocols/silc/silc.c:1223
+msgstr "%s için kanal modları: %s"
+
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "%s de hi� kanal modu ayarlanmad�"
-
-#: src/protocols/silc/silc.c:1236
+msgstr "%s de hiç kanal modu ayarlanmadı"
+
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "cmodes, %s olarak ayarlanamad�."
-
-#: src/protocols/silc/silc.c:1266
-#, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "Bilinmeyen komut: %s, (Gaim hatas� olabilir)"
-
-#: src/protocols/silc/silc.c:1329
+msgstr "cmodes, %s olarak ayarlanamadı."
+
+#: ../libpurple/protocols/silc/silc.c:1530
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Bilinmeyen komut: %s, (istemci hatası olabilir)"
+
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
-msgstr "part [kanal]:  Sohbetten ayr�l"
-
-#: src/protocols/silc/silc.c:1333
+msgstr "part [kanal]:  Sohbetten ayrıl"
+
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [kanal]:  Sohbetten ayr�l"
-
-#: src/protocols/silc/silc.c:1337
+msgstr "leave [kanal]:  Sohbetten ayrıl"
+
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;yeni konu&gt;]:  Konuyu de�i�tir veya g�r�nt�le"
-
-#: src/protocols/silc/silc.c:1342
+msgstr "topic [&lt;yeni konu&gt;]:  Konuyu değiştir veya görüntüle"
+
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;channel&gt; [&lt;�ifre&gt;]:  A�daki bir sohbete kat�l"
-
-#: src/protocols/silc/silc.c:1346
+msgstr "join &lt;channel&gt; [&lt;şifre&gt;]:  Ağdaki bir sohbete katıl"
+
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
-msgstr "list:  A�daki kanallar� listele"
-
-#: src/protocols/silc/silc.c:1350
+msgstr "list:  Ağdaki kanalları listele"
+
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;takmaisim&gt;:  Ki�inin bilgilerini g�ster"
-
-#: src/protocols/silc/silc.c:1354
-#: src/protocols/zephyr/zephyr.c:2597
+msgstr "whois &lt;takmaisim&gt;:  Kişinin bilgilerini göster"
+
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;takmaisim&gt; &lt;mesaj&gt;:  Kullan�c�ya �zel mesaj g�nder"
-
-#: src/protocols/silc/silc.c:1358
+msgstr "msg &lt;takmaisim&gt; &lt;mesaj&gt;:  Kullanıcıya özel mesaj gönder"
+
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;takmaisim&gt; [&lt;mesaj&gt;]:  Kullan�c�ya �zel mesaj g�nder"
-
-#: src/protocols/silc/silc.c:1362
+msgstr "query &lt;takmaisim&gt; [&lt;mesaj&gt;]:  Kullanıcıya özel mesaj gönder"
+
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
-msgstr "motd:  Sunucunun G�n�n Mesaj�n� g�r�nt�le"
-
-#: src/protocols/silc/silc.c:1366
+msgstr "motd:  Sunucunun Günün Mesajını görüntüle"
+
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
-msgstr "detach:  Bu oturumu ay�r."
-
-#: src/protocols/silc/silc.c:1370
+msgstr "detach:  Bu oturumu ayır."
+
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [mesaj]:  Mesaj b�rakarak sunucudan ayr�l"
-
-#: src/protocols/silc/silc.c:1374
+msgstr "quit [mesaj]:  Mesaj bırakarak sunucudan ayrıl"
+
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;command&gt;:  Herhangi bir SILC komutu �a��r�r"
-
-#: src/protocols/silc/silc.c:1380
+msgstr "call &lt;command&gt;:  Herhangi bir SILC komutu çağırır"
+
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;sebep&gt;]:  Nicki yokeder"
 
-#: src/protocols/silc/silc.c:1384
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;newnick&gt;:  Takma ad�n�z� de�i�tirir"
-
-#: src/protocols/silc/silc.c:1388
+msgstr "nick &lt;newnick&gt;:  Takma adınızı değiştirir"
+
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;takmaisim&gt;:  Ki�inin bilgilerini g�ster"
-
-#: src/protocols/silc/silc.c:1392
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Kanal modla�rn� g�ster veya de�i�tir"
-
-#: src/protocols/silc/silc.c:1396
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
-msgstr "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Kanaldaki takma adlar�n modlar�n� d�zenler."
-
-#: src/protocols/silc/silc.c:1400
+msgstr "whowas &lt;takmaisim&gt;:  Kişinin bilgilerini göster"
+
+#: ../libpurple/protocols/silc/silc.c:1656
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Kanal modlaırnı "
+"göster veya değiştir"
+
+#: ../libpurple/protocols/silc/silc.c:1660
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Kanaldaki takma "
+"adların modlarını düzenler."
+
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;usermodes&gt;:  A�daki modlar�n�z� d�zenler."
-
-#: src/protocols/silc/silc.c:1404
+msgstr "umode &lt;usermodes&gt;:  Ağdaki modlarınızı düzenler."
+
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;nick&gt; [-pubkey]:  Sunucu operat�r ayr�cal�klar�n� al"
-
-#: src/protocols/silc/silc.c:1408
-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
-msgstr "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  kanal davet listesine takma ad ekle veya sil"
-
-#: src/protocols/silc/silc.c:1412
+msgstr "oper &lt;nick&gt; [-pubkey]:  Sunucu operatör ayrıcalıklarını al"
+
+#: ../libpurple/protocols/silc/silc.c:1672
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  kanal davet listesine takma ad "
+"ekle veya sil"
+
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kullan�c�y� kanaldan at."
-
-#: src/protocols/silc/silc.c:1416
+msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kullanıcıyı kanaldan at."
+
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
-msgstr "info [server]:  Sunucu y�netimsel ayr�nt�lar�n� g�ster"
-
-#: src/protocols/silc/silc.c:1420
+msgstr "info [server]:  Sunucu yönetimsel ayrıntılarını göster"
+
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Kullan�c�y� kanaldan uzun s�reli uzakla�t�r (banla)."
-
-#: src/protocols/silc/silc.c:1424
+msgstr ""
+"ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Kullanıcıyı kanaldan uzun süreli "
+"uzaklaştır (banla)."
+
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;nick|server&gt;:  Client veya sunucunun �zel anahtar�n� getir."
-
-#: src/protocols/silc/silc.c:1428
+msgstr "getkey &lt;nick|server&gt;:  Client veya sunucunun özel anahtarını getir."
+
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
-msgstr "stats:  Sunucu ve a� istatistiklerini g�r�nt�le"
-
-#: src/protocols/silc/silc.c:1432
+msgstr "stats:  Sunucu ve ağ istatistiklerini görüntüle"
+
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
-msgstr "ping:  Ba�lan�lan sunucuya PING at."
-
-#: src/protocols/silc/silc.c:1437
+msgstr "ping:  Bağlanılan sunucuya PING at."
+
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;channel&gt;:  Kanaldaki kullan�c�lar� listele"
-
-#: src/protocols/silc/silc.c:1441
-msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
-msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  Kanal(lar)daki spesifik kullan�c�lar� listele."
-
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "Anl�k �letiler"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "T�m anl�k iletileri dijital olarak i�aretle"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "T�m IM(anl�k ileti) mesaj imzalar�n� do�rula"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "Kanal Mesajlar�"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "T�m kanal mesajlar�n� dijital olarak i�aretle"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "T�m kanal mesaj imzalar�n� do�rula"
+msgstr "users &lt;channel&gt;:  Kanaldaki kullanıcıları listele"
+
+#: ../libpurple/protocols/silc/silc.c:1705
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  Kanal(lar)"
+"daki spesifik kullanıcıları listele."
 
 #. *< type
 #. *< ui_requirement
@@ -10072,92 +9784,116 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protokol Eklentisi"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "G�venli Internet Canl� Konferans (SILC) Protokol�"
-
-#: src/protocols/silc/silc.c:1600
+msgstr "Güvenli Internet Canlı Konferans (SILC) Protokolü"
+
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+msgid "Network"
+msgstr "Ağ"
+
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
-msgstr "Genel Anahtar dosyas�"
-
-#: src/protocols/silc/silc.c:1604
+msgstr "Genel Anahtar dosyası"
+
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
-msgstr "�zel Anahtar dosyas�"
-
-#: src/protocols/silc/silc.c:1607
+msgstr "Özel Anahtar dosyası"
+
+#: ../libpurple/protocols/silc/silc.c:1887
+msgid "Cipher"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1897
+msgid "HMAC"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "Genel anahtar yetkilendirmesi"
 
-#: src/protocols/silc/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
-msgstr "Ba�ka kullan�c�lar taraf�ndan izlenmeyi reddet"
-
-#: src/protocols/silc/silc.c:1614
+msgstr "Başka kullanıcılar tarafından izlenmeyi reddet"
+
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "Davetleri engelle"
 
-#: src/protocols/silc/silc.c:1617
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
-msgstr "Anahtar uyu�umu olmayan IM(anl�k ileticileri) blokla"
-
-#: src/protocols/silc/silc.c:1620
+msgstr "Anahtar uyuşumu olmayan IM(anlık ileticileri) blokla"
+
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr ""
 
-#: src/protocols/silc/util.c:205
-#: src/protocols/silc/util.c:230
+#: ../libpurple/protocols/silc/silc.c:1915
+msgid "Block messages to whiteboard"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1918
+msgid "Automatically open whiteboard"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1921
+msgid "Digitally sign and verify all messages"
+msgstr "Tüm anlık iletileri dijital olarak imzala"
+
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "SILC anahtar �ifti yarat�l�yor..."
+msgstr "SILC anahtar çifti yaratılıyor..."
 
 #. 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)
-#: src/protocols/silc/util.c:313
+#: ../libpurple/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
-msgstr "Ger�ek �smi: \t%s\n"
-
-#: src/protocols/silc/util.c:315
+msgstr "Gerçek İsmi: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr "Kullan�c� Ad�: \t%s\n"
-
-#: src/protocols/silc/util.c:317
-#, c-format
-msgid "EMail: \t\t%s\n"
-msgstr "E-Posta: \t\t%s\n"
-
-#: src/protocols/silc/util.c:319
+msgstr "Kullanıcı Adı: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:359
+#, c-format
+msgid "E-Mail: \t\t%s\n"
+msgstr "E-posta: \t\t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
-msgstr "Host Ad�: \t%s\n"
-
-#: src/protocols/silc/util.c:321
+msgstr "Host Adı: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr "�irket: \t%s\n"
-
-#: src/protocols/silc/util.c:323
+msgstr "Şirket: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
-msgstr "�lke: \t%s\n"
-
-#: src/protocols/silc/util.c:324
+msgstr "Ülke: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritma: \t%s\n"
 
-#: src/protocols/silc/util.c:325
-#, c-format
-msgid "Key length: \t%d bits\n"
-msgstr "Anahtar uzunlu�u: \t%d bit\n"
-
-#: src/protocols/silc/util.c:327
+#: ../libpurple/protocols/silc/util.c:367
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "Anahtar Uzunluğu: \t%d bits\n"
+
+#: ../libpurple/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10168,7 +9904,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../libpurple/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10177,224 +9913,319 @@
 "Genel Anahtar Babble izi:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332
-#: src/protocols/silc/util.c:333
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Genel Anahtar Bilgisi"
 
-#: src/protocols/silc/util.c:515
+#: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
 msgstr "Sayfalama"
 
-#: src/protocols/silc/util.c:539
+#: ../libpurple/protocols/silc/util.c:561
+msgid "Video Conferencing"
+msgstr "Görüntülü Konferans"
+
+#: ../libpurple/protocols/silc/util.c:579
 msgid "Computer"
 msgstr "Bilgisayar"
 
-#: src/protocols/silc/util.c:543
+#: ../libpurple/protocols/silc/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:545
+#: ../libpurple/protocols/silc/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:139
+#: ../libpurple/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#: ../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 ""
+
+#: ../libpurple/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr ""
+
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../libpurple/protocols/simple/simple.c:416
+msgid "Could not write"
+msgstr "Yazılamadı"
+
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1484
+msgid "Could not connect"
+msgstr "Bağlanılamadı"
+
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
+msgid "Could not create listen socket"
+msgstr "Dinleme soketi yaratılamadı"
+
+#: ../libpurple/protocols/simple/simple.c:1541
+msgid "Couldn't resolve host"
+msgstr "Ana bilgisayar çözümlenemedi"
+
+#: ../libpurple/protocols/simple/simple.c:1632
+msgid "Could not resolve hostname"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:1649
+msgid "SIP screen names may not contain whitespaces or @ symbols"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../libpurple/protocols/simple/simple.c:1824
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE Protokol Eklentisi"
+
+#. *  summary
+#: ../libpurple/protocols/simple/simple.c:1825
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:1853
+msgid "Publish status (note: everyone may watch you)"
+msgstr "Durumu Yayımla (not: herkes sizi görebilir)"
+
+#: ../libpurple/protocols/simple/simple.c:1859
+msgid "Use UDP"
+msgstr "UDP Kullan"
+
+#: ../libpurple/protocols/simple/simple.c:1861
+msgid "Use proxy"
+msgstr "Proxy kullan"
+
+#: ../libpurple/protocols/simple/simple.c:1863
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../libpurple/protocols/simple/simple.c:1865
+msgid "Auth User"
+msgstr ""
+
+#: ../libpurple/protocols/simple/simple.c:1867
+msgid "Auth Domain"
+msgstr ""
+
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
-msgstr "%s aran�yor"
-
-#: src/protocols/toc/toc.c:148
+msgstr "%s aranıyor"
+
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
-msgstr "Ba�lant� ba�ar�s�z (%s)"
-
-#: src/protocols/toc/toc.c:200
+msgstr "Bağlantı başarısız (%s)"
+
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
-msgstr "Ba�lan: %s"
-
-#: src/protocols/toc/toc.c:482
+msgstr "Bağlan: %s"
+
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
-msgstr "Dosya yaz�lam�yor. (%s)"
-
-#: src/protocols/toc/toc.c:485
+msgstr "Dosya yazılamıyor. (%s)"
+
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
-msgstr "Dosya a��lam�yor. (%s)"
-
-#: src/protocols/toc/toc.c:488
+msgstr "Dosya açılamıyor. (%s)"
+
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
-msgstr "�leti �ok uzun , son %s byte(harf) kesildi."
-
-#: src/protocols/toc/toc.c:491
+msgstr "İleti çok uzun , son %s byte(harf) kesildi."
+
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
-msgstr "Kullan�c� %s oturum a�mam��"
-
-#: src/protocols/toc/toc.c:494
+msgstr "Kullanıcı %s oturum açmamış"
+
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
-msgstr "%s 'nin uyar�s�na izin verilmiyor"
-
-#: src/protocols/toc/toc.c:497
+msgstr "%s 'nin uyarısına izin verilmiyor"
+
+#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Bir ileti d���r�ld�, sunucunun h�z limitini a��yorsunuz."
-
-#: src/protocols/toc/toc.c:500
+msgstr "Bir ileti düşürüldü, sunucunun hız limitini aşıyorsunuz."
+
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
-msgstr "%s de sohbet m�mk�n de�il."
-
-#: src/protocols/toc/toc.c:503
+msgstr "%s de sohbet mümkün değil."
+
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
-msgstr "%s kullan�c�s�na �ok h�zl� ileti yolluyorsunuz."
-
-#: src/protocols/toc/toc.c:506
+msgstr "%s kullanıcısına çok hızlı ileti yolluyorsunuz."
+
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
-msgstr "%s taraf�ndan g�nderilen mesaj �ok uzun oldu�undan al�namad�."
-
-#: src/protocols/toc/toc.c:509
+msgstr "%s tarafından gönderilen mesaj çok uzun olduğundan alınamadı."
+
+#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "%s taraf�ndan g�nderilen mesaj �ok h�zl� g�nderildi�i i�in al�namad�."
-
-#: src/protocols/toc/toc.c:512
+msgstr "%s tarafından gönderilen mesaj çok hızlı gönderildiği için alınamadı."
+
+#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
-msgstr "Ba�ar�s�z."
-
-#: src/protocols/toc/toc.c:515
+msgstr "Başarısız."
+
+#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
-msgstr "�ok sonu� var."
-
-#: src/protocols/toc/toc.c:518
+msgstr "Çok sonuç var."
+
+#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Daha fazla niteleyici gerek."
 
-#: src/protocols/toc/toc.c:521
+#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
-msgstr "Bu servis ge�ici olarak hizmet d���d�r."
-
-#: src/protocols/toc/toc.c:524
+msgstr "Bu servis geçici olarak hizmet dışıdır."
+
+#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
-msgstr "E-posta aramas� yasakland�."
-
-#: src/protocols/toc/toc.c:527
+msgstr "E-posta araması yasaklandı."
+
+#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
-msgstr "�pucu g�zard� edildi."
-
-#: src/protocols/toc/toc.c:530
+msgstr "İpucu gözardı edildi."
+
+#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
-msgstr "--- �pucu Yok ---"
-
-#: src/protocols/toc/toc.c:533
+msgstr "--- İpucu Yok ---"
+
+#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
-msgstr "Kullan�c� dizin bilgisine sahip de�il."
-
-#: src/protocols/toc/toc.c:537
+msgstr "Kullanıcı dizin bilgisine sahip değil."
+
+#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
-msgstr "�lke desteklenmiyor."
-
-#: src/protocols/toc/toc.c:540
+msgstr "Ülke desteklenmiyor."
+
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Bilinmeyen hata: %s."
 
-#: src/protocols/toc/toc.c:546
+#: ../libpurple/protocols/toc/toc.c:549
+msgid "Incorrect screen name or password."
+msgstr "Yanlış takma ad veya parola."
+
+#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
-msgstr "Bu servis ge�ici olarak hizmet d���d�r."
-
-#: src/protocols/toc/toc.c:549
+msgstr "Bu servis geçici olarak hizmet dışıdır."
+
+#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
-msgstr "Uyar� d�zeyiniz �uan oturum a�abilmek i�in �ok y�ksek."
-
-#: src/protocols/toc/toc.c:552
-msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
-msgstr "�ok s�k ba�lan�p kopuyorsunuz. L�tfen on dakika bekledikten sonra tekrar deneyin. E�er denemeye devam ederseniz daha uzun beklemek zorunda kalacaks�n�z."
-
-#: src/protocols/toc/toc.c:554
+msgstr "Uyarı düzeyiniz şuan oturum açabilmek için çok yüksek."
+
+#: ../libpurple/protocols/toc/toc.c:558
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"Çok sık bağlanıp kopuyorsunuz. Lütfen on dakika bekledikten sonra tekrar "
+"deneyin. Eğer denemeye devam ederseniz daha uzun beklemek zorunda "
+"kalacaksınız."
+
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
-msgstr "Bilinmeyen ba�lant� hatas� olu�tu: %s."
-
-#: src/protocols/toc/toc.c:557
+msgstr "Bilinmeyen bağlantı hatası oluştu: %s."
+
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Bilinmeyen hata, %d, olu�tu. Bilgi: %s"
-
-#: src/protocols/toc/toc.c:584
+msgstr "Bilinmeyen hata, %d, oluştu. Bilgi: %s"
+
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
-msgstr "Ge�ersiz grup ad�"
-
-#: src/protocols/toc/toc.c:668
+msgstr "Geçersiz grup adı"
+
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
-msgstr "Ba�lant� Kesildi"
-
-#: src/protocols/toc/toc.c:708
+msgstr "Bağlantı Kesildi"
+
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
-msgstr "Cevap i�in bekleniyor..."
-
-#: src/protocols/toc/toc.c:786
+msgstr "Cevap için bekleniyor..."
+
+#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC duraklamadan tekrar �al���r hale geldi. �imdi iletilerinizi yollayabilirsiniz."
-
-#: src/protocols/toc/toc.c:989
+msgstr ""
+"TOC duraklamadan tekrar çalışır hale geldi. Şimdi iletilerinizi "
+"yollayabilirsiniz."
+
+#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
-msgstr "�ifreniz  Ba�ar�yla De�i�tirildi"
-
-#: src/protocols/toc/toc.c:993
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC, bir PAUSE komutu yollad�."
-
-#: src/protocols/toc/toc.c:994
-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 "Bu durum oldu�unda, TOC kendisine yollanan mesajlar� engelliyordur ve ona ileti yollad���n�zda sizi geri �evirebilir. Gaim bunu g�zden ge�irecektir. Ge�ici bir durumdur, l�tfen sab�rl� olun."
-
-#: src/protocols/toc/toc.c:1549
+msgstr "Şifreniz  Başarıyla Değiştirildi"
+
+#: ../libpurple/protocols/toc/toc.c:1366
+msgid "_Group:"
+msgstr "_Grup:"
+
+#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
-msgstr "Dizin ad�n� al"
-
-#: src/protocols/toc/toc.c:1689
+msgstr "Dizin adını al"
+
+#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
-msgstr "Dizin ad� ayarla"
-
-#: src/protocols/toc/toc.c:1811
+msgstr "Dizin adı ayarla"
+
+#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
-msgstr "%s yazma i�in a��lam�yor!"
-
-#: src/protocols/toc/toc.c:1847
+msgstr "%s yazma için açılamıyor!"
+
+#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
-msgstr "Dosya transferi ger�ekle�tirilemedi; kar�� taraf iptal etmi� olabilir."
-
-#: src/protocols/toc/toc.c:1892
-#: src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056
-#: src/protocols/toc/toc.c:2144
+msgstr "Dosya transferi gerçekleştirilemedi; karşı taraf iptal etmiş olabilir."
+
+#: ../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 "Transfer i�in ba�lanam�yor."
-
-#: src/protocols/toc/toc.c:2089
+msgstr "Transfer için bağlanamıyor."
+
+#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
-msgstr "Dosyan�n �stbilgisi okunamad�. Dosya transer edilemeyecek."
-
-#: src/protocols/toc/toc.c:2189
-msgid "Gaim - Save As..."
-msgstr "Gaim - Farkl� Kaydet..."
-
-#: src/protocols/toc/toc.c:2223
+msgstr "Dosyanın üstbilgisi okunamadı. Dosya transer edilemeyecek."
+
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "Farklı Kaydet..."
+
+#: ../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 istiyor %s kabul etmeyi %d dosyas�n�: %s (%.2f %s)%s%s"
-
-#: src/protocols/toc/toc.c:2230
+msgstr[0] "%s istiyor %s kabul etmeyi %d dosyasını: %s (%.2f %s)%s%s"
+
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
-msgstr "%s sizden kendine bir dosya yollanmas�n� istiyor."
+msgstr "%s sizden kendine bir dosya yollanmasını istiyor."
 
 #. *< type
 #. *< ui_requirement
@@ -10406,216 +10237,209 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316
-#: src/protocols/toc/toc.c:2318
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protokol Eklentisi"
 
-#: src/protocols/toc/toc.c:2337
-msgid "TOC host"
-msgstr "TOC ana bilgisayar�"
-
-#: src/protocols/toc/toc.c:2341
-msgid "TOC port"
-msgstr "TOC portu"
-
-#: src/protocols/yahoo/yahoo.c:706
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
-msgstr "Yahoo! mesaj�n�z yollanamad�."
-
-#: src/protocols/yahoo/yahoo.c:752
-#: src/protocols/yahoo/yahoo.c:3499
-msgid "Buzz!!"
-msgstr "Dingg!!!"
-
-#: src/protocols/yahoo/yahoo.c:797
+msgstr "Yahoo! mesajınız yollanamadı."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:878
+#, c-format
+msgid "%s just sent you a Buzz!"
+msgstr "%s size bir titreşim gönderdi!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr "Yahoo! sistem mesaj� %s i�in:"
-
-#. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#.
-#: src/protocols/yahoo/yahoo.c:887
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "%s kullan�c�s� %s �gesini listesine eklemek istiyor %s%s."
-
-#: src/protocols/yahoo/yahoo.c:893
-msgid "Message (optional) :"
-msgstr "Mesaj (iste�e ba�l�) :"
-
-#: src/protocols/yahoo/yahoo.c:935
+msgstr "Yahoo! sistem mesajı %s için:"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:984
+msgid "Authorization denied message:"
+msgstr "İzin reddetme iletisi:"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:938
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:941
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
-msgstr "Ki�i ekleme reddedildi"
-
-#: src/protocols/yahoo/yahoo.c:1684
-#, 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 ""
-
-#: src/protocols/yahoo/yahoo.c:1687
+msgstr "Kişi ekleme reddedildi"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
-msgstr "Yahoo! Kimlik Denetimi Ba�ar�s�z"
-
-#: src/protocols/yahoo/yahoo.c:1760
-#, c-format
-msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
-msgstr "%s kullan�c�s�n� yoksaymaya �al���yorsunuz, ama kullan�c� �u anda sizin listenizde. \"Evet\"e t�klad���n�z takdirde bu kullan�c� listenizden silinecek ve yok say�lacakt�r."
-
-#: src/protocols/yahoo/yahoo.c:1763
+msgstr "Yahoo! Kimlik Denetimi Başarısız"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
+#, c-format
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr ""
+"%s kullanıcısını yoksaymaya çalışıyorsunuz, ama kullanıcı şu anda sizin "
+"listenizde. \"Evet\"e tıkladığınız takdirde bu kullanıcı listenizden "
+"silinecek ve yok sayılacaktır."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
-msgstr "Ki�iyi yoksay?"
-
-#: src/protocols/yahoo/yahoo.c:1797
-msgid "Invalid username."
-msgstr "Ge�ersiz kullan�c� ad�."
-
-#: src/protocols/yahoo/yahoo.c:1808
-msgid "Normal authentication failed!"
-msgstr "Normal Kimlik Denetimi Ba�ar�s�z1"
-
-#: src/protocols/yahoo/yahoo.c:1809
-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 ""
-
-#: src/protocols/yahoo/yahoo.c:1817
-msgid "Incorrect password."
-msgstr "Yanl�� �ifre."
-
-#: src/protocols/yahoo/yahoo.c:1820
+msgstr "Kişiyi yoksay?"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Kullan�c� hesab�n�z kilitlendi, l�tfen Yahoo! sitesine giri� yap�n."
-
-#: src/protocols/yahoo/yahoo.c:1823
+msgstr "Kullanıcı hesabınız kilitlendi, lütfen Yahoo! sitesine giriş yapın."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1880
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
-msgstr "Arkada��n�z sunucu listesine eklenemedi"
-
-#: src/protocols/yahoo/yahoo.c:2124
-#: src/protocols/yahoo/yahoo.c:2270
-#: src/protocols/yahoo/ycht.c:413
-msgid "Unable to read"
-msgstr "Okuma hatas�"
-
-#: src/protocols/yahoo/yahoo.c:2292
-#: src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506
-#: src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393
-#: src/protocols/yahoo/yahoochat.c:1460
-#: src/protocols/yahoo/ycht.c:517
+msgstr "Arkadaşınız sunucu listesine eklenemedi"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
+msgid "Received unexpected HTTP response from server."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
-msgstr "Ba�lant� problemi"
-
-#: src/protocols/yahoo/yahoo.c:2619
-#: src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
-msgstr "Evde De�il"
-
-#: src/protocols/yahoo/yahoo.c:2621
-#: src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
-msgstr "B�roda De�il"
-
-#: src/protocols/yahoo/yahoo.c:2623
-#: src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
-msgstr "Ofiste De�il"
-
-#: src/protocols/yahoo/yahoo.c:2627
-#: src/protocols/yahoo/yahoo.c:3248
+msgstr "Bağlantı problemi"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
+msgid "Not at Home"
+msgstr "Evde Değil"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+msgid "Not at Desk"
+msgstr "Büroda Değil"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+msgid "Not in Office"
+msgstr "Ofiste Değil"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "On Vacation"
 msgstr "Tatilde"
 
-#: src/protocols/yahoo/yahoo.c:2631
-#: src/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
-msgstr "_D��ar� ��kt�"
-
-#: src/protocols/yahoo/yahoo.c:2723
-#: src/protocols/yahoo/yahoo.c:2750
+msgstr "_Dışarı Çıktı"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
-msgstr "Sunucu listesinde de�il"
-
-#: src/protocols/yahoo/yahoo.c:2773
-#: src/protocols/yahoo/yahoo.c:2833
+msgstr "Sunucu listesinde değil"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
-msgstr "�evrimi�i"
-
-#: src/protocols/yahoo/yahoo.c:2776
-#: src/protocols/yahoo/yahoo.c:2855
+msgstr "Çevrimiçi"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
-msgstr "S�rekli �evrimd��� g�r�n"
-
-#: src/protocols/yahoo/yahoo.c:2794
-msgid "Stealth"
-msgstr "Gizli"
-
-#: src/protocols/yahoo/yahoo.c:2849
+msgstr "Sürekli Çevrimdışı görün"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
+msgid "Presence"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
+msgid "Appear Offline"
+msgstr "Çevrimdışı Görün"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
-msgstr "S�rekli �evrimd��� g�r�nme"
-
-#: src/protocols/yahoo/yahoo.c:2896
+msgstr "Sürekli Çevrimdışı görünme"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
-msgstr "Sohbete Kat�l"
-
-#: src/protocols/yahoo/yahoo.c:2901
+msgstr "Sohbete Katıl"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
-msgstr "Konferans Ba�lat"
-
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr "Gizlilik Ayarlar�"
-
-#: src/protocols/yahoo/yahoo.c:2932
+msgstr "Konferans Başlat"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
+msgid "Presence Settings"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
-msgstr "Karalamaya Ba�la"
-
-#: src/protocols/yahoo/yahoo.c:2963
+msgstr "Karalamaya Başla"
+
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
-msgstr "Hangi ID aktifle�tirilecek?"
-
-#: src/protocols/yahoo/yahoo.c:2972
+msgstr "Hangi ID aktifleştirilecek?"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
-msgstr "Kullan�c�yla sohbet et..."
-
-#: src/protocols/yahoo/yahoo.c:2982
+msgstr "Kullanıcıyla sohbet et..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Activate ID..."
-msgstr "ID'yi aktifle�tir..."
-
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
-msgstr "Kullan�c�yla sohbet et..."
-
-#: src/protocols/yahoo/yahoo.c:3541
+msgstr "ID'yi aktifleştir..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
+msgid "Join User in Chat..."
+msgstr "Kullanıcıyla Sohbet Et..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
+msgid "You have just sent a Buzz!"
+msgstr "Şu anda bir titreşim gönderdiniz!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;oda&gt;:  Yahoo'daki bir sohbet odas�na kat�l"
-
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
-msgstr "buzz: Kullan�c�n�n sizi farketmesi i�in titre�im yolla"
-
-#: src/protocols/yahoo/yahoo.c:3550
+msgstr "join &lt;oda&gt;:  Yahoo'daki bir sohbet odasına katıl"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Yahoo ağındaki kanalları listele"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: Kullanıcının sizi farketmesi için titreşim yollar"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -10629,286 +10453,359 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639
-#: src/protocols/yahoo/yahoo.c:3641
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protokol Eklentisi"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japon"
 
-#: src/protocols/yahoo/yahoo.c:3661
-msgid "Pager host"
-msgstr "�a�r� Hostu"
-
-#: src/protocols/yahoo/yahoo.c:3664
-msgid "Japan Pager host"
-msgstr "Japon �a�r� Hostu"
-
-#: src/protocols/yahoo/yahoo.c:3667
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
+msgid "Pager server"
+msgstr "Çağrı cihazı sunucusu"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
+msgid "Japan Pager server"
+msgstr "Japon Çağrı cihazı sunucusu"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
-msgstr "�a�r� Portu"
-
-#: src/protocols/yahoo/yahoo.c:3670
-msgid "File transfer host"
-msgstr "Dosya transfer ana bilgisayar�"
-
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
-msgstr "Japon Dosya transfer ana bilgisayar�"
-
-#: src/protocols/yahoo/yahoo.c:3676
+msgstr "Çağrı cihazı portu"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
+msgid "File transfer server"
+msgstr "Dosya aktarım sunucusu"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
+msgid "Japan file transfer server"
+msgstr "Japon dosya aktarım sunucusu"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
-msgstr "Dosya transfer portu"
-
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
-msgstr "Sohbet Odas� Yeri"
-
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
-msgstr "Sohbet Odas� Listesi"
-
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
-msgstr "YCHT Ana Bilgisayar�"
-
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
-msgstr "YCHT Portu"
-
-#: src/protocols/yahoo/yahoo_profile.c:672
-#, c-format
-msgid "<b>IP Address:</b> %s<br>"
-msgstr "<b>IP Adresi:</b> %s<br>"
-
-#: src/protocols/yahoo/yahoo_profile.c:748
+msgstr "Dosya aktarım portu"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
+msgid "Chat room locale"
+msgstr "Sohbet Odası Yereli"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
+msgid "Chat room list URL"
+msgstr "Sohbet Odası Listesi URL"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
+msgid "Yahoo Chat server"
+msgstr "Yahoo Sohbet sunucusu"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
+msgid "Yahoo Chat port"
+msgstr "Yahoo Sohbet portu"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s kullanıcısı \"%s\" odasına yaptığınız konferans davetinizi kabul etmedi çünkü \"%s\"."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "Davet Reddedildi"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "Sohbete katılım başarısız oldu"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Bilinmeyen oda"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Sohbet odası dolu olabilir"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Erişilebilir değil"
+
+#: ../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 ""
+"Bilinmeyen hata. Sohbet odasına yeniden girebilmek için çevrimdışı duruma geçip "
+"beş dakika beklemeniz gerekebilir."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Şimdi %s odasında sohbet ediyorsunuz."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "Kişiyle sohbete katılınamadı"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "Belki de onlar sohbet etmiyordur?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "Oda listesi alımı başarısız oldu."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "Sesler"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "Web Kameralar"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "Oda listesi alınamıyor."
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "Kullanıcı Odaları"
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
+msgid "Sent Doodle request."
+msgstr ""
+
+#: ../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 "Dosya açıklayıcısı (tanımlayıcısı) kurulamadı."
+
+#. TODO: what to do here - do we really have to disconnect?
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+msgid "Write Error"
+msgstr "Yazma Hatası"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japon Profili"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profili"
 
-#: src/protocols/yahoo/yahoo_profile.c:793
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_profile.c:795
-msgid "If you wish to view this profile, you will need to visit this link in your web browser"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
+#: ../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 ""
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1043
-#: src/protocols/yahoo/yahoo_profile.c:1047
-#: src/protocols/yahoo/yahoo_profile.c:1051
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "Hobiler"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "Son Haberler"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "Anasayfa"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
-msgstr "Ba�lant� 1"
-
-#: src/protocols/yahoo/yahoo_profile.c:1106
+msgstr "Bağlantı 1"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
-msgstr "Ba�lant� 2"
-
-#: src/protocols/yahoo/yahoo_profile.c:1110
+msgstr "Bağlantı 2"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
-msgstr "Ba�lant� 3"
-
-#: src/protocols/yahoo/yahoo_profile.c:1123
+msgstr "Bağlantı 3"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
-msgstr "Son G�ncelleme"
-
-#: src/protocols/yahoo/yahoo_profile.c:1129
+msgstr "Son Güncelleme"
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
-msgstr "%s adl� kullan�c�n�n bilgisi mevcut de�il"
-
-#: src/protocols/yahoo/yahoo_profile.c:1135
-msgid "Sorry, this profile seems to be in a language that is not supported at this time."
-msgstr "Maalesef bu profil �u anda desteklemedi�imiz bir dilde."
-
-#: src/protocols/yahoo/yahoo_profile.c:1151
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "Kullan�c�n�n profiline eri�ilemedi. Bu muhtemelen sunucudan kaynaklanan ge�ici bir problemdir. L�tfen daha sonra tekrar deneyin."
-
-#: src/protocols/yahoo/yahoo_profile.c:1154
-msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
-msgstr "Kullan�c�n�n profiline ula��lamad�. Bu genelde b�yle bir kullan�c�n�n olmad���n� i�aret eder; fakat bazen Yahoo!'nun profillere ula�amad��� olur.E�er kullan�c�n�n do�ru oldu�una eminseniz, l�tfen daha sonra tekrar deneyin."
-
-#: src/protocols/yahoo/yahoo_profile.c:1162
+msgstr "%s adlı kullanıcının bilgisi mevcut değil"
+
+#: ../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 ""
+
+#: ../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 ""
+"Kullanıcının profiline erişilemedi. Bu muhtemelen sunucudan kaynaklanan "
+"geçici bir problemdir. Lütfen daha sonra tekrar deneyin."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"Kullanıcının profiline ulaşılamadı. Bu genelde böyle bir kullanıcının "
+"olmadığını işaret eder; fakat bazen Yahoo!'nun profillere ulaşamadığı olur."
+"Eğer kullanıcının doğru olduğuna eminseniz, lütfen daha sonra tekrar deneyin."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
-msgstr "Kullan�c� profili bo�."
-
-#: src/protocols/yahoo/yahoochat.c:202
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:204
-msgid "Invitation Rejected"
-msgstr "Davetiniz Reddedildi"
-
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Failed to join chat"
-msgstr "Sohbete kat�l�m ba�ar�s�z oldu"
-
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "Belki sohbet odas� doludur?"
-
-#: src/protocols/yahoo/yahoochat.c:435
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "�u anda sohbet etti�iniz yer: %s"
-
-#: src/protocols/yahoo/yahoochat.c:608
-msgid "Failed to join buddy in chat"
-msgstr "Ki�iyle sohbete kat�l�namad�"
-
-#: src/protocols/yahoo/yahoochat.c:609
-msgid "Maybe they're not in a chat?"
-msgstr "Belki de onlar sohbet etmiyordur?"
-
-#: src/protocols/yahoo/yahoochat.c:1326
-msgid "Fetching the room list failed."
-msgstr "Liste al�m� ba�ar�s�z."
-
-#: src/protocols/yahoo/yahoochat.c:1379
-msgid "Voices"
-msgstr "Sesler"
-
-#: src/protocols/yahoo/yahoochat.c:1382
-msgid "Webcams"
-msgstr "Kameralar"
-
-#: src/protocols/yahoo/yahoochat.c:1393
-#: src/protocols/yahoo/yahoochat.c:1460
-msgid "Unable to fetch room list."
-msgstr "Liste al�nam�yor."
-
-#: src/protocols/yahoo/yahoochat.c:1453
-msgid "User Rooms"
-msgstr "Kullan�c� odalar�"
-
-#: src/protocols/yahoo/ycht.c:400
+msgstr "Kullanıcı profili boş."
+
+#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
-msgstr "YCHT sunucusuna ba�lant� hatas�."
-
-#: src/protocols/zephyr/zephyr.c:331
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:686
+msgstr "YCHT sunucusuna bağlantı hatası."
+
+#: ../libpurple/protocols/yahoo/ycht.c:475
+#, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+"Sunucuyla yapılan bağlantı kesildi\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 ""
+"(İleti dönüştürülürken bir hata oluştu.\n"
+" Hesap Düzenleyiciden Kodlama seçeneğine bakın)"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "Sohbet g�nderilemedi %s,%s,%s "
-
-#: src/protocols/zephyr/zephyr.c:719
-#: src/protocols/zephyr/zephyr.c:1133
-#, c-format
-msgid "<b>User:</b> %s<br>"
-msgstr "<b>Kullan�c�:</b> %s<br>"
-
-#: src/protocols/zephyr/zephyr.c:723
-#: src/protocols/zephyr/zephyr.c:1138
-msgid "<br>Hidden or not logged-in"
-msgstr "<br>Gizli veya giri� yapmam��"
-
-#: src/protocols/zephyr/zephyr.c:728
-#: src/protocols/zephyr/zephyr.c:1140
+msgstr "Sohbet gönderilemedi %s,%s,%s "
+
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "Kullanıcı"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
+msgid "Hidden or not logged-in"
+msgstr "Gizli veya giriş yapmamış"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> %s'de %s'den beri"
 
-#: src/protocols/zephyr/zephyr.c:1471
-#: src/protocols/zephyr/zephyr.c:1472
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
-msgstr "_Herhangi biri"
-
-#: src/protocols/zephyr/zephyr.c:2273
+msgstr "Herhangi biri"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
-msgstr "_S�n�f:"
-
-#: src/protocols/zephyr/zephyr.c:2279
+msgstr "_Sınıf:"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
-msgstr "_�rnek:"
-
-#: src/protocols/zephyr/zephyr.c:2285
+msgstr "_Örnek:"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
-msgstr "_Al�c�:"
-
-#: src/protocols/zephyr/zephyr.c:2296
+msgstr "_Alıcı:"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "Kat�l�m denemesi %s,%s,%s yap�lamad�"
-
-#: src/protocols/zephyr/zephyr.c:2602
+msgstr "Katılım denemesi %s,%s,%s yapılamadı"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;nick&gt;: Kullan�c�y� konumland�r"
-
-#: src/protocols/zephyr/zephyr.c:2607
+msgstr "zlocate &lt;nick&gt;: Kullanıcıyı konumlandır"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;nick&gt;: Kullan�c�y� konumland�r"
-
-#: src/protocols/zephyr/zephyr.c:2612
+msgstr "zl &lt;nick&gt;: Kullanıcıyı konumlandır"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2622
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2628
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Yeni bir sohbete kat�l"
-
-#: src/protocols/zephyr/zephyr.c:2633
+msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Yeni bir sohbete katıl"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;instance&gt;: �una mesaj yolla &lt;message,<i>instance</i>,*&gt;"
-
-#: src/protocols/zephyr/zephyr.c:2639
-msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
-msgstr "zci &lt;class&gt; &lt;instance&gt;: Mesaj G�nder &lt;<i>class</i>,<i>instance</i>,*&gt;"
-
-#: src/protocols/zephyr/zephyr.c:2645
-msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2651
-msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:2656
+msgstr "zi &lt;instance&gt;: şuna mesaj yolla &lt;message,<i>instance</i>,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;class&gt; &lt;instance&gt;: Mesaj Gönder &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
+msgid ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;class&gt;: Mesaj g�nder &lt;<i>class</i>,PERSONAL,*&gt;"
-
-#: src/protocols/zephyr/zephyr.c:2762
+msgstr "zc &lt;class&gt;: Mesaj gönder &lt;<i>class</i>,PERSONAL,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
-msgstr "Yeniden kaydol"
-
-#: src/protocols/zephyr/zephyr.c:2765
+msgstr "Yeniden kayıt ol"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
-msgstr "Sunucudan �yelikleri getir"
+msgstr "Sunucudan üyelikleri getir"
 
 #. *< type
 #. *< ui_requirement
@@ -10920,688 +10817,4423 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847
-#: src/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr Protokol Eklentisi"
-
-#: src/protocols/zephyr/zephyr.c:2874
+msgstr "Zephyr Protokolü Eklentisi"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
+msgid "Use tzc"
+msgstr "Tzc kullan"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
+msgid "tzc command"
+msgstr "tzc komutu"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
-msgstr ".anyone'a Ver"
-
-#: src/protocols/zephyr/zephyr.c:2877
+msgstr ".anyone'a aktar"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
-msgstr ".zephyr.subs'a Ver"
-
-#: src/protocols/zephyr/zephyr.c:2880
+msgstr ".zephyr.subs'a aktar"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
-msgstr ".anyone'dan Al"
-
-#: src/protocols/zephyr/zephyr.c:2883
+msgstr ".anyone'dan içeri aktar"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
-msgstr ".zephyr.subs'dan Al"
-
-#: src/protocols/zephyr/zephyr.c:2886
+msgstr ".zephyr.subs'dan içeri aktar"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Memleket"
 
-#: src/protocols/zephyr/zephyr.c:2889
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
-msgstr "Pozlama"
-
-#. XXX: why in the hell are we calling gaim_connection_error() here?
-#. Forbidden
-#: src/proxy.c:1036
-#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr "Eri�im engellendi : proxy sunucusu port %d de t�nellemeyi yasakl�yor."
-
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Proxy ba�lant� hatas� %d"
-
-#: src/proxy.c:1874
-msgid "Invalid proxy settings"
-msgstr "Ge�ersiz proxy ayarlar�"
-
-#: src/proxy.c:1874
-msgid "Either the host name or port number specified for your given proxy type is invalid."
-msgstr "Proxy ayarlar�n�zda girilen host adresi ya da port numaras� ge�erli de�il."
+msgstr "Açıklık"
+
+#: ../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 ""
+"Soket oluşturulamadı:\n"
+"%s"
+
+#: ../libpurple/proxy.c:658
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr "HTTP proxy yanıtı ayrıştırılamadı: %s\n"
+
+#: ../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 Proxy bağlantı hatası %d"
+
+#: ../libpurple/proxy.c:778
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr ""
+"Erişim engellendi : HTTP proxy sunucusu %d portunda tünellemeye izin "
+"vermiyor."
+
+#: ../libpurple/proxy.c:995
+#, c-format
+msgid "Error resolving %s"
+msgstr "%s çözümleme hatası"
+
+#: ../libpurple/proxy.c:1685
+msgid "Could not resolve host name"
+msgstr "Ana makina ismi çözümlenemedi"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+#: ../libpurple/request.h:1377
+msgid "_Yes"
+msgstr "_Evet"
+
+#: ../libpurple/request.h:1377
+msgid "_No"
+msgstr "_Hayır"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1341
-msgid "Accept"
-msgstr "Kabul Et"
-
-#: src/server.c:243
+#: ../libpurple/request.h:1397
+msgid "_Accept"
+msgstr "_Kabul Et"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../libpurple/savedstatuses.c:46
+msgid "I'm not here right now"
+msgstr "Şu anda burada değilim"
+
+#: ../libpurple/savedstatuses.c:532
+msgid "saved statuses"
+msgstr "kaydedilmiş durumlar"
+
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
-msgstr "%s ismini de�i�tirdi: %s.\n"
-
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d mesaj)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 mesaj)"
-
-#: src/server.c:859
+msgstr "%s şimdi %s olarak biliniyor.\n"
+
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%s davette bulunuyor, %s kullan�c�s�n� sohbet odas�na %s:\n"
+"%s kullanıcısı %s tarafından %s sohbet odasınadavet edildi:\n"
 "%s"
 
-#: src/server.c:864
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%3$s sohbet odas�na %1$s taraf�ndan davet edilen kullan�c�: %2$s\n"
-
-#: src/server.c:868
+msgstr "%s kullanıcısı %s tarafından %s sohbet odasınadavet edildi\n"
+
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "Sohbet davetini kabul ediyor musunuz?"
 
-#: src/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
-msgstr "_Belirlenmemi�"
-
-#: src/status.c:156
+msgstr "Ayarlanmamış"
+
+#: ../libpurple/status.c:155
 msgid "Unavailable"
-msgstr "Ge�ersiz"
-
-#: src/status.c:621
-#, c-format
-msgid "%s came back"
-msgstr "%s geri d�nd�"
-
-#: src/status.c:626
-#, c-format
-msgid "%s went away"
-msgstr "%s uzakla�t�"
-
-#: src/status.c:1308
+msgstr "Erişilemez"
+
+#: ../libpurple/status.c:159
+msgid "Mobile"
+msgstr "Cep"
+
+#: ../libpurple/status.c:608
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s %s durumundan %s durumuna geçti"
+
+#: ../libpurple/status.c:618
+#, c-format
+msgid "%s is now %s"
+msgstr "%s şimdi %s olarak biliniyor"
+
+#: ../libpurple/status.c:623
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s artık %s değil"
+
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
-msgstr "%s m�sait"
-
-#: src/status.c:1323
+msgstr "%s şimdi uygun"
+
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
-msgstr "%s m�sait de�il"
-
-#: src/status.c:1697
-msgid "Default auto-away"
-msgstr "Otomatik D��ar�da!"
-
-#: src/util.c:2121
+msgstr "%s şimdi uygun değil"
+
+#: ../libpurple/status.c:1312
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s şimdi boşta"
+
+#: ../libpurple/status.c:1314
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s şimdi boşta değil"
+
+#: ../libpurple/util.c:681
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../libpurple/util.c:2496
 #, c-format
 msgid "Error Reading %s"
-msgstr "%s Okunurken Hata"
-
-#: src/util.c:2122
-#, 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 okunurken bir hata ile kar�� kar��ya gelindi. Dosyalar y�klenmedi veya eski dosya %s~ olarak yeniden adland�r�ld�."
-
-#: src/util.c:2567
+msgstr "%s Okuma Hatası"
+
+#: ../libpurple/util.c:2497
+#, 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 okunurken bir hata oluştu.  Dosyalar yüklenmedi ve eski dosya %s~ olarak "
+"yeniden adlandırıldı."
+
+#: ../libpurple/util.c:2967
 msgid "Calculating..."
-msgstr "Hesaplan�yor..."
-
-#: src/util.c:2570
+msgstr "Hesaplanıyor..."
+
+#: ../libpurple/util.c:2970
 msgid "Unknown."
 msgstr "Bilinmeyen."
 
-#: src/util.c:2600
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "saniye"
-
-#: src/util.c:2614
-msgid "day"
-msgid_plural "days"
-msgstr[0] "g�n"
-
-#: src/util.c:2622
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "saat"
-
-#: src/util.c:2630
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "dakika"
-
-#: src/util.c:3053
-msgid "g003: Error opening connection.\n"
-msgstr "g003: Ba�lant�y� a�mada hata.\n"
-
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Liste"
-#~ msgid "_Sorting:"
-#~ msgstr "S�ralama"
-#~ msgid "Buddy Display"
-#~ msgstr "Ki�i G�sterimi"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "Kullan�c� bilgisini g�ster"
-#~ msgid "Gnome Default"
-#~ msgstr "Gnome Varsay�lan"
-#~ msgid "Away m_essage:"
-#~ msgstr "D��ar�da! mesaj�:"
-
-#, fuzzy
-#~ msgid "Quit message"
-#~ msgstr "(1 mesaj)"
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "Yeniden Ba�land���nda D��ar�da! Durumunu Koru"
-#~ msgid "Mail Server"
-#~ msgstr "Posta Sunucusu"
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d yeni/%d toplam)"
-#~ msgid "Check Mail"
-#~ msgstr "Postay� Kontrol Et"
-#~ msgid "Check e-mail every X seconds.\n"
-#~ msgstr "Her X saniyede postay� kontrol et.\n"
-#~ msgid "Auto-login"
-#~ msgstr "Otomatik-ba�lan"
-#~ msgid "New..."
-#~ msgstr "Yeni..."
-#~ msgid "Back"
-#~ msgstr "Geri"
-#~ msgid "Signoff"
-#~ msgstr "Oturumu Kapat"
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Mini �kon Yap�land�rma"
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "Mini ikona t�klanana kadar yeni mesajlar� g�sterme"
-
-#, fuzzy
-#~ msgid "Orientation"
-#~ msgstr "�irket"
-#~ msgid "Not connected to AIM"
-#~ msgstr "AIM'e ba�l� de�ilsiniz"
-#~ msgid "No screenname given."
-#~ msgstr "G�r�n�r isim yok."
-#~ msgid "No roomname given."
-#~ msgstr "Oda ismi yok."
-#~ msgid "Invalid AIM URI"
-#~ msgstr "AIM URI'si hatal�"
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s bir sokete atanamad�:\n"
-#~ "%s"
-#~ msgid "Unable to open socket"
-#~ msgstr "Ba�lant� a��lam�yor"
-#~ msgid "Remote Control"
-#~ msgstr "Uzaktan Kontrol"
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "Gaim uygulamalar� i�in uzaktan eri�im kontrol� sa�lar"
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "3. parti uygulamalar� veya direkt gaim-remote arac� sayesinde Gaim'i "
-#~ "uzaktan kontrol etmenizi sa�lar."
-#~ msgid "GTK Signals Test"
-#~ msgstr "GTK Sinyal Testi"
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "T�m sinyallerin do�ru �al���p �al��mad���n� g�rmek i�in test edin."
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Bu eklenti yeni bir yaz��ma penceresi a�t���n�zda en son yazd�klar�n�z� "
-#~ "pencerede otomatik olarak g�rmenizi sa�lar."
-#~ msgid "_Apply"
-#~ msgstr "_Uygula"
-#~ msgid "Away!"
-#~ msgstr "D��ar�da!"
-#~ msgid "Edit This Message"
-#~ msgstr "Mesaj� D�zenle"
-#~ msgid "I'm Back!"
-#~ msgstr "Geri Geldim!"
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "D��ar�da! mesaj�n� (\"%s\") kald�rmak istedi�inizden emin misiniz?"
-#~ msgid "Remove Away Message"
-#~ msgstr "D��ar�da! Mesaj�n� Kald�r"
-#~ msgid "Set All Away"
-#~ msgstr "Hepsini D��ar�da! Yap"
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "Bo� bir ba�l�kla D��arda! mesaj� kaydedemezsiniz"
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "L�tfen mesaj�n�za bir ba�l�k yaz�n, veya kaydetmeden kullanmak i�in "
-#~ "\"Kullan\"� se�in."
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "Bo� bir D��ar�da! mesaj� yaratamazs�n�z"
-#~ msgid "New away message"
-#~ msgstr "Yeni D��ar�da! mesaj�"
-#~ msgid "Away title: "
-#~ msgstr "D��ar�da! ba�l���:"
-#~ msgid "_Save"
-#~ msgstr "_Kaydet"
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Kaydet & Kullan"
-#~ msgid "Buddy List Error"
-#~ msgstr "Liste Hatas�"
-#~ msgid "Size of the expander arrow"
-#~ msgstr "Geni�letme oku boyutu"
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�al��an di�er Gaim program�n� kapat\n"
-#~ msgid "Show fewer options"
-#~ msgstr "Az se�enek g�ster"
-#~ msgid "Information"
-#~ msgstr "Bilgi"
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/_Ki�iler/_��k�� (�evrimd��� ol)"
-#~ msgid "/Tools/_Away"
-#~ msgstr "/_Ara�lar/_D��ar�da"
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/Ara�lar/Eklentilerle �lgili"
-#~ msgid "Rename Group"
-#~ msgstr "Grubu Yeniden �simlendir"
-#~ msgid "New group name"
-#~ msgstr "Yeni grup ismi"
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "L�tfen se�ili grup i�in yeni bir isim girin."
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Hesap:</b>"
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Uyar�ld�:</b>"
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Uyar�ld� (%d%%) "
-#~ msgid "/Tools/Away"
-#~ msgstr "/Ara�lar/D��ar�da"
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "Se�ti�iniz ki�iye mesaj g�nderin"
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Se�ilmi� ki�inin bilgisini al"
-#~ msgid "_Chat"
-#~ msgstr "_Sohbet"
-#~ msgid "Join a chat room"
-#~ msgstr "Sohbet odas�na kat�l"
-#~ msgid "_Away"
-#~ msgstr "_D��ar�da!"
-#~ msgid "Set an away message"
-#~ msgstr "D��ar�da! mesaj�n� d�zenle"
-#~ msgid "Done."
-#~ msgstr "Tamam."
-#~ msgid "Signon: "
-#~ msgstr "Giri�: "
-#~ msgid "Signon"
-#~ msgstr "Giri�"
-#~ msgid "Cancel All"
-#~ msgstr "T�m�nden Vazge�"
-#~ msgid "_Reconnect"
-#~ msgstr "_Yeniden Ba�lan"
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s ba�lant�s� kesildi.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgid "Reason Unknown."
-#~ msgstr "Bilinmeyen Sebep."
-#~ msgid "Reconnect _All"
-#~ msgstr "_T�m�ne Yeniden Ba�lan"
-#~ msgid "Time"
-#~ msgstr "Zaman"
-#~ msgid "Get Away Msg"
-#~ msgstr "D��ar�da Mesaj�n� Oku"
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Yaz��ma/_Uyar"
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/Yaz��ma/G�r�nen �sim..."
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/_Se�enekler/Zaman� G�ster"
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Yaz��ma/Uyar..."
-#~ msgid "Warn"
-#~ msgstr "Uyar"
-#~ msgid "Warn the user"
-#~ msgstr "Kullan�c�y� uyar"
-#~ msgid "Block the user"
-#~ msgstr "Kullan�c�y� engelle"
-#~ msgid "Send a file to the user"
-#~ msgstr "Kullan�c�ya dosya g�nder"
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "Kullan�c�y� listene ekle"
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "Kullan�c�y� listeden ��kar"
-#~ msgid "Send"
-#~ msgstr "G�nder"
-#~ msgid "Invite"
-#~ msgstr "Davet Et"
-#~ msgid "Invite a user"
-#~ msgstr "Kullan�c�y� davet et"
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "Sohbeti listeye ekle"
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/Yaz��ma/Kapat"
-
-#, fuzzy
-#~ msgid "Azerbaijani"
-#~ msgstr "S�rp�a"
-
-#, fuzzy
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norve� dili"
-#~ msgid "Albanian"
-#~ msgstr "Romence"
-#~ msgid "Turkish"
-#~ msgstr "T�rk�e (ISO-8859-9)"
-#~ msgid "Chinese"
-#~ msgstr "�ince"
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgid "_Screen name"
-#~ msgstr "_Liste ismi"
-#~ msgid "Warn User"
-#~ msgstr "Kullan�c�y� uyar"
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Kimden oldu�u belli olmadan uyar?"
-#~ msgid "Show transfer details"
-#~ msgstr "Transfer detaylar�n� g�ster"
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "G�r�nen isim atanmad��� takdirde takma ismi g�r�nt�le"
-#~ msgid "Display"
-#~ msgstr "G�r�n�m"
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "Mesajlarda zaman� g�ster"
-#~ msgid "Ignore c_olors"
-#~ msgstr "Renkleri yoksay"
-#~ msgid "Ignore font _faces"
-#~ msgstr "Yaz�tipini yoksay"
-#~ msgid "Ignore font si_zes"
-#~ msgstr "Yaz� boyutunu yoksay"
-#~ msgid "Default Formatting"
-#~ msgstr "Varsay�lan Bi�im"
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "Giden mesaj� varsay�lan bi�imlerle g�nder"
-#~ msgid "Send Message"
-#~ msgstr "Mesaj� G�nder"
-#~ msgid "Enter _sends message"
-#~ msgstr "Enter g�nderir"
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "C_ontrol-Enter g�nderir"
-#~ msgid "Window Closing"
-#~ msgstr "Pencereyi Kapatma Se�enekleri"
-#~ msgid "_Escape closes window"
-#~ msgstr "_Escape kapat�r"
-#~ msgid "Insertions"
-#~ msgstr "Eklemeler"
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} yaz� bi�imini de�i�tirir"
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(say�) _g�lery�z ekler"
-#~ msgid "Show _buttons as:"
-#~ msgstr "D��meleri g�ster:"
-#~ msgid "Pictures"
-#~ msgstr "Resim"
-#~ msgid "Text"
-#~ msgstr "Yaz�"
-#~ msgid "Pictures and text"
-#~ msgstr "Resim ve Yaz�"
-#~ msgid "_Raise window on events"
-#~ msgstr "Olaylarda pencereyi g�ster"
-#~ msgid "Show _warning levels"
-#~ msgstr "_Uyar� seviyesini g�ster"
-
-#, fuzzy
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "Otomatik olarak ba�lant�lar� geni�let"
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "\"_taksim\" komutlar�n� alg�la"
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "G�r�nen ismi sekmelerde ve ba�l�klarda g�ster"
-#~ msgid "Tab p_lacement:"
-#~ msgstr "Sekmeleri yerle�tirme:"
-#~ msgid "New conversation _placement:"
-#~ msgstr "Yeni yaz��ma yerle�tirmesi:"
-#~ msgid "Message Logs"
-#~ msgstr "Mesaj Kay�tlar�"
-#~ msgid "System Logs"
-#~ msgstr "Sistem Kay�tlar�"
-#~ msgid "_Enable system log"
-#~ msgstr "Sistem kay�tlar�n� aktifle�tir"
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "Kullan�c� giri�/��k��lar�n� tut"
-#~ msgid "Idle _time reporting:"
-#~ msgstr "Ba�l� s�re raporu:"
-#~ msgid "Gaim usage"
-#~ msgstr "Gaim tipi"
-#~ msgid "X usage"
-#~ msgstr "X tipi"
-#~ msgid "Windows usage"
-#~ msgstr "Windows tipi"
-#~ msgid "Load"
-#~ msgstr "Y�kle"
-#~ msgid "Summary"
-#~ msgstr "�zet"
-#~ msgid "Details"
-#~ msgstr "Detaylar"
-#~ msgid "_Edit"
-#~ msgstr "D�_zenle"
-#~ msgid "Interface"
-#~ msgstr "G�r�n�m"
-#~ msgid "Message Text"
-#~ msgstr "Mesaj Metni"
-#~ msgid "Shortcuts"
-#~ msgstr "K�sayollar"
-#~ msgid "Away Messages"
-#~ msgstr "D��ar�da! Mesaj�"
-#~ msgid "Plugins"
-#~ msgstr "Eklentiler"
-#~ msgid "HTML"
-#~ msgstr "HTML"
-#~ msgid "Plain text"
-#~ msgstr "D�z metin"
-#~ msgid "Please create an account."
-#~ msgstr "L�tfen bir hesap olu�turun."
-#~ msgid "Login"
-#~ msgstr "Giri�"
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_Hesap:</b>"
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>_�ifre:</b>"
-#~ msgid "A_ccounts"
-#~ msgstr "Hesaplar"
-#~ msgid "P_references"
-#~ msgstr "Se�enekler"
-#~ msgid "_Sign on"
-#~ msgstr "_Giri�"
-#~ msgid "Unable to load preferences"
-#~ msgstr "Se�enekler y�klenemedi"
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "Ba�lant� a��lam�yor"
-#~ msgid "Error while writing to socket."
-#~ msgstr "Sokete yazarken hata"
-#~ msgid "Authentication failed."
-#~ msgstr "Kimlik denetimi ba�ar�s�z."
-#~ msgid "Unknown Error Code."
-#~ msgstr "Bilinmeyen Hata Kodu."
-#~ msgid "Status: %s"
-#~ msgstr "Durum: %s"
-#~ msgid "Could not connect"
-#~ msgstr "Ba�lan�lamad�"
-#~ msgid "Reading data"
-#~ msgstr "Veri okunuyor"
-#~ msgid "Reading server key"
-#~ msgstr "Sunucu anahtar� okunuyor"
-
-#, fuzzy
-#~ msgid "Unable to ping server"
-#~ msgstr "Ana bilgisayara ba�lan�lamad�"
-#~ msgid "Send as message"
-#~ msgstr "Mesaj olarak yolla"
-#~ msgid "Couldn't get search results"
-#~ msgstr "Arama sonu�lar� al�namad�"
-#~ msgid "Birth Year"
-#~ msgstr "Do�um Y�l�"
-#~ msgid "Sex"
-#~ msgstr "Cinsiyet"
-#~ msgid "Password couldn't be changed"
-#~ msgstr "�ifre de�i�tirilemedi"
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "Kullan�c�y� listenize eklemek istiyor musunuz?"
-#~ msgid "Unable to access directory"
-#~ msgstr "Klas�re ula��lamad�"
-#~ msgid "Directory Search"
-#~ msgstr "Dizin Aramas�"
-#~ msgid "Send message through server"
-#~ msgstr "Mesaj� server �zerinden yolla"
-#~ msgid "Connecting..."
-#~ msgstr "Ba�lan�l�yor..."
-#~ msgid "Nick:"
-#~ msgstr "Takma Ad:"
-#~ msgid "Gaim User"
-#~ msgstr "Gaim Kullan�c�s�"
-#~ msgid "File Transfer Aborted"
-#~ msgstr "Dosya Transferinden Vazge�ildi"
-#~ msgid "Buddy Information for %s"
-#~ msgstr "%s i�in Bilgi"
-
-#, fuzzy
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "Ge�ersiz Kullan�c� Ad�"
-
-#, fuzzy
-#~ msgid "Invalid nickname"
-#~ msgstr "Ge�ersiz Kullan�c� Ad�"
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber Profili"
-#~ msgid "Roomlist Error"
-#~ msgstr "Oda Listesi Hatas�"
-#~ msgid "Logged out"
-#~ msgstr "Oturum kapand�."
-#~ msgid "Hide Operating System"
-#~ msgstr "��letim Sistemini Gizle"
-#~ msgid "Display conversation closed notices"
-#~ msgstr "Yaz��ma penceresini kapatt���nda bildir"
-#~ msgid "Display timeout notices"
-#~ msgstr "Zamana��mlar�n� bildir"
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "Yaz��ma zaman a��m�na u�rad� ve deaktif oldu."
-#~ msgid "User Properties"
-#~ msgstr "Kullan�c� �zellikleri"
-
-#, fuzzy
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "%s transferi tamamland�"
-
-#, fuzzy
-#~ msgid "Not specified"
-#~ msgstr ""
-#~ "%s se�ilemedi:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "ICQ Info for %s"
-#~ msgstr "<b>Haz�r:</b> %s<br>"
-#~ msgid "Visible"
-#~ msgstr "G�r�n�r"
-
-#, fuzzy
-#~ msgid "Available Message:"
-#~ msgstr "G�n�n Mesaj� mevcut de�il"
-
-#, fuzzy
-#~ msgid "Set Available Message..."
-#~ msgstr "D��ar�da! mesaj�n� d�zenle"
-#~ msgid "Failed to leave channel"
-#~ msgstr "Kanal� terk ederken hata"
-#~ msgid "Basic Profile"
-#~ msgstr "Temel Profil"
-#~ msgid "Profile Information"
-#~ msgstr "Profil Bilgisi"
-#~ msgid "Instant Messagers"
-#~ msgstr "Yeni Mesaj"
-#~ msgid "AIM"
-#~ msgstr "AIM"
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-#~ msgid "MSN"
-#~ msgstr "MSN"
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#, fuzzy
-#~ msgid "I'm From"
-#~ msgstr "Kimden"
-#~ msgid "Profile"
-#~ msgstr "Profil"
-#~ msgid "Set Profile"
-#~ msgstr "Profili D�zenle"
-#~ msgid "Visit Homepage"
-#~ msgstr "Anasayfas�na Git"
-#~ msgid "Local Users"
-#~ msgstr "Yerel Kullan�c�"
-
-#, fuzzy
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Gadu-Gadu Protokol Eklentisi"
-#~ msgid "Please enter your password"
-#~ msgstr "�ifrenizi girin"
-#~ msgid "%s logged in."
-#~ msgstr "%s oturumu a�t�."
-#~ msgid "%s signed on"
-#~ msgstr "%s giri� yapt�"
-#~ msgid "%s logged out."
-#~ msgstr "%s oturumu kapatt�."
-#~ msgid "%s signed off"
-#~ msgstr "%s ��kt�"
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s, %s taraf�ndan uyar�ld�.\n"
-#~ "Yeni uyar� seviyeniz %d%%"
-#~ msgid "an anonymous person"
-#~ msgstr "bilinmeyen ki�i"
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%3$s sohbet odas�na %1$s taraf�ndan davet edilen kullan�c�: %2$s\n"
-#~ "<b>%4$s</b>"
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "Maalesef burda de�ilim."
-
-#, fuzzy
-#~ msgid "SILC Public Key"
-#~ msgstr "'%s' anahtar� silinemedi"
-
-#, fuzzy
-#~ msgid "SILC Private Key"
-#~ msgstr "'%s' anahtar� silinemedi"
-
+#: ../libpurple/util.c:2996
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d saniye"
+
+#: ../libpurple/util.c:3008
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d gün"
+
+#: ../libpurple/util.c:3016
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d saat"
+
+#: ../libpurple/util.c:3022
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d saat"
+
+#: ../libpurple/util.c:3030
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d dakika"
+
+#: ../libpurple/util.c:3036
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d dakika"
+
+#: ../libpurple/util.c:3305 ../libpurple/util.c:3603
+#, c-format
+msgid "Unable to connect to %s"
+msgstr "%s konumuna bağlanılamadı"
+
+#: ../libpurple/util.c:3431
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"%s içeriğini açmak için yeterli bellek konumlandırılamadı.  Web sunucu "
+"zararlı bir şeyler deniyor olabilir."
+
+#: ../libpurple/util.c:3466
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr "%s konumundan okuma hatası: %s"
+
+#: ../libpurple/util.c:3497
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "%s konumundan yazma hatası: %s"
+
+#: ../libpurple/util.c:3522
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr "%s konumuna bağlanılamadı: %s"
+
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "İnternet Mesajlaşma Aracı"
+
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin İnternet Mesajlaşma Aracı"
+
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Bir çok protokol üzerinden anılık ileti gönderin"
+
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Uyum"
+
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Sistem çekmecesi uyumu."
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:406
+msgid "Login Options"
+msgstr "Giriş Seçenekleri"
+
+#: ../pidgin/gtkaccount.c:515
+msgid "Local alias:"
+msgstr "Yerel isim:"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:577
+msgid "User Options"
+msgstr "Kullanıcı Seçenekleri"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:595
+msgid "Use this buddy icon for this account:"
+msgstr "Bu hesap için bu kişi simgesini kullan:"
+
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:715
+#, c-format
+msgid "%s Options"
+msgstr "%s Seçenekleri"
+
+#: ../pidgin/gtkaccount.c:912
+msgid "Use GNOME Proxy Settings"
+msgstr "GnomeProxy Ayarlarını Kullan"
+
+#: ../pidgin/gtkaccount.c:913
+msgid "Use Global Proxy Settings"
+msgstr "Evrensel Proxy Ayarlarını Kullan"
+
+#: ../pidgin/gtkaccount.c:919
+msgid "No Proxy"
+msgstr "Proxy Kullanma"
+
+#: ../pidgin/gtkaccount.c:925
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../pidgin/gtkaccount.c:931
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../pidgin/gtkaccount.c:937
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
+msgid "Use Environmental Settings"
+msgstr "Genel Ayarları Kullan"
+
+#. 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:982
+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:985
+msgid "you can see the butterflies mating"
+msgstr "kelebeklerin çiftleşmesini izleyebilirsiniz"
+
+#: ../pidgin/gtkaccount.c:1006
+msgid "Proxy Options"
+msgstr "Proxy Seçenekleri"
+
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "Proxy _tipi:"
+
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "_Host"
+
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "_Port"
+
+#: ../pidgin/gtkaccount.c:1041
+msgid "_Username:"
+msgstr "_Kullanıcı adı:"
+
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "Par_ola:"
+
+#: ../pidgin/gtkaccount.c:1454
+msgid "Add Account"
+msgstr "Hesap Ekle"
+
+#: ../pidgin/gtkaccount.c:1478
+msgid "_Basic"
+msgstr "_Temel Yapılandırma"
+
+#: ../pidgin/gtkaccount.c:1489
+msgid "_Advanced"
+msgstr "_Gelişmiş Yapılandırma"
+
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
+msgid "Enabled"
+msgstr "Aktif"
+
+#: ../pidgin/gtkaccount.c:1989
+msgid "Protocol"
+msgstr "Protokol"
+
+#: ../pidgin/gtkaccount.c:2183
+#, 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'e Hoş Geldiniz !</span>\n"
+"\n"
+"Yapılandırılmış bir Anında Mesajlaşma hesabınız yok. %s ile hesabınıza "
+"bağlanmak için öncelikle aşağıdaki <b>Ekle</b> düğmesine tıklayarak "
+"hesabınızı yapılandırmalısınız. %s kullanarak birden fazla Anında Mesajlaşma "
+"hesabına bağlanmak istiyorsanız, yine <b>Ekle</b> düğmesine tıklayarak diğer "
+"hesaplarınızı da yapılandırabilirsiniz.\n"
+"\n"
+"Bu pencereye daha sonra ulaşmak isterseniz Kişi Listesi Penceresindeki "
+"<b>Hesaplar->Ekle/Düzenle</b> yolunu takip etmelisiniz."
+
+#: ../pidgin/gtkblist.c:724
+msgid "Join a Chat"
+msgstr "Bir Sohbete Katıl"
+
+#: ../pidgin/gtkblist.c:745
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Lütfen katılmak istediğiniz sohbet hakkında gereken bilgileri açık bir "
+"şekilde girin.\n"
+
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "_Hesap:"
+
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
+msgid "_Block"
+msgstr "_Engelle"
+
+#: ../pidgin/gtkblist.c:1045
+msgid "Un_block"
+msgstr "Engellemeyi _Kaldır"
+
+#: ../pidgin/gtkblist.c:1096
+msgid "Get _Info"
+msgstr "Kişi Bilgilerini _Al"
+
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
+msgid "I_M"
+msgstr "Kişiye Anlık _İleti Göner"
+
+#: ../pidgin/gtkblist.c:1105
+msgid "_Send File"
+msgstr "_Kişiye Dosya Gönder"
+
+#: ../pidgin/gtkblist.c:1112
+msgid "Add Buddy _Pounce"
+msgstr "Kişi İçin Uyarıcı Ekle"
+
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
+msgid "View _Log"
+msgstr "_Geçmiş Sohbetleri Göster"
+
+#: ../pidgin/gtkblist.c:1132
+msgid "Alias..."
+msgstr "Görünen İsim..."
+
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
+msgid "_Alias..."
+msgstr "Kişi İçin _Görünen İsim Ayarla"
+
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
+msgid "_Remove"
+msgstr "_Kaldır"
+
+#: ../pidgin/gtkblist.c:1192
+msgid "Add a _Buddy"
+msgstr "Bir Kişi _Ekle"
+
+#: ../pidgin/gtkblist.c:1195
+msgid "Add a C_hat"
+msgstr "_Bir Sohbet Ekle"
+
+#: ../pidgin/gtkblist.c:1198
+msgid "_Delete Group"
+msgstr "_Grubu Sil"
+
+#: ../pidgin/gtkblist.c:1200
+msgid "_Rename"
+msgstr "_Yeniden Adlandır"
+
+#. join button
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+msgid "_Join"
+msgstr "_Katıl"
+
+#: ../pidgin/gtkblist.c:1220
+msgid "Auto-Join"
+msgstr "Otomatik-Katıl"
+
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
+msgid "_Collapse"
+msgstr "_Daralt"
+
+#: ../pidgin/gtkblist.c:1286
+msgid "_Expand"
+msgstr "_Genişlet"
+
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
+msgid "/Tools/Mute Sounds"
+msgstr "/Araçlar/Sesleri Kapat"
+
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4523
+#: ../pidgin/gtkpounce.c:423
+msgid "You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Bu kişiyi ekleyebilmeniz için bir oturumu açılmış bir hesabınızın olması "
+"gerekir."
+
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2832
+msgid "/_Buddies"
+msgstr "/_Kişiler"
+
+#: ../pidgin/gtkblist.c:2833
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Kişiler/Yeni _İleti..."
+
+#: ../pidgin/gtkblist.c:2834
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Kişiler/Bir Sohbete Ka_tıl..."
+
+#: ../pidgin/gtkblist.c:2835
+msgid "/Buddies/Get User _Info..."
+msgstr "/Kişiler/Kullanıcı B_ilgisi Al..."
+
+#: ../pidgin/gtkblist.c:2836
+msgid "/Buddies/View User _Log..."
+msgstr "/Kişiler/Kişi Kayıtlarını Gö_ster..."
+
+#: ../pidgin/gtkblist.c:2838
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Kişiler/_Çevrimdışı Kişileri Göster"
+
+#: ../pidgin/gtkblist.c:2839
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Kişiler/_Boş Grupları Göster"
+
+#: ../pidgin/gtkblist.c:2840
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Kişiler/Kişi _Ayrıntılarını Göster"
+
+#: ../pidgin/gtkblist.c:2841
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Kişiler/Boşta Sürelerini _Göster"
+
+#: ../pidgin/gtkblist.c:2842
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Kişiler/Kişileri _Sırala"
+
+#: ../pidgin/gtkblist.c:2844
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Kişiler/_Kişi Ekle..."
+
+#: ../pidgin/gtkblist.c:2845
+msgid "/Buddies/Add C_hat..."
+msgstr "/Kişiler/Sohbet Ekle..."
+
+#: ../pidgin/gtkblist.c:2846
+msgid "/Buddies/Add _Group..."
+msgstr "/Kişiler/_Grup Ekle..."
+
+#: ../pidgin/gtkblist.c:2848
+msgid "/Buddies/_Quit"
+msgstr "/_Kişiler/_Çık"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2851
+msgid "/_Accounts"
+msgstr "/_Hesaplar"
+
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Hesaplar/Ekle\\/Düzenle"
+
+#. Tools
+#: ../pidgin/gtkblist.c:2855
+msgid "/_Tools"
+msgstr "/_Araçlar"
+
+#: ../pidgin/gtkblist.c:2856
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Araçlar/Kişi _Uyarıcılar"
+
+#: ../pidgin/gtkblist.c:2857
+msgid "/Tools/Plu_gins"
+msgstr "/Araçlar/Eklentiler"
+
+#: ../pidgin/gtkblist.c:2858
+msgid "/Tools/Pr_eferences"
+msgstr "/Araçlar/_Tercihler"
+
+#: ../pidgin/gtkblist.c:2859
+msgid "/Tools/Pr_ivacy"
+msgstr "/Araçlar/_Gizlilik"
+
+#: ../pidgin/gtkblist.c:2861
+msgid "/Tools/_File Transfers"
+msgstr "/Araçlar/_Dosya Aktarımları"
+
+#: ../pidgin/gtkblist.c:2862
+msgid "/Tools/R_oom List"
+msgstr "/Araçlar/Oda Listesi"
+
+#: ../pidgin/gtkblist.c:2863
+msgid "/Tools/System _Log"
+msgstr "/Araçlar/Sistem Kayıtlarını Göster"
+
+#: ../pidgin/gtkblist.c:2865
+msgid "/Tools/Mute _Sounds"
+msgstr "/Araçlar/Sesleri _Kapat"
+
+#. Help
+#: ../pidgin/gtkblist.c:2868
+msgid "/_Help"
+msgstr "/_Yardım"
+
+#: ../pidgin/gtkblist.c:2869
+msgid "/Help/Online _Help"
+msgstr "/Yardım/Çevrim_içi Yardım"
+
+#: ../pidgin/gtkblist.c:2870
+msgid "/Help/_Debug Window"
+msgstr "/Yardım/_Hata Yakalama Penceresi"
+
+#: ../pidgin/gtkblist.c:2871
+msgid "/Help/_About"
+msgstr "/Yardım/_Pidgin Hakkında"
+
+#: ../pidgin/gtkblist.c:2899
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Hesap:</b> %s"
+
+#: ../pidgin/gtkblist.c:2977
+msgid "Buddy Alias"
+msgstr "Kişi Takma Adı"
+
+#: ../pidgin/gtkblist.c:2998
+msgid "Logged In"
+msgstr "Çevrimiçi"
+
+#: ../pidgin/gtkblist.c:3044
+msgid "Last Seen"
+msgstr "Son Görülme Zamanı"
+
+#: ../pidgin/gtkblist.c:3064
+msgid "Spooky"
+msgstr "Korkunç"
+
+#: ../pidgin/gtkblist.c:3066
+msgid "Awesome"
+msgstr "Harika"
+
+#: ../pidgin/gtkblist.c:3068
+msgid "Rockin'"
+msgstr "Sallanan"
+
+#: ../pidgin/gtkblist.c:3394
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Boşta %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3396
+#, c-format
+msgid "Idle %dm"
+msgstr "Boşta %dm"
+
+#: ../pidgin/gtkblist.c:3533
+msgid "/Buddies/New Instant Message..."
+msgstr "/Kişiler/Yeni Anlık İleti..."
+
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
+msgid "/Buddies/Join a Chat..."
+msgstr "/Kişiler/Bir Sohbete Katıl..."
+
+#: ../pidgin/gtkblist.c:3535
+msgid "/Buddies/Get User Info..."
+msgstr "/Kişiler/Kullanıcı Bilgisi Al..."
+
+#: ../pidgin/gtkblist.c:3536
+msgid "/Buddies/Add Buddy..."
+msgstr "/Kişiler/Kişi Ekle..."
+
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
+msgid "/Buddies/Add Chat..."
+msgstr "/Kişiler/Sohbet Ekle..."
+
+#: ../pidgin/gtkblist.c:3538
+msgid "/Buddies/Add Group..."
+msgstr "/Kişiler/Grup Ekle..."
+
+#: ../pidgin/gtkblist.c:3573
+msgid "/Tools/Privacy"
+msgstr "/Araçlar/Gizlilik"
+
+#: ../pidgin/gtkblist.c:3576
+msgid "/Tools/Room List"
+msgstr "/Araçlar/Oda Listesi"
+
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d okunmamış ileti, gönderen %s\n"
+
+#: ../pidgin/gtkblist.c:3750
+msgid "Manually"
+msgstr "El ile ayarla"
+
+#: ../pidgin/gtkblist.c:3752
+msgid "Alphabetically"
+msgstr "Alfabetik"
+
+#: ../pidgin/gtkblist.c:3753
+msgid "By status"
+msgstr "Duruma göre"
+
+#: ../pidgin/gtkblist.c:3754
+msgid "By log size"
+msgstr "Kayıt büyüklüğüne göre"
+
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s bağlantıyı kesti"
+
+#: ../pidgin/gtkblist.c:3966
+msgid "Re-enable Account"
+msgstr "Hesabı Yeniden Etkinleştir"
+
+#: ../pidgin/gtkblist.c:3990
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s bağlantı kesildi: %s</span>"
+
+#: ../pidgin/gtkblist.c:4142
+msgid "<b>Username:</b>"
+msgstr "<b>Kullanıcı adı:</b>"
+
+#: ../pidgin/gtkblist.c:4149
+msgid "<b>Password:</b>"
+msgstr "<b>Parola:</b>"
+
+#: ../pidgin/gtkblist.c:4160
+msgid "_Login"
+msgstr "_Giriş yap"
+
+#: ../pidgin/gtkblist.c:4245
+msgid "/Accounts"
+msgstr "/Hesaplar"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4259
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span weight='bold' size='larger'>%s'e Hoş Geldiniz!</span>\n"
+"\n"
+"Henüz etkinleştirilmiş bir hesabınız yok.\n"
+"\n"
+"<b>Hesaplar</b> menüsünden <b>Hesaplar-> Ekle/Düzenle</b> yolunu kullanarak "
+"Anında Mesajlaşma hesabınızı etkinleştirin.\n"
+"\n"
+"Hesabınızı etkinleştirdiğinizde, hesabınıza giriş yapabileceksiniz, "
+"durmunuzu ayarlayıp arkadaşlarınızla konuşabileceksiniz."
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4505
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/Kişiler/Çevrimdışı Kişileri Göster"
+
+#: ../pidgin/gtkblist.c:4508
+msgid "/Buddies/Show Empty Groups"
+msgstr "/Kişiler/Boş Grupları Göster"
+
+#: ../pidgin/gtkblist.c:4514
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Kişiler/Kişi Ayrıntılarını Göster"
+
+#: ../pidgin/gtkblist.c:4517
+msgid "/Buddies/Show Idle Times"
+msgstr "/Kişiler/Boşta Süresini Göster"
+
+#: ../pidgin/gtkblist.c:5367
+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 ""
+"Lütfen eklemek istediğiniz kişinin listedeki ismini girin. İsterseniz "
+"kişinin görünen ismini değiştirebilirsiniz. Böylece mümkün olduğu takdirde "
+"girdiğiniz isim, kişinin kayıtlı ismi yerine listenizde görünecektir.\n"
+
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Grup:"
+
+#: ../pidgin/gtkblist.c:5686
+msgid "This protocol does not support chat rooms."
+msgstr "Bu protokol sohbet odalarını desteklemiyor."
+
+#: ../pidgin/gtkblist.c:5702
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "Sohbet etmek için hiçbir sohbet protokolüne giriş yapmadınız."
+
+#: ../pidgin/gtkblist.c:5743
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Lütfen bir görünen isim ve listeye eklemek istediğiniz sohbet hakkında uygun "
+"bir bilgi girin.\n"
+
+#: ../pidgin/gtkblist.c:5826
+msgid "Please enter the name of the group to be added."
+msgstr "Lütfen eklemek istediğiniz grubun ismini girin."
+
+#: ../pidgin/gtkblist.c:6466
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/Hesaplar/"
+
+#: ../pidgin/gtkblist.c:6490
+msgid "_Edit Account"
+msgstr "_Hesabı Düzenle"
+
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2911
+msgid "No actions available"
+msgstr "Kullanılabilir işlem yok"
+
+#: ../pidgin/gtkblist.c:6511
+msgid "_Disable"
+msgstr "_Hesabı Pasifleştir"
+
+#: ../pidgin/gtkblist.c:6523
+msgid "Enable Account"
+msgstr "Hesabı Etkinleştir"
+
+#: ../pidgin/gtkblist.c:6529
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Hesaplar/Hesabı Etkinleştir"
+
+#: ../pidgin/gtkblist.c:6578
+msgid "/Tools"
+msgstr "/Araçlar"
+
+#: ../pidgin/gtkblist.c:6648
+msgid "/Buddies/Sort Buddies"
+msgstr "/Kişiler/Kişileri Sırala"
+
+#: ../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 siz hatayı düzeltip hesabınızı yeniden etkinleştirene kadar yeniden "
+"bağlanmayacak."
+
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "Kişi bu sohbetle aynı protokol üzerinde değil."
+
+#: ../pidgin/gtkconv.c:808
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "Bu kişiyi davet etmek için henüz geçerli bir hesaptan oturum açmadınız."
+
+#: ../pidgin/gtkconv.c:861
+msgid "Invite Buddy Into Chat Room"
+msgstr "Kişiyi Sohbet Odasına Davet Et"
+
+#. Put our happy label in it.
+#: ../pidgin/gtkconv.c:891
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"İsterseniz bir davet mesajıyla beraber davet etmek istediğiniz kişinin "
+"ismini girin."
+
+#: ../pidgin/gtkconv.c:912
+msgid "_Buddy:"
+msgstr "_Kişi:"
+
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
+msgid "_Message:"
+msgstr "_İleti:"
+
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:217
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "Dosya açılamıyor."
+
+#: ../pidgin/gtkconv.c:995
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>%s ile yazışma</h1>\n"
+
+#: ../pidgin/gtkconv.c:1019
+msgid "Save Conversation"
+msgstr "Yazışmayı Kaydet"
+
+#: ../pidgin/gtkconv.c:1168 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
+msgid "Find"
+msgstr "Bul"
+
+#: ../pidgin/gtkconv.c:1194 ../pidgin/gtkdebug.c:193
+msgid "_Search for:"
+msgstr "_Şunu Ara:"
+
+#: ../pidgin/gtkconv.c:1346
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "Kayıt tutma başlatıldı. Bundan sonraki iletiler kaydedilecek."
+
+#: ../pidgin/gtkconv.c:1354
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Kayıt tutma durduruldu. Bundan sonraki iletiler kaydedilmeyecek."
+
+#: ../pidgin/gtkconv.c:1602
+msgid "Un-Ignore"
+msgstr "Yoksayma"
+
+#: ../pidgin/gtkconv.c:1605
+msgid "Ignore"
+msgstr "Yoksay"
+
+#: ../pidgin/gtkconv.c:1625
+msgid "Get Away Message"
+msgstr "Uzakta İletisi Al"
+
+#: ../pidgin/gtkconv.c:1648
+msgid "Last said"
+msgstr "Son söylenen"
+
+#: ../pidgin/gtkconv.c:2495
+msgid "Unable to save icon file to disk."
+msgstr "Simge dosyası diske kaydedilemedi."
+
+#: ../pidgin/gtkconv.c:2546
+msgid "Save Icon"
+msgstr "Simgeyi Kaydet"
+
+#: ../pidgin/gtkconv.c:2598
+msgid "Animate"
+msgstr "Oynat"
+
+#: ../pidgin/gtkconv.c:2603
+msgid "Hide Icon"
+msgstr "Simgeyi Gizle"
+
+#: ../pidgin/gtkconv.c:2606
+msgid "Save Icon As..."
+msgstr "Simgeyi Farklı Kaydet..."
+
+#: ../pidgin/gtkconv.c:2610
+msgid "Set Custom Icon..."
+msgstr "Özel Simge Ayarla..."
+
+#: ../pidgin/gtkconv.c:2623
+msgid "Remove Custom Icon"
+msgstr "Özel Simgeyi Kaldır"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2765
+msgid "/_Conversation"
+msgstr "/_Yazışma"
+
+#: ../pidgin/gtkconv.c:2767
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Yazışma/Yeni _Anlık İleti..."
+
+#: ../pidgin/gtkconv.c:2772
+msgid "/Conversation/_Find..."
+msgstr "/Yazışma/_Bul..."
+
+#: ../pidgin/gtkconv.c:2774
+msgid "/Conversation/View _Log"
+msgstr "/Yazışma/_Kayıtları Göster"
+
+#: ../pidgin/gtkconv.c:2775
+msgid "/Conversation/_Save As..."
+msgstr "/Yazışma/_Farklı Kaydet..."
+
+#: ../pidgin/gtkconv.c:2777
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Yazışma/Temi_zle"
+
+#: ../pidgin/gtkconv.c:2781
+msgid "/Conversation/Se_nd File..."
+msgstr "/Yazışma/Kişiye _Dosya Gönder..."
+
+#: ../pidgin/gtkconv.c:2782
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Yazışma/Kişi _Uyarıcı Ekle..."
+
+#: ../pidgin/gtkconv.c:2784
+msgid "/Conversation/_Get Info"
+msgstr "/Yazışma/_Bilgi Al..."
+
+#: ../pidgin/gtkconv.c:2786
+msgid "/Conversation/In_vite..."
+msgstr "/Yazışma/Davet Et..."
+
+#: ../pidgin/gtkconv.c:2788
+msgid "/Conversation/M_ore"
+msgstr "/Yazışma/_Daha Fazla"
+
+#: ../pidgin/gtkconv.c:2792
+msgid "/Conversation/Al_ias..."
+msgstr "/Yazışma/Görünen İs_im..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/_Block..."
+msgstr "/Yazışma/En_gelle..."
+
+#: ../pidgin/gtkconv.c:2796
+msgid "/Conversation/_Unblock..."
+msgstr "/Yazışma/Engellemeyi _Kaldır..."
+
+#: ../pidgin/gtkconv.c:2798
+msgid "/Conversation/_Add..."
+msgstr "/Yazışma/_Ekle..."
+
+#: ../pidgin/gtkconv.c:2800
+msgid "/Conversation/_Remove..."
+msgstr "/Yazışma/_Kaldır..."
+
+#: ../pidgin/gtkconv.c:2805
+msgid "/Conversation/_Close"
+msgstr "/Yazışma/_Kapat"
+
+#. Options
+#: ../pidgin/gtkconv.c:2809
+msgid "/_Options"
+msgstr "/_Seçenekler"
+
+#: ../pidgin/gtkconv.c:2810
+msgid "/Options/Enable _Logging"
+msgstr "/Seçenekler/_Kayıt Tutmayı Etkinleştir"
+
+#: ../pidgin/gtkconv.c:2811
+msgid "/Options/Enable _Sounds"
+msgstr "/Seçenekler/Sesleri E_tkinleştir"
+
+#: ../pidgin/gtkconv.c:2812
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Seçenekler/Kişi Simgesini Göster"
+
+#: ../pidgin/gtkconv.c:2814
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Seçenekler/Biçimlendirme Çubuklarını Gös_ter"
+
+#: ../pidgin/gtkconv.c:2815
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Seçenekler/Za_manı Etiketlerini Göster"
+
+#: ../pidgin/gtkconv.c:2890
+msgid "/Conversation/More"
+msgstr "/Yazışma/Daha Fazla"
+
+#. 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:2935 ../pidgin/gtkconv.c:2967
+msgid "/Conversation"
+msgstr "/Yazışma"
+
+#: ../pidgin/gtkconv.c:2975
+msgid "/Conversation/View Log"
+msgstr "/Yazışma/Kayıtları Göster"
+
+#: ../pidgin/gtkconv.c:2981
+msgid "/Conversation/Send File..."
+msgstr "/Yazışma/Kişiye Dosya Gönder..."
+
+#: ../pidgin/gtkconv.c:2985
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Yazışma/Kişi Uyarıcı Ekle..."
+
+#: ../pidgin/gtkconv.c:2991
+msgid "/Conversation/Get Info"
+msgstr "/Yazışma/Bilgi Al..."
+
+#: ../pidgin/gtkconv.c:2995
+msgid "/Conversation/Invite..."
+msgstr "/Yazışma/Davet Et..."
+
+#: ../pidgin/gtkconv.c:3001
+msgid "/Conversation/Alias..."
+msgstr "/Yazışma/Görünen İsim..."
+
+#: ../pidgin/gtkconv.c:3005
+msgid "/Conversation/Block..."
+msgstr "/Yazışma/Engelle..."
+
+#: ../pidgin/gtkconv.c:3009
+msgid "/Conversation/Unblock..."
+msgstr "/Yazışma/Engellemeyi Kaldır..."
+
+#: ../pidgin/gtkconv.c:3013
+msgid "/Conversation/Add..."
+msgstr "/Yazışma/Ekle..."
+
+#: ../pidgin/gtkconv.c:3017
+msgid "/Conversation/Remove..."
+msgstr "/Yazışma/Kaldır..."
+
+#: ../pidgin/gtkconv.c:3021
+msgid "/Options/Enable Logging"
+msgstr "/Seçenekler/Kayıt Tutmayı Etkinleştir"
+
+#: ../pidgin/gtkconv.c:3024
+msgid "/Options/Enable Sounds"
+msgstr "/Seçenekler/Sesleri Etkinleştir"
+
+#: ../pidgin/gtkconv.c:3037
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Seçenekler/Biçimlendirme Çubuklarını Göster"
+
+#: ../pidgin/gtkconv.c:3040
+msgid "/Options/Show Timestamps"
+msgstr "/Seçenekler/Zamanı Etiketlerini Göster"
+
+#: ../pidgin/gtkconv.c:3043
+msgid "/Options/Show Buddy Icon"
+msgstr "/Seçenekler/Kişi Simgesini Göster"
+
+#: ../pidgin/gtkconv.c:3127 ../pidgin/gtkconv.c:3169
+msgid "User is typing..."
+msgstr "Kullanıcı yazıyor..."
+
+#: ../pidgin/gtkconv.c:3172
+msgid "User has typed something and stopped"
+msgstr "Kullanıcı bir şeyler yazdı ve durdu"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3354
+msgid "_Send To"
+msgstr "_Şuna Gönder"
+
+#: ../pidgin/gtkconv.c:4068
+msgid "_Send"
+msgstr "_Gönder"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4217
+msgid "0 people in room"
+msgstr "Odada kimse yok"
+
+#: ../pidgin/gtkconv.c:5409 ../pidgin/gtkconv.c:5530
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "Odada %d kişi var"
+
+#: ../pidgin/gtkconv.c:6096 ../pidgin/gtkstatusbox.c:657
+msgid "Typing"
+msgstr "Yazıyor"
+
+#: ../pidgin/gtkconv.c:6102
+msgid "Stopped Typing"
+msgstr "Yazmayı Bıraktı"
+
+#: ../pidgin/gtkconv.c:6107
+msgid "Nick Said"
+msgstr "Takma Ad Söylüyor"
+
+#: ../pidgin/gtkconv.c:6112 ../pidgin/gtkdocklet.c:492
+msgid "Unread Messages"
+msgstr "Okunmamış İletiler"
+
+#: ../pidgin/gtkconv.c:6117
+msgid "New Event"
+msgstr "Yeni Olay"
+
+#: ../pidgin/gtkconv.c:7246
+msgid "Confirm close"
+msgstr "Kapatmayı onayla"
+
+#: ../pidgin/gtkconv.c:7278
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Okunmamış iletileriniz var. Pencereyi kapatmak istediğinize emin misiniz?"
+
+#: ../pidgin/gtkconv.c:7795
+msgid "Close other tabs"
+msgstr "Diğer sekmeleri kapat"
+
+#: ../pidgin/gtkconv.c:7801
+msgid "Close all tabs"
+msgstr "Tüm sekmeleri kapat"
+
+#: ../pidgin/gtkconv.c:7809
+msgid "Detach this tab"
+msgstr "Bu sekmeyi ayır"
+
+#: ../pidgin/gtkconv.c:7815
+msgid "Close this tab"
+msgstr "Bu sekmeyi kapat"
+
+#: ../pidgin/gtkconv.c:8199
+msgid "Close conversation"
+msgstr "Yazışmayı kapat"
+
+#: ../pidgin/gtkconv.c:8720
+msgid "Last created window"
+msgstr "Son açılan pencere"
+
+#: ../pidgin/gtkconv.c:8722
+msgid "Separate IM and Chat windows"
+msgstr "Mesaj ve sohbet pencerelerini ayır"
+
+#: ../pidgin/gtkconv.c:8724 ../pidgin/gtkprefs.c:1303
+msgid "New window"
+msgstr "Yeni pencere"
+
+#: ../pidgin/gtkconv.c:8726
+msgid "By group"
+msgstr "Gruba göre"
+
+#: ../pidgin/gtkconv.c:8728
+msgid "By account"
+msgstr "Hesaba göre"
+
+#: ../pidgin/gtkdebug.c:232
+msgid "Save Debug Log"
+msgstr "Hata Kaydını Kaydet"
+
+#: ../pidgin/gtkdebug.c:580
+msgid "Invert"
+msgstr "Tersine çevir"
+
+#: ../pidgin/gtkdebug.c:583
+msgid "Highlight matches"
+msgstr "Bulunanları vurgula"
+
+#: ../pidgin/gtkdebug.c:650
+msgid "_Icon Only"
+msgstr "_Sadece Simge"
+
+#: ../pidgin/gtkdebug.c:651
+msgid "_Text Only"
+msgstr "Sadece _Metin"
+
+#: ../pidgin/gtkdebug.c:652
+msgid "_Both Icon & Text"
+msgstr "Simge & Metin _Birlikte"
+
+#: ../pidgin/gtkdebug.c:773
+msgid "Filter"
+msgstr "Filtre"
+
+#: ../pidgin/gtkdebug.c:792
+msgid "Right click for more options."
+msgstr "Daha fazla seçenek için sağ tıklayın."
+
+#: ../pidgin/gtkdebug.c:822
+msgid "Level "
+msgstr "Düzey "
+
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
+msgid "Select the debug filter level."
+msgstr "Hata ayıklama filtresi düzeyini seçin."
+
+#: ../pidgin/gtkdebug.c:831
+msgid "All"
+msgstr "Tümü"
+
+#: ../pidgin/gtkdebug.c:832
+msgid "Misc"
+msgstr "Diğer"
+
+#: ../pidgin/gtkdebug.c:834
+msgid "Warning"
+msgstr "Uyarı"
+
+#: ../pidgin/gtkdebug.c:835
+msgid "Error "
+msgstr "Hata "
+
+#: ../pidgin/gtkdebug.c:836
+msgid "Fatal Error"
+msgstr "Ölümcül Hata"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+msgid "lead developer"
+msgstr "lider geliştirici"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
+msgid "developer"
+msgstr "geliştirici"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "geliştirici & site yöneticisi"
+
+#: ../pidgin/gtkdialogs.c:85
+msgid "support"
+msgstr "destek"
+
+#: ../pidgin/gtkdialogs.c:86
+msgid "support/QA"
+msgstr "destek / Soru Yanıt"
+
+#: ../pidgin/gtkdialogs.c:109
+msgid "win32 port"
+msgstr "win32 portu"
+
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+msgid "maintainer"
+msgstr "bakımcı"
+
+#: ../pidgin/gtkdialogs.c:112
+msgid "libfaim maintainer"
+msgstr "libfaim bakımcısı"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:114
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker ve belirtilmiş sürücü [lazy bum]"
+
+#: ../pidgin/gtkdialogs.c:115
+msgid "XMPP developer"
+msgstr "XMPP geliştiricisi"
+
+#: ../pidgin/gtkdialogs.c:116
+msgid "original author"
+msgstr "asıl yazar"
+
+#: ../pidgin/gtkdialogs.c:123
+msgid "Afrikaans"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:124
+msgid "Arabic"
+msgstr "Arapça"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "Bulgarca"
+
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+msgid "Bengali"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:131
+msgid "Bosnian"
+msgstr "Boşnakça"
+
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
+msgid "Catalan"
+msgstr "Katalan dili"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+msgid "Valencian-Catalan"
+msgstr "Valencian Katalan dili"
+
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+msgid "Czech"
+msgstr "Çekçe"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+msgid "Danish"
+msgstr "Danimarka dili"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
+msgid "German"
+msgstr "Almanca"
+
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
+msgid "Dzongkha"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+msgid "Greek"
+msgstr "Yunanca"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "Australian English"
+msgstr "Avusturalya İngilizcesi"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "Kanada İngilizcesi"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "İngiliz İngilizcesi"
+
+#: ../pidgin/gtkdialogs.c:148
+msgid "Esperanto"
+msgstr "Esperanto Dili"
+
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
+msgid "Spanish"
+msgstr "İspanyolca"
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+msgid "Euskera(Basque)"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
+msgid "Persian"
+msgstr "Farsça"
+
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+msgid "Finnish"
+msgstr "Fince"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
+msgid "French"
+msgstr "Fransızca"
+
+#: ../pidgin/gtkdialogs.c:157
+msgid "Galician"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+msgid "Gujarati"
+msgstr "Gujarati (Hindistanda konuşulan bir dil)"
+
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+msgid "Hebrew"
+msgstr "İbranice"
+
+#: ../pidgin/gtkdialogs.c:161
+msgid "Hindi"
+msgstr "Hindu dili"
+
+#: ../pidgin/gtkdialogs.c:162
+msgid "Hungarian"
+msgstr "Macarca"
+
+#: ../pidgin/gtkdialogs.c:163
+msgid "Indonesian"
+msgstr "Endonezya Dili"
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+msgid "Italian"
+msgstr "İtalyanca"
+
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+msgid "Japanese"
+msgstr "Japonca"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+msgid "Georgian"
+msgstr "Gürcü Dili"
+
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada"
+msgstr "Kannada (Hindistanda konuşulan bir dil)"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+msgid "Korean"
+msgstr "Korece"
+
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
+msgid "Kurdish"
+msgstr "Kürtçe"
+
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
+msgid "Lithuanian"
+msgstr "Litvanca"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Macedonian"
+msgstr "Makedonca"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Bokmål Norwegian"
+msgstr "Norveççe"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Nepali"
+msgstr "Nepal Dili"
+
+#: ../pidgin/gtkdialogs.c:176
+msgid "Dutch, Flemish"
+msgstr "Hollandaca, Flamanca"
+
+#: ../pidgin/gtkdialogs.c:177
+msgid "Norwegian"
+msgstr "Norveç dili"
+
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+msgid "Polish"
+msgstr "Polonyaca"
+
+#: ../pidgin/gtkdialogs.c:181
+msgid "Portuguese"
+msgstr "Portekizce"
+
+#: ../pidgin/gtkdialogs.c:182
+msgid "Portuguese-Brazil"
+msgstr "Portekizce-Brezilyaca"
+
+#: ../pidgin/gtkdialogs.c:183
+msgid "Pashto"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:184
+msgid "Romanian"
+msgstr "Romence"
+
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+msgid "Russian"
+msgstr "Rusça"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
+msgid "Slovak"
+msgstr "Slovak dili"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+msgid "Slovenian"
+msgstr "Sloven dili"
+
+#: ../pidgin/gtkdialogs.c:189
+msgid "Albanian"
+msgstr "Arnavutça"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+msgid "Serbian"
+msgstr "Sırpça"
+
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+msgid "Swedish"
+msgstr "İsveççe"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Thai"
+msgstr "Tayvan Dili"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Turkish"
+msgstr "Türkçe"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "Vietnamese"
+msgstr "Vietnam Dili"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh ve Gnome-Vi Takımı"
+
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+msgid "Simplified Chinese"
+msgstr "Çince (Basit)"
+
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "Hong Kong Çincesi"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
+msgid "Traditional Chinese"
+msgstr "Çince (Geleneksel)"
+
+#: ../pidgin/gtkdialogs.c:208
+msgid "Amharic"
+msgstr "Habeşçe (EZ+)"
+
+#: ../pidgin/gtkdialogs.c:327
+#, c-format
+msgid "About %s"
+msgstr "%s Hakkında"
+
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to 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 ""
+"%s AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, "
+"Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, ve QQ protokollerini destekleyen "
+"libpurple tabanlı, modüler bir mesajlaşma istemcisidir.  GTK+ kullanılarak yazılmıştır."
+"<BR><BR>GPL (sürüm 2) lisansı altında uygulamayı değiştirebilir ve "
+"dağıtabilirsiniz. GPL Lisansının bir kopyası %s ile dağıtılan COPYING "
+"dosyasındadır. %s'in telif hakları katılımcılarına aittir. Bilgi edinmek "
+"için COPYRIGHT dosyasına ya da katılımcıların tüm listesine bakabilirsiniz. "
+"Bu uygulama için garanti vermiyoruz.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net #pidgin-win32<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:384
+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:390
+msgid "Current Developers"
+msgstr "Şimdiki Geliştiriciler"
+
+#: ../pidgin/gtkdialogs.c:405
+msgid "Crazy Patch Writers"
+msgstr "Çılgın Yama Yazarları"
+
+#: ../pidgin/gtkdialogs.c:420
+msgid "Retired Developers"
+msgstr "Önceki Geliştiriciler"
+
+#: ../pidgin/gtkdialogs.c:435
+msgid "Artists"
+msgstr "Sanatçılar"
+
+#: ../pidgin/gtkdialogs.c:450
+msgid "Current Translators"
+msgstr "Şimdiki Çevirmenler"
+
+#: ../pidgin/gtkdialogs.c:470
+msgid "Past Translators"
+msgstr "Önceki Çevirmenler"
+
+#: ../pidgin/gtkdialogs.c:488
+msgid "Debugging Information"
+msgstr "Hata Ayıklama Bilgileri"
+
+#: ../pidgin/gtkdialogs.c:857
+msgid "Get User Info"
+msgstr "Kullanıcı Bilgisini Al"
+
+#: ../pidgin/gtkdialogs.c:859
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Lütfen bilgilerini görmek istediğiniz kişinin görüntü veya etiket ismini "
+"giriniz."
+
+#: ../pidgin/gtkdialogs.c:949
+msgid "View User Log"
+msgstr "Kullanıcı Kaydını Al"
+
+#: ../pidgin/gtkdialogs.c:951
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"Lütfen kayıtlarını görmek istediğiniz kişinin görüntü veya etiket ismini "
+"giriniz."
+
+#: ../pidgin/gtkdialogs.c:971
+msgid "Alias Contact"
+msgstr "Görünen İsim"
+
+#: ../pidgin/gtkdialogs.c:972
+msgid "Enter an alias for this contact."
+msgstr "Bu kişi için görünen ismi girin."
+
+#: ../pidgin/gtkdialogs.c:994
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "%s için görünen ismi girin."
+
+#: ../pidgin/gtkdialogs.c:996
+msgid "Alias Buddy"
+msgstr "Görünen İsim..."
+
+#: ../pidgin/gtkdialogs.c:1017
+msgid "Alias Chat"
+msgstr "Görünen Sohbet"
+
+#: ../pidgin/gtkdialogs.c:1018
+msgid "Enter an alias for this chat."
+msgstr "Bu sohbet için görünen ismi girin."
+
+#: ../pidgin/gtkdialogs.c:1057
+#, 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 ve %d içeren kişiyi kişi listenizden silmek üzeresiniz. Devam etmek "
+"istiyor musunuz?"
+
+#: ../pidgin/gtkdialogs.c:1065
+msgid "Remove Contact"
+msgstr "Kişiyi Kaldır"
+
+#: ../pidgin/gtkdialogs.c:1068
+msgid "_Remove Contact"
+msgstr "_Kişiyi Kaldır"
+
+#: ../pidgin/gtkdialogs.c:1099
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr "%s grubunu %s grubu ile birleştimek üzeresiniz. Devam etmek istiyor musunuz?"
+
+#: ../pidgin/gtkdialogs.c:1106
+msgid "Merge Groups"
+msgstr "Grupları Birleştir"
+
+#: ../pidgin/gtkdialogs.c:1109
+msgid "_Merge Groups"
+msgstr "_Grupları Birleştir"
+
+#: ../pidgin/gtkdialogs.c:1159
+#, 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 grubu ve içerdiği üyeleri arkadaş listenizden silmek üzeresiniz.  Devam "
+"etmek istiyor musunuz?"
+
+#: ../pidgin/gtkdialogs.c:1162
+msgid "Remove Group"
+msgstr "_Grubu Sil"
+
+#: ../pidgin/gtkdialogs.c:1165
+msgid "_Remove Group"
+msgstr "_Grubu Kaldır"
+
+#: ../pidgin/gtkdialogs.c:1198
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+"%s ögesini kullanıcı listenizden silmek üzeresiniz.  Devam etmek istiyor "
+"musunuz?"
+
+#: ../pidgin/gtkdialogs.c:1201
+msgid "Remove Buddy"
+msgstr "Kişiyi Sil"
+
+#: ../pidgin/gtkdialogs.c:1204
+msgid "_Remove Buddy"
+msgstr "Kişiyi _Kaldır"
+
+#: ../pidgin/gtkdialogs.c:1225
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"Kişi listenizdeki %s sohbetini kaldırmak üzeresiniz.  Devam etmek istiyor "
+"musunuz?"
+
+#: ../pidgin/gtkdialogs.c:1228
+msgid "Remove Chat"
+msgstr "Sohbeti Sil"
+
+#: ../pidgin/gtkdialogs.c:1231
+msgid "_Remove Chat"
+msgstr "_Sohbeti Kaldır"
+
+#: ../pidgin/gtkdocklet.c:150
+msgid "Right-click for more unread messages...\n"
+msgstr "Daha fazla okunmamış ileti için sağ tıklayın...\n"
+
+#: ../pidgin/gtkdocklet.c:435
+msgid "Change Status"
+msgstr "Durumu Değiştir"
+
+#: ../pidgin/gtkdocklet.c:487
+msgid "Show Buddy List"
+msgstr "Kişi Listesini Görüntüle"
+
+#: ../pidgin/gtkdocklet.c:513
+msgid "New Message..."
+msgstr "Yeni İleti..."
+
+#: ../pidgin/gtkdocklet.c:528
+msgid "Mute Sounds"
+msgstr "Sesleri Kapat"
+
+#: ../pidgin/gtkdocklet.c:535
+msgid "Blink on new message"
+msgstr "Yeni ileti gelince parla"
+
+#: ../pidgin/gtkdocklet.c:542
+msgid "Quit"
+msgstr "Çık"
+
+#: ../pidgin/gtkft.c:153
+msgid "Not started"
+msgstr "Başlamadı"
+
+#: ../pidgin/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Alınan:</b>"
+
+#: ../pidgin/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>Gönderen:</b>"
+
+#: ../pidgin/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>Kime:</b>"
+
+#: ../pidgin/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>Gönderilen:</b>"
+
+#: ../pidgin/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr "Bu dosyayı açmak için uygulama belirtilmemiş."
+
+#: ../pidgin/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "Dosyayı açarken bir hata oluştu."
+
+#: ../pidgin/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "%s çalıştırma hatası: %s"
+
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "%s çalıştırma hatası"
+
+#: ../pidgin/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr "İşlemde hata oluştu. Hata Kodu: %d"
+
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr "Dosya adı:"
+
+#: ../pidgin/gtkft.c:697
+msgid "Local File:"
+msgstr "Yerel Dosya:"
+
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr "Hız:"
+
+#: ../pidgin/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "Geçen Süre:"
+
+#: ../pidgin/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "Kalan Süre:"
+
+#: ../pidgin/gtkft.c:786
+msgid "Close this window when all transfers _finish"
+msgstr "Tüm aktarımlar tamamlanınca bu pencereyi _kapat"
+
+#: ../pidgin/gtkft.c:796
+msgid "C_lear finished transfers"
+msgstr "Tamamlanan transferleri _temizle"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:805
+msgid "File transfer _details"
+msgstr "Dosya transferi _ayrıntıları"
+
+#. Pause button
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+msgid "_Pause"
+msgstr "_Durakla"
+
+#. Resume button
+#: ../pidgin/gtkft.c:845
+msgid "_Resume"
+msgstr "Devam _Et"
+
+#: ../pidgin/gtkimhtml.c:792
+msgid "Paste as Plain _Text"
+msgstr "_Düz Metin olarak Yapıştır"
+
+#: ../pidgin/gtkimhtml.c:809
+msgid "_Reset formatting"
+msgstr "_Biçimlemeyi temizle"
+
+#: ../pidgin/gtkimhtml.c:1295
+msgid "Hyperlink color"
+msgstr "Bağlantı rengi"
+
+#: ../pidgin/gtkimhtml.c:1296
+msgid "Color to draw hyperlinks."
+msgstr "Bağlantıları renklendir."
+
+#: ../pidgin/gtkimhtml.c:1299
+msgid "Hyperlink prelight color"
+msgstr "Bağlantı önrengi"
+
+#: ../pidgin/gtkimhtml.c:1300
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Bağlantıları fare üzerine geldiğinde renklendir."
+
+#: ../pidgin/gtkimhtml.c:1516
+msgid "_Copy E-Mail Address"
+msgstr "E-Posta Adresini _Kopyala"
+
+#: ../pidgin/gtkimhtml.c:1528
+msgid "_Open Link in Browser"
+msgstr "_Bağlantıyı Tarayıcıda Aç"
+
+#: ../pidgin/gtkimhtml.c:1538
+msgid "_Copy Link Location"
+msgstr "Bağlantıyı _Konumunu Kopyala"
+
+#: ../pidgin/gtkimhtml.c:3211
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>Tanınmayan dosya türü.</span>\n"
+"\n"
+"PNG ye düzenleniyor."
+
+#: ../pidgin/gtkimhtml.c:3214
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Tanınmayan dosya türü\n"
+"\n"
+"PNG varsayılan yapılıyor."
+
+#: ../pidgin/gtkimhtml.c:3227
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Resmi kaydederken hata</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3230
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Resim kaydetme hatası\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
+msgid "Save Image"
+msgstr "Resmi Kaydet"
+
+#: ../pidgin/gtkimhtml.c:3350
+msgid "_Save Image..."
+msgstr "Resmi _Kaydet..."
+
+#: ../pidgin/gtkimhtmltoolbar.c:147
+msgid "Select Font"
+msgstr "Yazıtipi Seç"
+
+#: ../pidgin/gtkimhtmltoolbar.c:226
+msgid "Select Text Color"
+msgstr "Metin Rengini Seç"
+
+#: ../pidgin/gtkimhtmltoolbar.c:305
+msgid "Select Background Color"
+msgstr "Arkaplan Rengini Seç"
+
+#: ../pidgin/gtkimhtmltoolbar.c:394
+msgid "_URL"
+msgstr "_URL"
+
+#: ../pidgin/gtkimhtmltoolbar.c:402
+msgid "_Description"
+msgstr "_Açıklama"
+
+#: ../pidgin/gtkimhtmltoolbar.c:405
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Lütfen eklemek istediğiniz bağlantıyı ve açıklamasını girin. Açıklama "
+"zorunlu değildir."
+
+#: ../pidgin/gtkimhtmltoolbar.c:409
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Lütfen eklemek istediğiniz bağlantıyı girin."
+
+#: ../pidgin/gtkimhtmltoolbar.c:414
+msgid "Insert Link"
+msgstr "Bağlantı Ekle"
+
+#: ../pidgin/gtkimhtmltoolbar.c:418
+msgid "_Insert"
+msgstr "_Ekle"
+
+#: ../pidgin/gtkimhtmltoolbar.c:487
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Resim kaydedilemedi: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+msgid "Insert Image"
+msgstr "Resim Ekle"
+
+#: ../pidgin/gtkimhtmltoolbar.c:721
+msgid "This theme has no available smileys."
+msgstr "Bu tema gülenyüz içermiyor."
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:735
+msgid "Smile!"
+msgstr "Gülenyüz!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Kalın"
+
+#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "İtalik"
+
+#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Altı çizili"
+
+#: ../pidgin/gtkimhtmltoolbar.c:960
+msgid "Larger font size"
+msgstr "Daha büyük yazıtipi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:972
+msgid "Smaller font size"
+msgstr "Daha küçük yazıtipi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "Yazıtipi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1001
+msgid "Foreground font color"
+msgstr "Yazı rengi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1013
+msgid "Background color"
+msgstr "Arkaplan rengi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "Biçemi temizle"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1044
+msgid "Insert link"
+msgstr "Bağlantı Ekle"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Insert image"
+msgstr "Resim ekle"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "Insert smiley"
+msgstr "Gülenyüz ekle"
+
+#: ../pidgin/gtklog.c:267
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"%s kişisi ile yapmış olduğunuz ve %s tarihinden başlayan sohbet kayıtlarını "
+"kalıcı olarak silmek istediğinizden emin misiniz?"
+
+#: ../pidgin/gtklog.c:278
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+"%s kişisi ile yapmış olduğunuz ve %s tarihinden başlayan sohbet kayıtlarını "
+"kalıcı olarak silmek istediğinizden emin misiniz?"
+
+#: ../pidgin/gtklog.c:283
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr "%s zamanından başlayan sistem kayıtlarını silmek istediğinizden emin misiniz?"
+
+#: ../pidgin/gtklog.c:427
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'> %s  %s üzerinde yazışma</span>"
+
+#: ../pidgin/gtklog.c:430
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'> %s  %s üzerinde yazışma</span>"
+
+#: ../pidgin/gtklog.c:477
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../pidgin/gtklog.c:524
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Sistem olayları sadece \"Tüm durum değişikliklerini sistem günlüğüne kaydet"
+"\" seçeneği aktifse kaydedilir."
+
+#: ../pidgin/gtklog.c:528
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Anlık iletiler sadece \"Tüm anlık iletileri kaydet\" seçeneği aktifse "
+"kaydedilir."
+
+#: ../pidgin/gtklog.c:531
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "Sobetler sadece \"Tüm sohbetleri kaydet\" seçeneği aktifse kaydedilir."
+
+#: ../pidgin/gtklog.c:535
+msgid "No logs were found"
+msgstr "Hiç kayıt bulunamadı"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:550
+msgid "_Browse logs folder"
+msgstr "_Kayıt dizinine gözat"
+
+#: ../pidgin/gtklog.c:614
+msgid "Total log size:"
+msgstr "Toplam Kayıt büyüklüğü:"
+
+#: ../pidgin/gtklog.c:683
+#, c-format
+msgid "Conversations in %s"
+msgstr "%s içindeki konuşmalar"
+
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s ile konuşma"
+
+#: ../pidgin/gtklog.c:778
+msgid "System Log"
+msgstr "Sistem Kayıtları"
+
+#: ../pidgin/gtkmain.c:373
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Daha fazla bilgi için`%s -h' deneyin.\n"
+
+#: ../pidgin/gtkmain.c:375
+#, 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 ""
+
+#: ../pidgin/gtkmain.c:493
+#, 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 developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\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"
+"%swiki/GetABacktrace\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"
+"%swiki/DeveloperPages\n"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:337
+msgid "Open All Messages"
+msgstr "Tüm E-postaları Aç"
+
+#: ../pidgin/gtknotify.c:389
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Yeni E-postanız var !</span>"
+
+#: ../pidgin/gtknotify.c:483
+msgid "Sender"
+msgstr "Gönderen"
+
+#: ../pidgin/gtknotify.c:509
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s, %d yeni ileti."
+
+#: ../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 yeni e-postanız var.</b>"
+
+#: ../pidgin/gtknotify.c:951
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Tarayıcı komutu \"%s\" geçersiz."
+
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
+msgid "Unable to open URL"
+msgstr "Adres açılamadı"
+
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Başlatma hatası: \"%s\": %s"
+
+#: ../pidgin/gtknotify.c:1107
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"Tarayıcı yapılandırmasında 'El ile ayarla' seçili, ancak bu seçenek için "
+"komut belirtilmemiş."
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "Bu eklentiler kaldırılacak."
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "Birden fazla eklenti kaldırılacak."
+
+#: ../pidgin/gtkplugin.c:287
+msgid "Unload Plugins"
+msgstr "Eklentileri Kaldır"
+
+#: ../pidgin/gtkplugin.c:399
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Yazar:</span>\t%s\n"
+"<span weight=\"bold\">Web sitesi:</span>\t\t%s\n"
+"<span weight=\"bold\">Dosya adı:</span>\t\t%s"
+
+#: ../pidgin/gtkplugin.c:409
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Hata: %s\n"
+"Güncellemeler için eklentinin web sitesine bakın.</span>"
+
+#: ../pidgin/gtkplugin.c:535
+msgid "Configure Pl_ugin"
+msgstr "_Eklentiyi Yapılandır"
+
+#: ../pidgin/gtkplugin.c:598
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Eklenti Detayları</b>"
+
+#: ../pidgin/gtkpounce.c:155
+msgid "Select a file"
+msgstr "Bir dosya seçin"
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:524
+msgid "Pounce on Whom"
+msgstr "Uyarılacak Kişi"
+
+#: ../pidgin/gtkpounce.c:551
+msgid "_Buddy name:"
+msgstr "_Kişi adı:"
+
+#: ../pidgin/gtkpounce.c:585
+msgid "Si_gns on"
+msgstr "Giriş yapın_ca"
+
+#: ../pidgin/gtkpounce.c:587
+msgid "Signs o_ff"
+msgstr "Çıkış yapı_nca"
+
+#: ../pidgin/gtkpounce.c:589
+msgid "Goes a_way"
+msgstr "Uzakta _durumuna geçince"
+
+#: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "Geri dönünc_e"
+
+#: ../pidgin/gtkpounce.c:593
+msgid "Becomes _idle"
+msgstr "Boşta d_urumuna geçince"
+
+#: ../pidgin/gtkpounce.c:595
+msgid "Is no longer i_dle"
+msgstr "Bo_şta değil durumuna geçince"
+
+#: ../pidgin/gtkpounce.c:597
+msgid "Starts _typing"
+msgstr "Yazmaya baş_layınca"
+
+#: ../pidgin/gtkpounce.c:599
+msgid "P_auses while typing"
+msgstr "Yazma_ya ara verince"
+
+#: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "Yazmayı _bırakınca"
+
+#: ../pidgin/gtkpounce.c:603
+msgid "Sends a _message"
+msgstr "Bir ileti _gönderince"
+
+#: ../pidgin/gtkpounce.c:646
+msgid "Ope_n an IM window"
+msgstr "Bir _Anlık İleti penceresi aç"
+
+#: ../pidgin/gtkpounce.c:648
+msgid "_Pop up a notification"
+msgstr "_Bir uyarıcı aç"
+
+#: ../pidgin/gtkpounce.c:650
+msgid "Send a _message"
+msgstr "Bir ileti gön_der"
+
+#: ../pidgin/gtkpounce.c:652
+msgid "E_xecute a command"
+msgstr "Bir _komut çalıştır"
+
+#: ../pidgin/gtkpounce.c:654
+msgid "P_lay a sound"
+msgstr "Bir _ses çal"
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Brows_e..."
+msgstr "_Gözat..."
+
+#: ../pidgin/gtkpounce.c:661
+msgid "Br_owse..."
+msgstr "Gö_zat..."
+
+#: ../pidgin/gtkpounce.c:662
+msgid "Pre_view"
+msgstr "Önizle"
+
+#: ../pidgin/gtkpounce.c:786
+msgid "P_ounce only when my status is not available"
+msgstr "Sadece erişilebilir olmadığım zaman uyar"
+
+#: ../pidgin/gtkpounce.c:791
+msgid "_Recurring"
+msgstr "_Tekrarlayan"
+
+#: ../pidgin/gtkpounce.c:1247
+msgid "Pounce Target"
+msgstr "Uyarıcı Hedefi"
+
+#: ../pidgin/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr "Gülenyüz teması açılırken hata oluştu."
+
+#: ../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 ""
+"Aşağıdaki listeden kullanamak istediğiniz gülenyüz temasını seçin. Yeni "
+"temaları tema listesine sürükleyip bırakarak kurabilirsiniz."
+
+#: ../pidgin/gtkprefs.c:673
+msgid "Icon"
+msgstr "Simge"
+
+#: ../pidgin/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Sistem Çekmecesi Simgesi"
+
+#: ../pidgin/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Sistem çekmecesi simgesini göster:"
+
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "Her zaman"
+
+#: ../pidgin/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "Okunmayan iletiler olunca"
+
+#: ../pidgin/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "Yazışma Penceresi Gizleme"
+
+#: ../pidgin/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "_Yeni Anında Mesajlaşma yazışmalarını gizle:"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+msgid "When away"
+msgstr "Uzaktayken"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Sekmeler"
+
+#: ../pidgin/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Anlık İletileri ve sohbetleri _sekmeli pencerelerde göster"
+
+#: ../pidgin/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "Sekmelerde kapatma _düğmesi göster"
+
+#: ../pidgin/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "_Yerleşim:"
+
+#: ../pidgin/gtkprefs.c:859
+msgid "Top"
+msgstr "Üst"
+
+#: ../pidgin/gtkprefs.c:860
+msgid "Bottom"
+msgstr "Alt"
+
+#: ../pidgin/gtkprefs.c:861
+msgid "Left"
+msgstr "Sol"
+
+#: ../pidgin/gtkprefs.c:862
+msgid "Right"
+msgstr "Sağ"
+
+#: ../pidgin/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "Sol Dikey"
+
+#: ../pidgin/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "Sağ Dikey"
+
+#: ../pidgin/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "Y_eni Konuşmalar:"
+
+#: ../pidgin/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "Gelen iletilerde _biçimlendirmeyi göster"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "Kişi simgelerin_i göster"
+
+#: ../pidgin/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "Kişi simgelerinde animasyonu e_tkinleştir"
+
+#: ../pidgin/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "Kişileri ben onlara yazarken u_yar"
+
+#: ../pidgin/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "Yanlış _yazılmış sözcükleri vurgula"
+
+#: ../pidgin/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "Yumuşak geçiş kullan"
+
+#: ../pidgin/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "_Yeni ileti geldiğinde pencereyi canlandır"
+
+#: ../pidgin/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Öntanımlı Biçem"
+
+#: ../pidgin/gtkprefs.c:941
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Bu mesaj, biçimlendirmeyi destekleyen protokollerde gönderdiğiniz mesajın "
+"nasıl görüneceğini gösterir. :)"
+
+#: ../pidgin/gtkprefs.c:1017
+msgid "ST_UN server:"
+msgstr "ST_UN sunucusu:"
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Örnek: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1033
+msgid "_Autodetect IP address"
+msgstr "_IP Adresini Otomatik Bul"
+
+#: ../pidgin/gtkprefs.c:1042
+msgid "Public _IP:"
+msgstr "Görünen _IP:"
+
+#: ../pidgin/gtkprefs.c:1071
+msgid "Ports"
+msgstr "Portlar"
+
+#: ../pidgin/gtkprefs.c:1074
+msgid "_Manually specify range of ports to listen on"
+msgstr "_Dinlenecek portları el ile belirtin"
+
+#: ../pidgin/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "Başlangıç _portu:"
+
+#: ../pidgin/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "Bitiş p_ortu:"
+
+#: ../pidgin/gtkprefs.c:1092
+msgid "Proxy Server"
+msgstr "Proxy Sunucusu"
+
+#: ../pidgin/gtkprefs.c:1096
+msgid "No proxy"
+msgstr "Proxy yok"
+
+#: ../pidgin/gtkprefs.c:1152
+msgid "_User:"
+msgstr "_Kullanıcı:"
+
+#: ../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 Varsayılanı"
+
+#: ../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 "El ile ayarla"
+
+#: ../pidgin/gtkprefs.c:1287
+msgid "Browser Selection"
+msgstr "Tarayıcı Seçimi"
+
+#: ../pidgin/gtkprefs.c:1291
+msgid "_Browser:"
+msgstr "_Tarayıcı:"
+
+#: ../pidgin/gtkprefs.c:1299
+msgid "_Open link in:"
+msgstr "_Bağlantıyı aç:"
+
+#: ../pidgin/gtkprefs.c:1301
+msgid "Browser default"
+msgstr "Tarayıcı varsayılanı"
+
+#: ../pidgin/gtkprefs.c:1302
+msgid "Existing window"
+msgstr "Varolan pencere"
+
+#: ../pidgin/gtkprefs.c:1304
+msgid "New tab"
+msgstr "Yeni sekme"
+
+#: ../pidgin/gtkprefs.c:1318
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"_El ile ayarla:\n"
+"(Bağlantı için %s)"
+
+#: ../pidgin/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "Kayıt _biçemi:"
+
+#: ../pidgin/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "Tüm anlık _mesajları kaydet"
+
+#: ../pidgin/gtkprefs.c:1365
+msgid "Log all c_hats"
+msgstr "Tüm sohbetleri tut"
+
+#: ../pidgin/gtkprefs.c:1367
+msgid "Log all _status changes to system log"
+msgstr "Tüm durum değişikliklerini sistem günlüğüne kaydet"
+
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1513
+msgid "Sound Selection"
+msgstr "Ses Seçimi"
+
+#: ../pidgin/gtkprefs.c:1523
+msgid "Quietest"
+msgstr "En Düşük"
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Quieter"
+msgstr "Daha Düşük"
+
+#: ../pidgin/gtkprefs.c:1527
+msgid "Quiet"
+msgstr "Düşük"
+
+#: ../pidgin/gtkprefs.c:1531
+msgid "Loud"
+msgstr "Yüksek"
+
+#: ../pidgin/gtkprefs.c:1533
+msgid "Louder"
+msgstr "Daha Yüksek"
+
+#: ../pidgin/gtkprefs.c:1535
+msgid "Loudest"
+msgstr "En Yüksek"
+
+#: ../pidgin/gtkprefs.c:1598
+msgid "Sound Method"
+msgstr "Ses Davranışları"
+
+#: ../pidgin/gtkprefs.c:1599
+msgid "_Method:"
+msgstr "_Davranış:"
+
+#: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "Konsol bip sesi"
+
+#: ../pidgin/gtkprefs.c:1603
+msgid "Automatic"
+msgstr "Otomatik"
+
+#: ../pidgin/gtkprefs.c:1606
+msgid "Command"
+msgstr "Komut"
+
+#: ../pidgin/gtkprefs.c:1607
+msgid "No sounds"
+msgstr "Ses Kullanma"
+
+#: ../pidgin/gtkprefs.c:1615
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"Ses komutu:\n"
+"(dosya ismi için %s)"
+
+#: ../pidgin/gtkprefs.c:1641
+msgid "Sound Options"
+msgstr "Ses Seçenekleri"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Sounds when conversation has _focus"
+msgstr "Yazışmaya sırasında sesler açık"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Enable sounds:"
+msgstr "Sesleri etkinleştir:"
+
+#: ../pidgin/gtkprefs.c:1646
+msgid "Only when available"
+msgstr "Sadece erişilebilir olduğumda"
+
+#: ../pidgin/gtkprefs.c:1647
+msgid "Only when not available"
+msgstr "Sadece erişilebilir olmadığımda"
+
+#: ../pidgin/gtkprefs.c:1655
+msgid "Volume:"
+msgstr "Ses Düzeyi:"
+
+#: ../pidgin/gtkprefs.c:1683
+msgid "Sound Events"
+msgstr "Ses Olayları"
+
+#: ../pidgin/gtkprefs.c:1734
+msgid "Play"
+msgstr "Oynat"
+
+#: ../pidgin/gtkprefs.c:1741
+msgid "Event"
+msgstr "Olay"
+
+#: ../pidgin/gtkprefs.c:1760
+msgid "Test"
+msgstr "Test Et"
+
+#: ../pidgin/gtkprefs.c:1764
+msgid "Reset"
+msgstr "Sıfırla"
+
+#: ../pidgin/gtkprefs.c:1768
+msgid "Choose..."
+msgstr "Seç..."
+
+#: ../pidgin/gtkprefs.c:1811
+msgid "_Report idle time:"
+msgstr "Boşta süresini _raporla:"
+
+#: ../pidgin/gtkprefs.c:1816
+msgid "Based on keyboard or mouse use"
+msgstr "Klavye ya da fare kullanımına göre"
+
+#: ../pidgin/gtkprefs.c:1825
+msgid "_Auto-reply:"
+msgstr "_Otomatik-cevapla:"
+
+#: ../pidgin/gtkprefs.c:1829
+msgid "When both away and idle"
+msgstr "Aynı anda meşgul ve boş olduğu zaman"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1835
+msgid "Auto-away"
+msgstr "Otomatik-uzakta"
+
+#: ../pidgin/gtkprefs.c:1837
+msgid "Change status when _idle"
+msgstr "Boşken durumu değ_iştir"
+
+#: ../pidgin/gtkprefs.c:1841
+msgid "_Minutes before changing status:"
+msgstr "Durumunuzu değiştir_menizden geçen dakika "
+
+#: ../pidgin/gtkprefs.c:1849
+msgid "Change _status to:"
+msgstr "Durumu _değiştir:"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1870
+msgid "Status at Startup"
+msgstr "Başlangıç Durumu"
+
+#: ../pidgin/gtkprefs.c:1872
+msgid "Use status from last _exit at startup"
+msgstr "Son çıkıştaki _durumu kullan"
+
+#: ../pidgin/gtkprefs.c:1878
+msgid "Status to a_pply at startup:"
+msgstr "Başlangıçta uy_gulanacak durum:"
+
+#: ../pidgin/gtkprefs.c:1916
+msgid "Interface"
+msgstr "Arayüz"
+
+#: ../pidgin/gtkprefs.c:1918
+msgid "Smiley Themes"
+msgstr "Gülenyüz Temaları"
+
+#: ../pidgin/gtkprefs.c:1919
+msgid "Sounds"
+msgstr "Sesler"
+
+#: ../pidgin/gtkprefs.c:1925
+msgid "Browser"
+msgstr "Tarayıcı"
+
+#: ../pidgin/gtkprefs.c:1929
+msgid "Status / Idle"
+msgstr "Durum / Boşta"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "Her kullanıcı bana ulaşabilir"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "Sadece listemdekiler bana ulaşabilir"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "Sadece aşağıdaki kullanıcılar bana ulaşabilir"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Tüm sohbetleri kaydet"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "Sadece aşağıdaki kullanıcılar bana ulaşabilir"
+
+#: ../pidgin/gtkprivacy.c:372
+msgid "Privacy"
+msgstr "Gizlilik"
+
+#: ../pidgin/gtkprivacy.c:385
+msgid "Changes to privacy settings take effect immediately."
+msgstr "Gizlilikteki değişiklikler anında aktif olur."
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:397
+msgid "Set privacy for:"
+msgstr "Gizlilik ayarları:"
+
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+msgid "Permit User"
+msgstr "Kullanıcıya İzin Ver"
+
+#: ../pidgin/gtkprivacy.c:561
+msgid "Type a user you permit to contact you."
+msgstr "Sizinle iletişim kurulmasına izin vereceğiniz kullanıcıyı yazın"
+
+#: ../pidgin/gtkprivacy.c:562
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr "Lütfen sisinle iletişim kurmak isteyen kişinin adını girin."
+
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+msgid "_Permit"
+msgstr "_İzin Ver"
+
+#: ../pidgin/gtkprivacy.c:571
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "%s kişisinin sizinle iletişim kurmasına izin verilsin mi?"
+
+#: ../pidgin/gtkprivacy.c:573
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "%s kişisine sizinle iletişim kurma izni vermek istediğinizden emin misiniz?"
+
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+msgid "Block User"
+msgstr "Kullanıcıyı Engelle"
+
+#: ../pidgin/gtkprivacy.c:603
+msgid "Type a user to block."
+msgstr "Engellenecek kullanıcıyı girin."
+
+#: ../pidgin/gtkprivacy.c:604
+msgid "Please enter the name of the user you wish to block."
+msgstr "Lütfen engellemek istediğiniz kullanıcının adını girin."
+
+#: ../pidgin/gtkprivacy.c:612
+#, c-format
+msgid "Block %s?"
+msgstr "Engelle %s?"
+
+#: ../pidgin/gtkprivacy.c:614
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "%s kişisini engellemek istediğinizden emin misiniz?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "Uygula"
+
+#: ../pidgin/gtkrequest.c:1481
+msgid "That file already exists"
+msgstr "Bu dosya zaten var"
+
+#: ../pidgin/gtkrequest.c:1482
+msgid "Would you like to overwrite it?"
+msgstr "Üzerine yazmak ister misiniz?"
+
+#: ../pidgin/gtkrequest.c:1485
+msgid "Overwrite"
+msgstr "Üzerine Yaz"
+
+#: ../pidgin/gtkrequest.c:1486
+msgid "Choose New Name"
+msgstr "Yeni İsim Seç"
+
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+msgid "Select Folder..."
+msgstr "Dizin Seç..."
+
+#: ../pidgin/gtkroomlist.c:376
+msgid "Room List"
+msgstr "Oda Listesi"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:446
+msgid "_Get List"
+msgstr "_Listeyi Al"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "_Sohbet Ekle"
+
+#: ../pidgin/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Seçilen kaydedilmiş durumu silmek istediğinizden emin misiniz?"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+msgid "_Use"
+msgstr "_Kullan"
+
+#: ../pidgin/gtksavedstatuses.c:726
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Başlık zaten kullanılıyor. Farklı bir başlık seçmelisiniz."
+
+#: ../pidgin/gtksavedstatuses.c:914
+msgid "Different"
+msgstr "Farklı"
+
+#: ../pidgin/gtksavedstatuses.c:1107
+msgid "_Title:"
+msgstr "Baş_lık:"
+
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+msgid "_Status:"
+msgstr "D_urum:"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1158
+msgid "Use a _different status for some accounts"
+msgstr "Farklı hesaplar için _farklı durumlar kullan"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1222
+msgid "Sa_ve & Use"
+msgstr "Kayde_t & Kullan"
+
+#: ../pidgin/gtksavedstatuses.c:1428
+#, c-format
+msgid "Status for %s"
+msgstr "%s için durum"
+
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Arkadaşınız giriş yaptığında"
+
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Arkadaşınız çıkış yaptığında"
+
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Mesaj alındığında"
+
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Alınan mesaj yazışmayı başlatır"
+
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Mesaj gönderildiğinde"
+
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Kişi sohbete katıldıldığında"
+
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Kişi sohbetten ayrıldığında"
+
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Siz sohbette konuştuğunuzda"
+
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Diğerleri sohbet ederken"
+
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Birisi sohbette takma adınızı söylediğinde"
+
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer Başarısız"
+
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer başlatılırken hata oluştu."
+
+#: ../pidgin/gtkstatusbox.c:661
+msgid "Waiting for network connection"
+msgstr "Ağ bağlantısı için bekleniyor"
+
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "%s yüklenirken şu hata oluştu: %s"
+
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
+msgid "Failed to load image"
+msgstr "Resim kaydetmede hata"
+
+#: ../pidgin/gtkutils.c:1471
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "%s klasörü yollanamadı."
+
+#: ../pidgin/gtkutils.c:1472
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr "%s bir klasörü aktaramaz. Dosyaları tek tek göndermelisiniz."
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
+msgid "You have dragged an image"
+msgstr "Bir resim sürüklediniz."
+
+#: ../pidgin/gtkutils.c:1505
+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 ""
+"Bu resmi dosya transferi, bir mesaj içinde gönderebilir veya arkadaşınınzın "
+"görüntü resmi olarak kullanabilirsiniz."
+
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
+msgid "Set as buddy icon"
+msgstr "Kişi görüntüsü olarak ata"
+
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
+msgid "Send image file"
+msgstr "Resim dosyası gönder"
+
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
+msgid "Insert in message"
+msgstr "İleti içine ekle"
+
+#: ../pidgin/gtkutils.c:1517
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Bunu kişi ikonu olarak ayarlamak istiyor musunuz?"
+
+#: ../pidgin/gtkutils.c:1524
+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 ""
+"Bu resmi dosya transferi, bir mesaj içinde gönderebilir veya arkadaşınınzın "
+"görüntü resmi olarak kullanabilirsiniz."
+
+#: ../pidgin/gtkutils.c:1526
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Bu mesaja resim ekleyebilir veya arkadaşınızın simgesi olarak "
+"kullanabilirsiniz."
+
+#. 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:1584
+msgid "Cannot send launcher"
+msgstr "Çalıştırıcı gönderilemiyor"
+
+#: ../pidgin/gtkutils.c:1584
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+
+#: ../pidgin/gtkutils.c:2344
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Dosya:</b> %s\n"
+"<b>Dosya boyutu:</b> %s\n"
+"<b>Resim boyutu:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2640
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "%s dosyası %s için çok büyük, Lütfen daha küçük bir resim deneyin.\n"
+
+#: ../pidgin/gtkutils.c:2642
+msgid "Icon Error"
+msgstr "Simge Hatası"
+
+#: ../pidgin/gtkutils.c:2643
+msgid "Could not set icon"
+msgstr "Simge ayarlanamadı"
+
+#: ../pidgin/gtkutils.c:2743
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Dosya açılamadı '%s': %s"
+
+#: ../pidgin/gtkutils.c:2792
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "Resim dosyası yüklenemedi '%s': sebep bilinmiyor, muhtemelen dosya bozuk"
+
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+msgid "Save File"
+msgstr "Dosyayı Kaydet"
+
+#: ../pidgin/gtkwhiteboard.c:867
+msgid "Select color"
+msgstr "Renk seç"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
+msgid "_Alias"
+msgstr "_Görünen İsim"
+
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "Sekmeleri _kapat"
+
+#: ../pidgin/pidginstock.c:85
+msgid "_Get Info"
+msgstr "_Bilgi Al"
+
+#: ../pidgin/pidginstock.c:86
+msgid "_Invite"
+msgstr "_Davet Et"
+
+#: ../pidgin/pidginstock.c:87
+msgid "_Modify"
+msgstr "_Düzenle"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Open Mail"
+msgstr "_Mesaj Aç"
+
+#: ../pidgin/plugins/cap/cap.c:449
+msgid "Display Statistics"
+msgstr "İstatistikleri Göster"
+
+#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgid "Response Probability:"
+msgstr ""
+
+#: ../pidgin/plugins/cap/cap.c:810
+msgid "Statistics Configuration"
+msgstr "İstatistik Yapılandırması"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:813
+msgid "Maximum response timeout:"
+msgstr ""
+
+#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+msgid "minutes"
+msgstr "dakika"
+
+#. 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 "Eşik:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:934
+msgid "Contact Availability Prediction"
+msgstr "Kişi Uygunluk Göstericisi"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:936
+msgid "Contact Availability Prediction plugin."
+msgstr "Kişilerin Uygunluğunu Gösteren eklenti."
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:937
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Kişi boşta"
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Kişi uzakta"
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Kişi \"uzatılmış\" uzakta"
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Kişi dışarda"
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Kişi çevrimdışı"
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Kullanılacak değerler..."
+
+#: ../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 ""
+
+#: ../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 "Hesap için kullanılacak değerler..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:187
+msgid "Contact Priority"
+msgstr "Bağlantı Önceliği"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:190
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Farklı kişi durumlarına farklı puanlar vermenizi sağlar."
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:192
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Öncelik sıralaması hesaplamasında boşta/uzakta/çevrimdışı durumlarının "
+"puanlarını değiştirmenizi sağlar."
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Yazışma Rekleri"
+
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "Yazışma Penceresi içerisindeki rekleri düzenle"
+
+#: ../pidgin/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Hatalara İletileri"
+
+#: ../pidgin/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "Vurgulanmış İletiler"
+
+#: ../pidgin/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Sistem İletileri"
+
+#: ../pidgin/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Gönderilmiş İletiler"
+
+#: ../pidgin/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Alınan İletiler"
+
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:323
+#, c-format
+msgid "Select Color for %s"
+msgstr "%s için Renk Ayarla"
+
+#: ../pidgin/plugins/convcolors.c:310
+msgid "Ignore incoming format"
+msgstr "Gelen biçemi yoksay"
+
+#: ../pidgin/plugins/convcolors.c:311
+msgid "Apply in Chats"
+msgstr "Sohbetlere Uygula"
+
+#: ../pidgin/plugins/convcolors.c:312
+msgid "Apply in IMs"
+msgstr "Anlık İletilere Uygula"
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Sohbet sayısına göre"
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Sohbet Yerleşimi"
+
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:111
+msgid "Number of conversations per window"
+msgstr "Her pencere için yazışma sayısı"
+
+#: ../pidgin/plugins/extplacement.c:117
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Numaraya göre sıralandığında Anında Mesjlaşma ve sohbet pencerelerini ayır"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:146
+msgid "ExtPlacement"
+msgstr "Daha Fazla Yerleşim"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:148
+msgid "Extra conversation placement options."
+msgstr "Daha fazla sohbet yerleşim seçeneği."
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:150
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Her pencere için yazışma sayısını sınırlandırın, seçimli olarak Anında "
+"Mesajlaşma ve Sohbet yazışmaları gibi"
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Fare Hareketleri Yapılandırması"
+
+#: ../pidgin/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Fare orta düğmesi"
+
+#: ../pidgin/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Fare sağ düğmesi"
+
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Görsel hareket gösterimi"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:295
+msgid "Mouse Gestures"
+msgstr "Fare Hareketleri"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:298
+msgid "Provides support for mouse gestures"
+msgstr "Değişik fare hareketlerinizi algılar"
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:300
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"Fare hareketlerini yazışma penceresinde destekler.\n"
+"Orta fare tuşuna basılı tutup hareket ettirdiğinizde:\n"
+"\n"
+"Aşağı, sonra da sağa sürüklerseniz yazışma penceresini kapatır.\n"
+"Yukarı, sonra da sola sürüklerseniz bir önceki yazışmaya geçer.\n"
+"Yukarı, sonra da sağa sürüklerseniz bir sonraki yazışmaya geçer."
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Yeni Mesaj"
+
+#. 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 "Adres defterinden birini seçin ya da yeni bir kişi ekleyin."
+
+#. "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 "Yeni Kişi"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Kişi Seçin"
+
+#. 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 ""
+"Eklemek için adres defterinizden bir kişi seçin, ya da yeni bir kişi "
+"oluşturun."
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "Kullanıcı _ayrıntıları"
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "Kişi Seçin"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "E-Posta gönderilemedi."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "Bu kişi için bir e-posta adresi bulunamadı."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "Adres Defterine Ekle"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "E-Posta Yolla"
+
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:411
+msgid "Evolution Integration Configuration"
+msgstr "Evolution Entegrasyonu Yapılandırması"
+
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:414
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Kişilerin otomatik eklenmesi gereken tüm hesapları seçin."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:526
+msgid "Evolution Integration"
+msgstr "Evolution Entegrasyonu"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
+msgid "Provides integration with Evolution."
+msgstr "Evolution ile entegresyonu sağlar."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "Lütfen kullanıcının bilgisini aşağı girin."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Lütfen kullanıcının kayıtlı ismini ve hesap tipini girin."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Hesap tipi:"
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "İsteğe bağlı bilgi:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Ad:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Soyad:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK Sinyal Testi"
+
+#. *< 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 "Tüm sinyallerin doğru çalışıp çalışmadığını görmek için test edin."
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "Geçmiş"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Dışarıda! olduğunda pencereyi küçült"
+
+#. *< 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 ""
+"Dışarıda! durumuna geçtiğinizde listenizi ve tüm yazışmalarınızı simge "
+"durumua küçültür."
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "Posta Kontrol"
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Yerel postalar için kontrol et."
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "Yeni postanız olduğunda listenize küçük bir kutu resmi ekler"
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+msgid "_IM windows"
+msgstr "_Mesaj penceresi"
+
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+msgid "C_hat windows"
+msgstr "_Sohbet Penceresi"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr "Bir müzik mesajlaşma oturumu isteği alındı. Lütfen MM simgesine tıklayarak kabul edin."
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Müzik mesajlaşma oturumu doğrulandı."
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+msgid "Music Messaging"
+msgstr "Müzik İletisi"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgid "There was a conflict in running the command:"
+msgstr "Komut çalıştırılırken bir çakışma oldu:"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+msgid "Error Running Editor"
+msgstr "Düzenleyici Çalıştırma Hatası"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+msgid "The following error has occurred:"
+msgstr "Şu hata oluştu:"
+
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+msgid "Music Messaging Configuration"
+msgstr "Müzik Mesajlaşması Yapılandırması"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+msgid "Score Editor Path"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+msgid "_Apply"
+msgstr "_Uygula"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Birlikte beste yapmak için Müzik Mesajlaşma Eklentisi"
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:672
+msgid "Notify For"
+msgstr "Uyar"
+
+#: ../pidgin/plugins/notify.c:691
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Sadece birisi sizin takma adınızı söylediğinde"
+
+#: ../pidgin/plugins/notify.c:701
+msgid "_Focused windows"
+msgstr "_Aktif pencere"
+
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:709
+msgid "Notification Methods"
+msgstr "Uyarı Metodları"
+
+#: ../pidgin/plugins/notify.c:716
+msgid "Prepend _string into window title:"
+msgstr "Pencere başlığı _ön ifadesi:"
+
+#. Count method button
+#: ../pidgin/plugins/notify.c:735
+msgid "Insert c_ount of new messages into window title"
+msgstr "Pencere başlığına yeni mesaj sayısını ekle"
+
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:744
+msgid "Insert count of new message into _X property"
+msgstr ""
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr ""
+
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:761
+msgid "R_aise conversation window"
+msgstr "Yazışma Penceresini yükselt"
+
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:769
+msgid "Notification Removal"
+msgstr "Uyarıyı Kaldırma"
+
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:774
+msgid "Remove when conversation window _gains focus"
+msgstr "Yazışma penceresi aktif olunca kaldır"
+
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:781
+msgid "Remove when conversation window _receives click"
+msgstr "Yazışma penceresine tıklandığında kaldır"
+
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:789
+msgid "Remove when _typing in conversation window"
+msgstr "Yazışma penceresinde yazdığında kaldır"
+
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:797
+msgid "Remove when a _message gets sent"
+msgstr "Bir _ileti gönderildiğinde kaldır"
+
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:806
+msgid "Remove on switch to conversation ta_b"
+msgstr "&Yazışma sekmesi seçildiğinde kaldır"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:901
+msgid "Message Notification"
+msgstr "İleti Uyarısı"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Okunmamış iletiler olduğunda yapılacak uyarılar için çeşitli alternatifler sunar."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin Tanıtım Eklentisi"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Birşeyler yapan örnek eklenti - açıklamaya bakın."
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Bu gerçekten çok güzel bir eklenti, bir çok işe yarıyor:\n"
+"- Oturum açtığınızda programı kimin yazdığını söyler\n"
+"- Tüm gelen metinleri ters çevirir\n"
+"- Oturum açtığınızda listenizdeki kişilere anında ileti gönderir."
+
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr "İmleç Rengi"
+
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "İkincil İmleç Rengi"
+
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "Bağlantı Rengi"
+
+#: ../pidgin/plugins/pidginrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView Genişletici Boyutu"
+
+#: ../pidgin/plugins/pidginrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView Yatay Dağılımı"
+
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Conversation Entry"
+msgstr "Yazışma Girdisi"
+
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Conversation History"
+msgstr "Yazışma Geçmişi"
+
+#: ../pidgin/plugins/pidginrc.c:78
+msgid "Log Viewer"
+msgstr "Kayıt Görüntüleyicisi"
+
+#: ../pidgin/plugins/pidginrc.c:79
+msgid "Request Dialog"
+msgstr "İstek Diyaloğu"
+
+#: ../pidgin/plugins/pidginrc.c:80
+msgid "Notify Dialog"
+msgstr "Uyarı Diyaloğu"
+
+#: ../pidgin/plugins/pidginrc.c:325
+msgid "Select Color"
+msgstr "Renk Seç"
+
+#: ../pidgin/plugins/pidginrc.c:364
+#, c-format
+msgid "Select Font for %s"
+msgstr "%s için Yazıtipi Seç"
+
+#: ../pidgin/plugins/pidginrc.c:401
+msgid "Select Interface Font"
+msgstr "Arayüz Yazı Tipini Seç"
+
+#: ../pidgin/plugins/pidginrc.c:456
+msgid "GTK+ Interface Font"
+msgstr "GTK+ Arayüz Yazıtipi"
+
+#: ../pidgin/plugins/pidginrc.c:476
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ Metin Kısayol Teması"
+
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:513
+msgid "Interface colors"
+msgstr "Arayüz rekleri"
+
+#: ../pidgin/plugins/pidginrc.c:537
+msgid "Widget Sizes"
+msgstr "Parçacık Boyutları"
+
+#: ../pidgin/plugins/pidginrc.c:558
+msgid "Fonts"
+msgstr "Yazıtipleri"
+
+#: ../pidgin/plugins/pidginrc.c:581
+msgid "Tools"
+msgstr "Araçlar"
+
+#: ../pidgin/plugins/pidginrc.c:586
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Ayarları %s%sgtkrc-2.0 dosyasına yaz"
+
+#: ../pidgin/plugins/pidginrc.c:594
+msgid "Re-read gtkrc files"
+msgstr "gtkrc dosyalarını yeniden oku"
+
+#: ../pidgin/plugins/pidginrc.c:627
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ Tema Kontrolü"
+
+#: ../pidgin/plugins/pidginrc.c:629 ../pidgin/plugins/pidginrc.c:630
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Sıklıkla kullanılan gtkrc ayarlarına erişimi sağlar."
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "Ham"
+
+#: ../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 ""
+
+#: ../pidgin/plugins/relnot.c:71
+#, c-format
+msgid "You are using %s version %s.  The current version is %s.<hr>"
+msgstr "Şu anda %s %s sürümünü kullanıyorsunuz.  En son versiyon ise %s.<hr>"
+
+#: ../pidgin/plugins/relnot.c:77
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Kayıt:</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 sürümlerini buradan edinebilirsiniz:<br><a href=\"http://pidgin.im/"
+"\">http://pidgin.im</a>."
+
+#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid "New Version Available"
+msgstr "Yeni Sürüm Var"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:145
+msgid "Release Notification"
+msgstr "Sürüm Değişikliği Uyarısı"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:148
+msgid "Checks periodically for new releases."
+msgstr "Periyodik olarak yeni sürümleri kontrol et."
+
+#. *  description
+#: ../pidgin/plugins/relnot.c:150
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr "Yeni sürümleri periyodik olarak denetler."
+
+#: ../pidgin/plugins/spellchk.c:1965
+msgid "Duplicate Correction"
+msgstr "Çift Doğrulama"
+
+#: ../pidgin/plugins/spellchk.c:1966
+msgid "The specified word already exists in the correction list."
+msgstr "Verilen sözcük zaten düzeltme listesinde var."
+
+#: ../pidgin/plugins/spellchk.c:2180
+msgid "Text Replacements"
+msgstr "Metin Değiştirme"
+
+#: ../pidgin/plugins/spellchk.c:2203
+msgid "You type"
+msgstr "Yazdığınız"
+
+#: ../pidgin/plugins/spellchk.c:2217
+msgid "You send"
+msgstr "Gönderdiğiniz"
+
+#: ../pidgin/plugins/spellchk.c:2231
+msgid "Whole words only"
+msgstr "Sadece tüm kelimeler"
+
+#: ../pidgin/plugins/spellchk.c:2243
+msgid "Case sensitive"
+msgstr "Büyük küçük harf duyarlı"
+
+#: ../pidgin/plugins/spellchk.c:2269
+msgid "Add a new text replacement"
+msgstr "Yeni metin değişikliği ekle"
+
+#: ../pidgin/plugins/spellchk.c:2285
+msgid "You _type:"
+msgstr "Yazdığınız:"
+
+#: ../pidgin/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "_Gönderdiğiniz:"
+
+#. 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 "_Tam eşleme (otomatik eşleme yöntemi için seçimi kaldırın)"
+
+#: ../pidgin/plugins/spellchk.c:2316
+msgid "Only replace _whole words"
+msgstr "Sadece _tüm kelimelerle değiştir"
+
+#: ../pidgin/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "Genel Metin Değiştirme Seçenekleri"
+
+#: ../pidgin/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+#: ../pidgin/plugins/spellchk.c:2373
+msgid "Text replacement"
+msgstr "Metin çevirici"
+
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "Belirtilen kurallara göre giden mesajdaki kelimeleri değiştirir."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Kişi Seçici"
+
+#. *< 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 "Kişi listesinin yatay hali."
+
+#: ../pidgin/plugins/timestamp.c:137
+msgid "Display Timestamps Every"
+msgstr "Zaman Etiketlerini Gösterir"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:202
+msgid "Timestamp"
+msgstr "Zaman Etiketi"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:205
+msgid "Display iChat-style timestamps"
+msgstr "iChat gibi zaman etiketleri göster"
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:207
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "iChat gibi her N dakikada bir zaman etiketleri göster."
+
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "Zaman Etiketi Biçemi Seçenekleri"
+
+#: ../pidgin/plugins/timestamp_format.c:26
+msgid "_Force 24-hour time format"
+msgstr "24 saat _biçemini zorla"
+
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "Günleri göster..."
+
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "_Yazışmalar:"
+
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "For delayed messages"
+msgstr "Geciken iletiler için"
+
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
+msgid "For delayed messages and in chats"
+msgstr "Geciken ve sohbetten gelen iletiler için"
+
+#: ../pidgin/plugins/timestamp_format.c:47
+msgid "_Message Logs:"
+msgstr "İleti _Kayıtları:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:151
+msgid "Message Timestamp Formats"
+msgstr "İleti Zaman Etiketi Biçemleri"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:154
+msgid "Customizes the message timestamp formats."
+msgstr "İleti zaman etiketlerini özelleştirmenizi sağlar."
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:156
+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 "Matlık:"
+
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "Yazışma Penceresi"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "_Mesaj penceresi geçirgenliği"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "Kaydırma çubuklarını mesaj penceresinde göster"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "Üzerine gelindiğinde anlık ileti penceresi şeffaflığını yoket"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Her zaman üstte"
+
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Liste Penceresi"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "Liste penceresi geçirgenliği"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Liste penceresine odaklanıldığında pencere saydamlığını kaldır"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+msgid "Transparency"
+msgstr "Saydamlık"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Liste ve mesaj penceresi için geçirgenlik değişkeni."
+
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Bu eklenti ileti penceresi ve kişi listesi penceresi için saydamlık "
+"ayarlarını yapmanızı sağlar.\n"
+"\n"
+"* Not: Eklenti Win2000 veya daha yeni bir sürüm gerektirir."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ Runtime Sürümü"
+
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+msgid "Startup"
+msgstr "Başlangıç"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "_Windows başlarken %s uygulamasını başlat"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Dockable Buddy List"
+msgstr "_Üzerine bırakılabilir Kişi Listesi"
+
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+msgid "_Keep Buddy List window on top:"
+msgstr "Kişi Listesi penceresi her zaman _üstte tut"
+
+#. 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 "Yeni sohbet iletisi geldiğinde pencereyi _canlandır"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin Seçenekleri"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+msgid "Options specific to Pidgin for Windows."
+msgstr "Windows için Pidgin'e Özel Seçenekler."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>Oturum kapatıldı.</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 Konsolu"
+
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "Hesap: "
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>XMPP'ye bağlanmadı</font>"
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "Bir <iq/> stanza girin."
+
+#: ../pidgin/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr "Bir <presence/> stanza girin."
+
+#: ../pidgin/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr "Bir <message/> stanza girin."
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr "Ham XMPP stanzaları gönder ve al."
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr "Bu eklenti XMPP sunucularının ve istemcilerinin hatalarını ayıklamak için kullanışlıdır."
+
diff -r 6ec8bae7d98a -r cb5bd3c045a9 po/zh_CN.po
--- a/po/zh_CN.po	Wed May 23 23:13:11 2007 +0000
+++ b/po/zh_CN.po	Wed May 23 23:17:50 2007 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-04-09 08:32-0400\n"
-"PO-Revision-Date: 2007-05-01 13:46+0800\n"
+"PO-Revision-Date: 2007-05-20 20:22+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"
@@ -1057,7 +1057,7 @@
 
 #: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
 msgid "Recurring"
-msgstr "在线"
+msgstr "再现"
 
 #: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
 #, c-format
@@ -1413,7 +1413,7 @@
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
-msgstr ""
+msgstr "Lastlog"
 
 #: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
@@ -1426,7 +1426,7 @@
 
 #: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "Lastlog 插件。"
 
 #: ../libpurple/account.c:777
 msgid "accounts"
@@ -2924,9 +2924,8 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:463
 #: ../libpurple/protocols/bonjour/bonjour.c:470
 #: ../libpurple/protocols/bonjour/bonjour.c:528
-#, fuzzy
 msgid "Purple Person"
-msgstr "新建联系人"
+msgstr "Purple 联系人"
 
 #. Creating the user splits
 #: ../libpurple/protocols/bonjour/bonjour.c:567
@@ -2965,7 +2964,7 @@
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr ""
+msgstr "Bonjour"
 
 #: ../libpurple/protocols/bonjour/jabber.c:374
 #, c-format
@@ -3004,15 +3003,13 @@
 
 #: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
-#, fuzzy
 msgid "Token Error"
-msgstr "未知错误"
+msgstr "令牌错误"
 
 #: ../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 "无法获取房间列表。"
+msgstr "无法获取令牌。\n"
 
 #: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
@@ -3077,14 +3074,12 @@
 msgstr "密码(重新输入)"
 
 #: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
-#, fuzzy
 msgid "Enter current token"
-msgstr "%s 目前未登入。"
+msgstr "输入当前令牌"
 
 #: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
-#, fuzzy
 msgid "Current token"
-msgstr "目前位于"
+msgstr "当前令牌"
 
 #: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
@@ -3092,7 +3087,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
-msgstr ""
+msgstr "请填入下列字段"
 
 #: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
 #: ../libpurple/protocols/gg/gg.c:1113
@@ -3148,7 +3143,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:690
 msgid "Fill in the fields."
-msgstr ""
+msgstr "填入字段。"
 
 #: ../libpurple/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
@@ -3849,9 +3844,8 @@
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
 #: ../libpurple/protocols/irc/parse.c:134
-#, fuzzy
 msgid "nickserv: Send a command to nickserv"
-msgstr "quot [……]: 向服务器发送原始命令。"
+msgstr "nickserv: 向 nickserv 发送命令"
 
 #: ../libpurple/protocols/irc/parse.c:135
 msgid ""
@@ -3867,9 +3861,8 @@
 msgstr "operwall &lt;消息&gt;: 如果您不知道这是什么功能，请不要使用。"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#, fuzzy
 msgid "operserv: Send a command to operserv"
-msgstr "quot [……]: 向服务器发送原始命令。"
+msgstr "operserv: 向 operserv 发送命令"
 
 #: ../libpurple/protocols/irc/parse.c:138
 msgid ""
@@ -3917,7 +3910,7 @@
 
 #: ../libpurple/protocols/irc/parse.c:147
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [昵称]: 向用户发送 CTCP VERSION 请求"
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid ""
@@ -3966,7 +3959,7 @@
 
 #: ../libpurple/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
-msgstr ""
+msgstr "在不提供密码的情况下服务器无法通过您的身份验证"
 
 #: ../libpurple/protocols/jabber/auth.c:232
 #: ../libpurple/protocols/jabber/auth.c:233
@@ -4231,6 +4224,7 @@
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
+"要查找联系人，请在给出的输入框中输入搜索条件。注意：您可以使用通配符(%)进行搜索"
 
 #: ../libpurple/protocols/jabber/buddy.c:1694
 msgid "Directory Query Failed"
@@ -4249,7 +4243,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
+msgstr "填入输入框可以搜索匹配的 Jabber 用户。"
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4822,6 +4816,7 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在房间中的角色。"
 
 #: ../libpurple/protocols/jabber/jabber.c:1838
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4987,27 +4982,22 @@
 msgstr "用户不存在"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "缺少全称域名"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, fuzzy
 msgid "Already logged in"
 msgstr "已登入"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, fuzzy
 msgid "Invalid screen name"
 msgstr "用户名无效"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, fuzzy
 msgid "Invalid friendly name"
 msgstr "友好的名称无效"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, fuzzy
 msgid "List full"
 msgstr "列表满"
 
@@ -5061,7 +5051,6 @@
 msgstr "切换板失败"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, fuzzy
 msgid "Notify transfer failed"
 msgstr "通知传送失败"
 
@@ -5079,7 +5068,6 @@
 msgstr "未登入"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "服务暂时不可用"
 
@@ -6187,26 +6175,25 @@
 #: ../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
+#, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
-msgstr "未连接到服务器。"
+msgstr "失去与服务器的连接：\n%s"
 
 #: ../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 连接到服务器。"
+msgstr "在与服务器的连接中收到了无效的数据。"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:386
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
-msgstr "无法建立与本地 mDNS 服务器的连接。服务器是否在运行中？"
+msgstr "无法建立与服务器：\n%s"
 
 #. *< type
 #. *< ui_requirement
@@ -6220,9 +6207,8 @@
 #. *  description
 #: ../libpurple/protocols/oscar/libaim.c:112
 #: ../libpurple/protocols/oscar/libaim.c:114
-#, fuzzy
 msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ 协议插件"
+msgstr "AIM 协议插件"
 
 #. *< type
 #. *< ui_requirement
@@ -6236,9 +6222,8 @@
 #. *  description
 #: ../libpurple/protocols/oscar/libicq.c:112
 #: ../libpurple/protocols/oscar/libicq.c:114
-#, fuzzy
 msgid "ICQ Protocol Plugin"
-msgstr "IRC 协议插件"
+msgstr "ICQ 协议插件"
 
 #: ../libpurple/protocols/oscar/libicq.c:135
 #: ../libpurple/protocols/yahoo/yahoo.c:4069
@@ -6247,19 +6232,17 @@
 msgstr "编码"
 
 #: ../libpurple/protocols/oscar/odc.c:40
-#, fuzzy
 msgid "The remote user has closed the connection."
-msgstr "%s 已经关闭了对话。"
+msgstr "远程用户关闭了连接。"
 
 #: ../libpurple/protocols/oscar/odc.c:42
-#, fuzzy
 msgid "The remote user has declined your request."
-msgstr "用户已经屏蔽了您"
+msgstr "远程用户拒绝了您的请求。"
 
 #: ../libpurple/protocols/oscar/odc.c:44
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr "您错过了 %2$s 的 %1$hu 条消息，原因未知。"
+msgstr "失去与远程用户的连接：<br>%s"
 
 #: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
@@ -6528,18 +6511,18 @@
 msgstr "好友注释"
 
 #: ../libpurple/protocols/oscar/oscar.c:976
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
-msgstr "无法连接到身份验证服务器"
+msgstr "无法连接到身份验证服务器：\n%s"
 
 #: ../libpurple/protocols/oscar/oscar.c:984
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
-msgstr "无法连接到 BOS 服务器"
+msgstr "无法连接到 BOS 服务器：\n%s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1024
 msgid "Screen name sent"
@@ -6626,9 +6609,8 @@
 #: ../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 "确定"
+msgstr "确定(_O)"
 
 #: ../libpurple/protocols/oscar/oscar.c:1471
 #: ../libpurple/protocols/oscar/oscar.c:1514
@@ -6846,9 +6828,8 @@
 msgstr "可用消息"
 
 #: ../libpurple/protocols/oscar/oscar.c:2913
-#, fuzzy
 msgid "Profile"
-msgstr "MSN 个人资料"
+msgstr "个人资料"
 
 #: ../libpurple/protocols/oscar/oscar.c:2990
 msgid "Your AIM connection may be lost."
@@ -7324,12 +7305,11 @@
 msgstr "显示您发了多长时间呆"
 
 #: ../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"
+"总是使用 ICQ 代理服务器\n"
 "(较慢，但不会暴露您的 IP 地址)"
 
 #: ../libpurple/protocols/oscar/peer.c:674
@@ -8115,9 +8095,9 @@
 msgstr "连接重置"
 
 #: ../libpurple/protocols/sametime/sametime.c:1709
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from socket: %s"
-msgstr "从套接字读取时出错。"
+msgstr "从套接字读取时出错：%s"
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
@@ -8128,7 +8108,7 @@
 #: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
-msgstr ""
+msgstr "来自 %s 的通知"
 
 #: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
@@ -8384,9 +8364,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/sametime/sametime.c:5470
-#, fuzzy
 msgid "Notes Address Book Group"
-msgstr "添加到地址簿"
+msgstr "Notes 地址簿组"
 
 #: ../libpurple/protocols/sametime/sametime.c:5471
 msgid ""
@@ -9395,9 +9374,8 @@
 msgstr "内存溢出"
 
 #: ../libpurple/protocols/silc/silc.c:294
-#, fuzzy
 msgid "John Noname"
-msgstr "无名称"
+msgstr "张三"
 
 #: ../libpurple/protocols/silc/silc.c:317
 msgid "Cannot initialize SILC protocol"
@@ -10263,9 +10241,8 @@
 msgstr ""
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2461
-#, fuzzy
 msgid "Received unexpected HTTP response from server."
-msgstr "服务器的响应无效。"
+msgstr "从服务器收到了意外的 HTTP 响应。"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2485
 #: ../libpurple/protocols/yahoo/yahoo.c:2664
@@ -10364,7 +10341,6 @@
 msgstr "在聊天中加入用户..."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3755
-#, fuzzy
 msgid "You have just sent a Buzz!"
 msgstr "您刚刚发送了闪屏振动!"
 
@@ -11003,11 +10979,11 @@
 msgstr "从套接字读取时出错。"
 
 #: ../libpurple/util.c:3434
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing to %s: %s"
 msgstr ""
-"写入 %s 出错：\n"
-"%s。\n"
+"写入 %s 出错："
+"%s"
 
 #: ../libpurple/util.c:3459
 #, c-format
@@ -12496,11 +12472,11 @@
 msgstr "删除联系人(_R)"
 
 #: ../pidgin/gtkdialogs.c:1086
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
-msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗？"
+msgstr "您即将把 %s 组合并到 %s 组中。您真的要这么做吗？"
 
 #: ../pidgin/gtkdialogs.c:1093
 msgid "Merge Groups"
@@ -13977,9 +13953,8 @@
 msgstr "显示统计"
 
 #: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
-#, fuzzy
 msgid "Response Probability:"
-msgstr "响应丢失"
+msgstr "响应可能性："
 
 #: ../pidgin/plugins/cap/cap.c:810
 msgid "Statistics Configuration"
diff -r 6ec8bae7d98a -r cb5bd3c045a9 po/zh_HK.po
--- a/po/zh_HK.po	Wed May 23 23:13:11 2007 +0000
+++ b/po/zh_HK.po	Wed May 23 23:17:50 2007 +0000
@@ -1,9 +1,11 @@
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.10 2007/05/22 04:39:31 acli Exp
+# ---
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2007, Paladin R. Liu <paladin@ms1.hinet.net>
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.445 2007/04/16 03:20:24 acli Exp $
+# $InternalId: zh_TW.po,v 1.468 2007/05/21 21:53:48 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -23,7 +25,6 @@
 # - Key 暫譯「密鑰」，原因：「Key Exchange」既有譯文為「交換密鑰」
 # - Public Key 暫譯「公鑰」
 # - Private Key 暫譯「私鑰」
-# - Key Pair 暫無譯文 (TODO)
 # - Key Agreement 與 Key Exchange 似乎同義，譯「交換密鑰」
 # - Passphrase 譯「密碼」
 # (是否應參照 Mozilla 的譯法 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
@@ -50,8 +51,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
-"POT-Creation-Date: 2007-04-09 08:32-0400\n"
-"PO-Revision-Date: 2007-04-14 22:00-0400\n"
+"POT-Creation-Date: 2007-05-21 00:01-0400\n"
+"PO-Revision-Date: 2007-05-20 01:57-0400\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -60,12 +61,12 @@
 "Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -86,14 +87,32 @@
 "  -n, --nologin       不自動登入\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../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
+#  NOTE Untranslated
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
+#  NOTE 第二、三個 %s 係目錄名稱（不是程式名）
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤，請調查後改以人手完成轉移程序，"
+"並透過 http://developer.pidgin.im 回報這個錯誤。"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
@@ -107,16 +126,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -125,103 +144,103 @@
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定："
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "帳號："
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "密碼："
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 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
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -232,309 +251,331 @@
 msgstr "刪除帳號"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 msgid "You can enable/disable accounts from the following list."
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他（她）的好友 %s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單？"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他（她）的好友清單%s%s。"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "給予認證？"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:278
 msgid "You must provide a screename for the buddy."
 msgstr "必須為好友指定帳號。"
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:280
 msgid "You must provide a group."
 msgstr "必須為好友指定群組。"
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:282
 msgid "You must select an account."
 msgstr "必須指定帳號"
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "所指定的帳號目前沒有連線。"
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節，請用快顯選單。"
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實：是「加入」抑或「新增」?
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:754
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "自動加入"
 
 # XXX 還是「修改選項」？
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "修改設定"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+# XXX 20070518
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "資訊"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "讀取中..."
+
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
 #: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "重命名"
 
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "設定別名"
+
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱，請輸入空白字串。"
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1052
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您確定要刪除 %s？"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -543,12 +584,12 @@
 "上線：%d 人\n"
 "總數：%d 人"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號：%s (%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -558,91 +599,90 @@
 "<b>最後見到：</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
 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
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
+#: ../libpurple/account.c:983 ../libpurple/account.c:1233
+#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
+#: ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-# FIXME 譯文有待改進 - 20061028
-#: ../finch/gntblist.c:2077
-msgid "Toggle offline buddies"
-msgstr "顯示／不顯示離線好友"
-
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "顯示離線好友"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
@@ -665,57 +705,57 @@
 "%s 因下列錯誤結束了連線：\n"
 "%s"
 
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
+#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "連線"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤：輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗，原因不明。"
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效，在即時訊息中無效。"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效，在聊天室內無效。"
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
 # NOTE 沒辦法，用不到着重號，又沒法改換字型……
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "尚未支援指令，訊息因此沒有被送出。"
 
 # XXX 這是什麼？
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -724,24 +764,48 @@
 "\n"
 "%s 正在輸入..."
 
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "您離開了聊天室。"
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "傳送到"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "交談"
+
 #: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "清空交談內容"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "顯示時間戳記"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "加入好友狀態捕捉..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "使用者列表：\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有：version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "沒有這個指令（可在這裏使用）"
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -749,57 +813,60 @@
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;：將指定的訊息當成一般訊息正常送出，而非當為指令處理。"
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;：模仿IRC，執行一個動作。"
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;：向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear：清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;：顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users：顯示這個聊天室內的使用者。"
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins：顯示「模組」視窗"
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist：顯示好友清單。"
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts：顯示帳號清單。"
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin：顯示除錯視窗"
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs：顯示「偏好設定」視窗"
 
-# FIXME - 20061028
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses：「已儲存的狀態」視窗"
-
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+msgstr "statuses：「狀態清單」視窗"
+
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -807,18 +874,18 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "過濾器："
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
 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"
@@ -850,26 +917,26 @@
 msgstr "剩餘"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/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
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "狀態"
 
@@ -886,10 +953,10 @@
 msgstr "中止"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "關閉"
 
@@ -920,75 +987,88 @@
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "電子郵件"
 
 # XXX 要覆查
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "您收到郵件！"
 
-# FIXME check - 20061025
-#  NOTE Jabber 術語，見上
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+# FIXME 原文一詞兩義，根本無法翻譯
+#  NOTE gntnotify 字義為「發信人」
+#  NOTE Jabber 術語字義見「Both」條
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "已認證對方"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "主題"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "繼續"
 
 # XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別……
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "資訊"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "即時訊息"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "加入"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "邀請"
 
 # TODO 要覆查 - 20061028
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "錯誤"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "模組載入失敗"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "模組卸載失敗"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -999,46 +1079,42 @@
 "Filename: %s\n"
 msgstr ""
 "名稱：%s\n"
-"板本：%s\n"
+"版本：%s\n"
 "簡介：%s\n"
 "作者：%s\n"
 "網站：%s\n"
 "檔名：%s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前，請先載入模組。"
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#  XXX 這是指模組既沒有設定任何選項，也沒有指明自己是沒有選項的
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "此模組尚未完成。"
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "此模組並無選項可供設定。"
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "您可透過以下列表載入或卸載模組。"
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "設定模組"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
@@ -1048,8 +1124,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "帳號："
 
@@ -1058,52 +1134,52 @@
 msgstr "好友名稱："
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "登入"
-
 #: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "登出"
+msgid "Signs on"
+msgstr "登入"
 
 #: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "登出"
+
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "離開"
 
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "返回"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "閒置"
+msgid "Returns from away"
+msgstr "返回"
 
 #: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "閒置"
+
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "不再閒置"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "開始輸入"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "暫停輸入"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "停止輸入"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "執行動作"
 
@@ -1131,143 +1207,138 @@
 msgid "Pounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "重覆發生"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉？"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
 # XXX This string is very problematic. The other person might have changed to any non-available
 # XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題！"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "以鍵盤的使用為基準"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "從不"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "顯示時間戳記"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "通知您的好友您正在發訊息給他們"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "日誌格式"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "記錄所有即時訊息內容"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "記錄所有聊天內容"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "記錄所有的狀態改變"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "開啟檔案..."
 
@@ -1281,104 +1352,104 @@
 msgstr "移除狀態"
 
 # FIXME 譯得太差了
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "狀態清單"
 
 # FIXME 原文一詞兩義，根本無法翻譯
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "職銜"
 
 # NOTE 應指儲存時的格式
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "格式"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/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/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "訊息"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "使用"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
-msgstr "無效的標題"
-
-#: ../finch/gntstatus.c:292
+msgstr "標題無效"
+
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "請為這個狀態輸入一個非空白的標題。"
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "標題重覆"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "為給這個狀態輸入另一個標題。"
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "子狀態"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "狀態："
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "訊息："
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "修改狀態"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "為部份帳號設定不同的狀態"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "儲存並使用"
 
@@ -1401,66 +1472,66 @@
 "X, if possible."
 msgstr "當 gnt 的剪則薄內容有所變更時，儘可能把新的內容滙出至 X 視窗系統。"
 
-#: ../finch/plugins/gntgf.c:209
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s 登入"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s 登出"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s 送出一個訊息給您"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s 在 %s 提到您的暱稱"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s 在 %s 送出一個訊息給您。"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "好友登入／登出"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "您收到即時訊息"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "有人在聊天室談話"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "有人在聊天室中提到您的名字"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麵包一樣
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "以下情況下使用多士爐式彈出通知"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "也要「嗶」聲！"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "給終端機視窗設定「URGENT」（緊急資訊）提示"
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麪包一樣
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "多士爐式彈出通知模組"
 
@@ -1514,69 +1585,70 @@
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "帳號清單"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "舊密碼"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "新密碼"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "新密碼（再次確認）"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -1587,18 +1659,18 @@
 # XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
 # XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "好友"
@@ -1622,7 +1694,7 @@
 msgstr "+++ %s 登出"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1645,40 +1717,40 @@
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
@@ -1700,6 +1772,10 @@
 msgid "Failed to get serv name: %s"
 msgstr "無法取得伺服器名稱：%s"
 
+#: ../libpurple/dbus-server.h:83
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr "因下列原因，Purple 的 D-BUS 伺服器未有執行"
+
 # NOTE 暫譯，或許有其他意義
 #: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
 msgid "No name"
@@ -1750,7 +1826,7 @@
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1794,23 +1870,23 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是一般檔案，因此不會覆蓋它。\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要傳送個檔案給您"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎？"
 
 #  XXX 暫譯
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1821,60 +1897,60 @@
 "遠端主機　：%s\n"
 "遠端通訊埠：%d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 提出傳送檔案「%s」"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "「%s」不是一個有效的檔案名稱。\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "向 %2$s 提出傳送 %1$s 中"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "開始自 %2$s 傳送 %1$s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了檔案傳輸"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "傳送檔案到 %s 失敗。"
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "自 %s 傳送檔案失敗。"
@@ -2170,29 +2246,29 @@
 msgid "Set Autoaccept Setting"
 msgstr "設定自動接受選項"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #  TODO: 不通順 - 20070414
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "問一問我"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "自動接受"
 
@@ -2210,17 +2286,17 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "自動拒絶"
 
 #  NOTE 這些都是視窗標題
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "自動接受檔案傳輸..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2228,11 +2304,11 @@
 "檔案儲存路徑\n"
 "（請提供完整路徑）"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "自動拒絕非來自好友清單中的使用者"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2240,108 +2316,8 @@
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "適用於所有通訊協定的自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"這個模組為全部通訊協定提供自動回覆的功能。設定全域適用的自動回覆，只需在這模"
-"組的選項視窗設定即可；為個別好友設定自動回覆，請在好友清單中以滑鼠右鍵點擊該"
-"個好友；為您的個別帳戶設定自動回覆，請在這模組的選項視窗按「進階」按紐。"
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "設定自動回覆給 %s 的訊息"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "設定自動回覆訊息"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr "當自動回覆功能啟動後，每當好友給您送出訊息時，下列訊息將被自動送出："
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "設定自動回覆訊息(_A)"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "自動回覆訊息"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "何時發出自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "當我的帳號是在「離開」狀態時(_A)"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "當我的帳號是在「閒置」狀態時(_I)"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "預設回覆訊息(_D)"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "狀態訊息"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "以狀態訊息作為自動回覆"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "每當設定了狀態訊息時"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "只在沒有設定自動回覆訊息時"
-
-#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
-#  NOTE: (23:41:12) elb: wing: it is the latter
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "自動回覆之間的相隔時間"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "相隔時間下限（分）(_M)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "送出自動回覆訊息的次數"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "次數上限 (_X)"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr "我現在不在位子上。請您留下您的訊息，當我回來的時候，我將儘快給您回覆。"
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "備註"
 
@@ -2349,10 +2325,12 @@
 msgid "Enter your notes below..."
 msgstr "請在下面的空位輸入備註"
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "編輯備註..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2369,7 +2347,7 @@
 msgid "Store notes on particular buddies."
 msgstr "給個別好友加上備註。"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "提供給好友清單上的好友加上備註的功能。"
@@ -2431,46 +2409,46 @@
 
 #  NOTE 這是是輸入欄位左邊的標籤，「幾多分鐘」、「分鐘數」的意思
 #  FIXME 譯文有待改進
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "分鐘數"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "自定個別帳號的閒置時間"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "您的帳號都不是閒置狀態。"
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "取消帳號閒置時間設定"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "取消設定(_U)"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "設定所有帳號的閒置時間"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "取消所有已閒置帳號的閒置時間"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "允許您手動設定您已閒置了多久時間"
 
@@ -2547,7 +2525,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "隱藏「加入/離開聊天室」訊息"
 
@@ -2555,12 +2533,12 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "不顯示多餘的「加入/離開聊天室」訊息"
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2682,20 +2660,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進（第二段） - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2708,12 +2686,12 @@
 "\n"
 "注意：這個模組仍處於開發初期，因此可能經常當掉。如果使用，後果自負！"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono 模組載入器"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "使用Mono讀取.NET模組"
 
@@ -2736,7 +2714,7 @@
 msgid "Prepends a newline to displayed message."
 msgstr "顯示訊息前先開新行。"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2776,31 +2754,31 @@
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "您可以在「好友狀態捕捉」的對話視窗中編輯或刪除狀態捕捉"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "是"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "否"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "使用「好友狀態捕捉」儲存離線訊息"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問，務必使用「好友狀態捕捉」儲存離線訊息。"
 
@@ -2810,51 +2788,51 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl 模組載入器"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "未卜先知"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "「未卜先知」將要開始的交談"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"對方一開始與您交談，就立即打開交談視窗。適用於 AIM、ICQ、Jabber、Sametime 及 "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"對方一開始與您交談，就立即打開交談視窗。適用於 AIM、ICQ、XMPP、Sametime 及 "
 "Yahoo。"
 
-#: ../libpurple/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "您感受到了原力的擾動..."
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "只用於好友清單中的使用者"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "離開時停用"
 
 # FIXME 譯文有待改進 - 20061027
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "在交談內顯示通知訊息"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "浮現「未卜先知」的交談"
 
@@ -2919,7 +2897,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2927,8 +2905,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -2938,7 +2916,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -2946,8 +2924,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -2998,7 +2976,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "好友狀態通知"
 
@@ -3006,22 +2984,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開（閒置）返回的通知訊息。"
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 模組載入器"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3043,18 +3021,18 @@
 #. * 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
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "離開"
 
@@ -3068,53 +3046,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "連絡人"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "主機名稱"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber 帳號"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP 帳號"
 
 # NOTE 這是通訊協定名稱，不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3155,7 +3133,7 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"對於您目前所設定的代理伺服器型態來說，您所給定的伺服器名稱及通訊埠是無效的"
+"對於您目前所設定的代理伺服器型態來說，您所指定的伺服器名稱及通訊埠是無效的"
 
 #: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
@@ -3199,67 +3177,67 @@
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "填寫註冊資料欄位。"
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "新密碼並不相符。"
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "無法註冊新帳號。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "註冊成功！"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "密碼"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "密碼（再次輸入）"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "輸入目前的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "目前密碼"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "請輸入以下的欄位"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3267,220 +3245,220 @@
 msgid "Gender"
 msgstr "性別"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "男"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "女"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "只有上線"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "搜尋好友"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "請在下方輸入您的搜尋條件"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "填到欄位中。"
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "您目前所提供的密碼與指定的帳號不符。"
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "無法修改密碼。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "變更 Gadu-Gadu 帳號的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "密碼修改成功！"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "舊密碼"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸您的舊密碼及你的新密碼："
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "變更 Gadu-Gadu 密碼"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "選取一個聊天室給好友；%s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "離線"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "上線"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "帳號"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
 # FIXME 這不像對，要覆查 - 20061028
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公共字典"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "您已從伺服器下載好友清單。"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "聊天錯誤"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
-msgid "Change password..."
-msgstr "修改密碼..."
-
-#: ../libpurple/protocols/gg/gg.c:2020
-msgid "Upload buddylist to Server"
-msgstr "上傳好友清單到伺服器"
-
 #: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "修改密碼..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
+msgid "Upload buddylist to Server"
+msgstr "上傳好友清單到伺服器"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -3495,35 +3473,35 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令：%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為：%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -3558,7 +3536,7 @@
 msgstr "%s 的是日訊息"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
@@ -3581,34 +3559,34 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "連線中"
 
 # XXX 暫譯
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
@@ -3616,30 +3594,30 @@
 # NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章）
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3653,56 +3631,55 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "姓名"
 
@@ -3710,232 +3687,232 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "被禁止"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "無法禁止 %s：禁止清單已滿"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "所在頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "閒置時間"
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "上線自"
 
 #  XXX 其實譯得不太對，可以改進一點
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>描述：</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "光宗耀祖"
 
 # NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為：%s"
 
 # NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 已經把主題清除。"
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為：%s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 伺服器收到了個它不明白的訊息。"
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者：%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為："
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "無法送出"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出：(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
-msgstr "無效的暱稱"
-
-#: ../libpurple/protocols/irc/msgs.c:888
+msgstr "暱稱無效"
+
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的暱稱，暱稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱，名稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "錯誤：來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲：%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
-#, c-format
-msgid "Cannot join %s:"
-msgstr "無法加入 %s："
-
-#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "無法加入 %s：必須註冊。"
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該個暱稱或頻道。"
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要執行的動作&gt;：執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [訊息]：設定一個離開訊息，或者在離開時不指定任何訊息。"
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv：送出一個指令到 chanserv"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3943,7 +3920,7 @@
 "deop &lt;暱稱1&gt; [暱稱2] ...：移除某個人的「頻道管理者」權限。您必須具有"
 "「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3952,7 +3929,7 @@
 "devoice &lt;暱稱1&gt; [暱稱2] ...：移除某個人的「發言」權限。禁止某些人在頻道"
 "中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3960,23 +3937,23 @@
 "invite &lt暱稱&gt; [聊天室]：邀請某個人來加入您所指定的頻道，或是目前您所在的"
 "頻道。"
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]：以指定的密鑰（如有給"
-"予並有需要）加入所指定的聊天室。"
-
-#: ../libpurple/protocols/irc/parse.c:125
+"j &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]：以指定的密碼匙"
+"（如有給予並有需要）加入所指定的聊天室。"
+
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]：以指定的密鑰（如"
-"有給予並有需要）加入所指定的聊天室。"
-
-#: ../libpurple/protocols/irc/parse.c:126
+"join &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]：以指定的密碼"
+"匙（如有給予並有需要）加入所指定的聊天室。"
+
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3984,7 +3961,7 @@
 "kick &lt;暱稱&gt; [訊息]：將某個使用者踢出頻道。您必需具有「頻道管理者」權限"
 "才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3992,22 +3969,22 @@
 "list：列出目前在網絡上的聊天室清單。<i>請注意，有些伺服器會在您執行了這個動作"
 "之後，強行中止您的連線。</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要執行的動作&gt;：執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv：送出一個指令到 memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;暱稱|頻道&gt;：設定或解除頻道╱使用者模式。"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4015,20 +3992,20 @@
 "msg &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者（避免傳送到公眾"
 "頻道中）。"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]：列出目前在頻道中的使用者清單。"
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱。"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv：送出一個指令到 nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4036,7 +4013,7 @@
 "op &lt;暱稱&gt; [暱稱] ...：賦與某個使用者「頻道管理者」權限。您必須具有「頻"
 "道管理者」權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4044,11 +4021,11 @@
 "operwall &lt;訊息&gt;：如果您不知道這是幹什麼用的，您可能沒有辦法使用這個指"
 "令。"
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv：送出一個指令到 operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4056,7 +4033,7 @@
 "part [頻道] [訊息]：離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊"
 "息。"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4064,7 +4041,7 @@
 "ping [暱稱]：查詢某一個使用者的網路回應速度（或在沒有指定使用者時，查詢伺服器"
 "的回應速度）。"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4072,16 +4049,16 @@
 "query &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者（避免發送到公"
 "眾頻道）。"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]：自伺服器離線，並送出指定的訊息。"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]：送出一個 RAW 指令到伺服器。"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4089,23 +4066,23 @@
 "remove &lt;暱稱&gt; [訊息]：將某個使用者踢出頻道。您必須具有「頻道管理者」的"
 "權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time：顯示 IRC 伺服器所在地之本地時間。"
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新主題]：檢視或修改頻道主題"
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;：設定或解除使用者模式。"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [暱稱]：送出 CTCP VERSION 要求給使用者"
-
-#: ../libpurple/protocols/irc/parse.c:148
+msgstr "version [暱稱]：給使用者送出 CTCP VERSION 要求"
+
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4113,7 +4090,7 @@
 "voice &lt;暱稱&gt; [暱稱] ...：賦與使用者的「發言」權限。您必須具有「頻道管理"
 "者」的權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4121,150 +4098,156 @@
 "wallops &lt;message&gt;：如果您不知道這是幹什麼用的，您可能就沒有辦法使用它"
 "了。"
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [伺服器名稱] &lt;暱稱&gt;：取得使用者資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;暱稱&gt;：取得已離線的使用者的資訊。"
+
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時：%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "沒有提供密碼，伺服器無法為你進行認證"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "伺服器並不提供任何一種被支援的認證方式"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "伺服器送來了無效的回應。"
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
 
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
-msgid "Server does not use any supported authentication method"
-msgstr "伺服器並不提供任何一種被支援的認證方式"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "無效的伺服器回應。"
-
 # XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "街道地址"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "地址(續)"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "市／村"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "省／州"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "國家"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "電話"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4272,53 +4255,53 @@
 msgstr "電子郵件"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "所屬機構"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "所屬部門"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "職責"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "描述"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "編輯 Jabber vCard"
-
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
+msgid "Edit XMPP vCard"
+msgstr "編輯 XMPP vCard"
+
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
 # NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：gaim）
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "用戶端"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "作業系統"
 
@@ -4327,63 +4310,63 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
 # NOTE 用以表示在多處地方同時登入了的情形下，目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr ""
 
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "優先次序"
 
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -4392,43 +4375,43 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4436,69 +4419,69 @@
 "請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令：%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "填入一個或多個欄位，以搜尋Jabber使用者。"
-
 #: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "搜尋Jabber使用者"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "搜尋"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R)："
@@ -4511,88 +4494,88 @@
 msgid "_Handle:"
 msgstr "暱稱(_H)："
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是一個有效的聊天室名稱"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "聊天室名稱無效"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是一個有效的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的暱稱"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "暱稱無效"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "設定錯誤"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "無法設定"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
 # XXX 暫譯，譯文有問題，要改善
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "註冊錯誤"
 
 # XXX 暫譯
 # NOTE 據 faceprint (模組作者) 稱，MUC 是一種新的聊天室協定，
 # NOTE 較舊式的「Group Chat」有更多功能
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改暱稱"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "選擇查詢的會議伺服器"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
@@ -4616,174 +4599,178 @@
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Jabber 帳號無效"
-
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "XMPP 帳號無效"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "XMPP 帳號無效，域名是必須設定的。"
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "省／州"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊，請填寫下列資料："
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "註冊新的 Jabber 帳戶"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "註冊新的 XMPP 帳戶"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "未認證"
 
-# NOTE 這些奇怪術語（至「Subscription」條）的解釋由 faceprint 提供
+# NOTE 這些奇怪 Jabber 術語（至「Subscription」條）的解釋由 faceprint 提供
 # NOTE LSchiere2 的補充如下：
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "已互相認證"
 
-#  NOTE Jabber 術語，見上
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "已認證對方（但仍等待對方認證您）"
 
-#  NOTE Jabber 術語，見上
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "已獲對方認證"
 
-#  NOTE Jabber 術語，見上
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "無（但正等待對方認證您）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "無"
 
-#  NOTE Jabber 術語，見上
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "舊密碼（再次確認）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "修改 Jabber 密碼"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "修改 XMPP 密碼"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4791,51 +4778,52 @@
 #  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>，意思正常（表示權限不夠）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "畸型的 Jabber ID"
+# FIXME 譯文聽來好像有點怪 20070518 acli
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "畸型的 XMPP 帳號"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>，表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件（例如訊息中含有禁字），以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4843,78 +4831,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>，表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>，表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」（認證）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -4924,181 +4912,181 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種，即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
-msgstr "伺服器已不再支援所給定的伺服器名稱"
+msgstr "伺服器已不再支援所指定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯，譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯，譯文有待改進。不過好像真的有人這樣寫，大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種，即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
-msgstr "伺服器不支援給定的字元編碼"
+msgstr "伺服器不支援指定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
-msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
+msgstr "伺服器不支援指定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
-msgstr "不支援給定的 XMPP 版本"
-
-#: ../libpurple/protocols/jabber/jabber.c:1586
+msgstr "不支援指定的 XMPP 版本"
+
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]：離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register：加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]：禁止某使用者進入聊天室"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5107,7 +5095,7 @@
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5115,19 +5103,19 @@
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]：加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]：將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使用者"
@@ -5142,56 +5130,66 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 協定模組"
-
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP 協定模組"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "域名"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文，在未經加密的串流上進行認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "連線埠"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s 已經離開這個交談。"
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為：%s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題：%s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s：%s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber 訊息錯誤"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP 訊息錯誤"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
@@ -5200,35 +5198,35 @@
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室，您要設定它，還是使用預設值？"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -5348,7 +5346,7 @@
 
 #: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "嚐試將一個使用者加入不存在的群組"
+msgstr "嘗試將一個使用者加入不存在的群組"
 
 #: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
@@ -5466,7 +5464,7 @@
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5505,360 +5503,360 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤：%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "您剛送出了一個呼叫！"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱，
 # NOTE 即使和使用者的帳號毫無關係，似乎也是有效的
 # XXX 這看來是一個鈙述句，事實上是對使用者發出的請求／問題
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
-msgstr "設定您的行動電話號碼。"
-
-#: ../libpurple/protocols/msn/msn.c:305
+msgstr "設定您的流動電話號碼。"
+
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼？"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
-"您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動"
-"裝置上呢？"
-
-#: ../libpurple/protocols/msn/msn.c:310
+"您是否允許在您好友清單中的好友傳送 Mobile Page 到您的流動電話，或是其他的流動"
+"通訊器材上呢？"
+
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "你在他（她）的好友清單裏"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
-msgstr "設定行動電話號碼..."
-
-#: ../libpurple/protocols/msn/msn.c:607
+msgstr "設定流動電話號碼..."
+
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
-msgstr "開啟 / 關閉行動裝置..."
-
-#: ../libpurple/protocols/msn/msn.c:612
+msgstr "開啟 / 關閉流動通訊器材..."
+
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
-msgstr "傳送至行動電話"
-
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+msgstr "傳送至流動電話"
+
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:719
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../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
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
-msgstr "個人行動電話"
-
-#: ../libpurple/protocols/msn/msn.c:1584
+msgstr "個人流動電話"
+
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
-msgstr "商務行動電話"
-
-#: ../libpurple/protocols/msn/msn.c:1614
+msgstr "商務流動電話"
+
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
-msgstr "商務呼叫器"
-
-#: ../libpurple/protocols/msn/msn.c:1615
+msgstr "商務傳呼機"
+
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1805
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5867,14 +5865,14 @@
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在；亦有可能使"
 "用者存在，但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -5889,19 +5887,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -5977,17 +5975,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6042,8 +6040,8 @@
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
@@ -6152,130 +6150,130 @@
 msgid "The screen name specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "沒有提供所需的參數"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "無法寫入網路"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "無法由網路讀取"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "和伺服器溝通時發生錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "找不到該會議"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "該會議並不存在"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
 #  XXX 這個太奇怪了 (^^;)
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "不支援"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "密碼已過期"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "密碼錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "找不到該使用者"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "伺服器無法存取目錄"
 
 #  XXX 要覆查譯文
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系統管理員不容許這個動作"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "暫時無法使用伺服器；請稍後重試"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "無法在同一資料夾內新增同一好友兩次"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "無法新增您自己至好友清單"
 
 #  TODO 不知「Master archive」有無正式譯文，也不知應如何譯
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "錯誤的帳號或密碼"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "無法辦識您所輸入的帳號內的主機名稱"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "您的帳號已被停用，因為輸入了太多無效的密碼"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您不能在同一交談內新增同一個人兩次"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您的好友人數已達上限"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "您輸入了無效的帳號"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "更新目錄途中發生錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "協定版本不相容"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "該使用者拒絕了您"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "試用版最多只容許十個使用者同時登入"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "該使用者可能是離線，或者您已被他（她）拒絕"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤：0x%X"
@@ -6360,7 +6358,7 @@
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
@@ -6371,7 +6369,7 @@
 msgstr "無法建立會議 (%s)。"
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
@@ -6388,8 +6386,8 @@
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "使用者ID"
 
@@ -6399,43 +6397,43 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「GroupWise」是軟件名稱，正式中文名大概不會是「群組」...
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "認證中..."
 
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "無法連線到伺服器。"
+
 #: ../libpurple/protocols/novell/novell.c:1735
-msgid "Unable to connect to server."
-msgstr "無法連線到伺服器。"
-
-#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6446,17 +6444,17 @@
 "\n"
 "時間：%s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎？"
 
 # XXX 暫譯
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出，因為您已在其他電腦上登入。"
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6466,17 +6464,17 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "錯誤：沒有安裝 SSL 支援。"
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6490,22 +6488,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6513,8 +6511,8 @@
 msgstr "伺服器關閉連線。"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6551,8 +6549,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM 協定模組"
 
@@ -6566,14 +6564,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ 協定模組"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
 
@@ -6708,7 +6706,7 @@
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 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 "
@@ -6719,7 +6717,7 @@
 "編碼；如果您知道那是什麼編碼，請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
 "欄位指定。）"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6729,53 +6727,54 @@
 "用有問題的用戶端程式。）"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "遊戲"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+# NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
-msgstr "應用程式使用者"
-
-#: ../libpurple/protocols/oscar/oscar.c:654
+msgstr "AP 使用者"
+
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6786,100 +6785,100 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "照相機"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "上線"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6888,7 +6887,7 @@
 "無法連線至認證伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6897,20 +6896,20 @@
 "無法連線到 BOS 伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "連線已建立，並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6920,75 +6919,76 @@
 "無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須以英文字母起始，"
 "並只含英文字母、數字及空白；或者只由數字組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-"線，那麼您的等待時間將會更加的延長。"
-
-#: ../libpurple/protocols/oscar/oscar.c:1353
+"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試連線，"
+"那麼您的等待時間將會更加的延長。"
+
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6997,53 +6997,53 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7053,17 +7053,17 @@
 "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7076,7 +7076,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7089,7 +7089,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7102,38 +7102,38 @@
 "訊息為：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他（她）加入到您的好友名單中嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們太大了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7143,21 +7143,21 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7165,74 +7165,70 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s："
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊：%s"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊："
 
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順？
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息，因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr "速率限制錯誤。"
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7240,113 +7236,113 @@
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
-msgstr "行動電話"
-
-#: ../libpurple/protocols/oscar/oscar.c:3761
+msgstr "流動電話"
+
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號與原本的不同。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號太長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個帳號尚有要求等待處理。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7354,37 +7350,37 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像；要傳送即時訊息影像，必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4440
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7393,22 +7389,22 @@
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
+#: ../libpurple/protocols/oscar/oscar.c:4454
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4482
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7419,11 +7415,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4532
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4578
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7434,17 +7430,17 @@
 "文字母為開頭，同時由「英文字母」、「數字」和「空白」所組成，或者單純以「數"
 "字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4685
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7452,16 +7448,16 @@
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失，可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4914
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5096
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5001
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7470,12 +7466,12 @@
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7485,7 +7481,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5133
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7495,23 +7491,23 @@
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他（她）加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5218
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7521,32 +7517,32 @@
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5222
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E)："
 
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對，又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7554,89 +7550,89 @@
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 所以這應該是有問題的譯文，但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5844
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址，因此可能會有隱私上的風險。您想要繼續嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5947
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5969
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」，不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態（會導致您收到垃圾訊息！）"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
+#: ../libpurple/protocols/oscar/oscar.c:6020
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6155
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6156
+#: ../libpurple/protocols/oscar/oscar.c:6124
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7644,74 +7640,74 @@
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "顯示你閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7747,7 +7743,7 @@
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址，因此可能會有隱私方面的風險。"
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "連線(_C)"
 
@@ -7799,7 +7795,7 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
-msgstr "行動電話號碼"
+msgstr "流動電話號碼"
 
 #: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
@@ -7914,93 +7910,99 @@
 msgid "Update my information"
 msgstr "更新好友資訊"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "成功修改了您的好友資訊。"
 
-#  FIXME 這是很壞的譯文，無奈這是原文的錯 :P
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr "自訂的表情圖案暫時未獲支援，請自下列目錄選取圖案："
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+msgstr "自訂的表情圖案暫時未獲支援，請自 %s 選取圖案。"
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "無效的 QQ 表情"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "您拒絕了 %d 的要求"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "請輸入原因："
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "拒絕"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "對不起，我和你合不來……"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "連同認證要求的新增好友失敗"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "您成功移除了一個好友"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "您成功從一個好友的好友清單中移除了您自己"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "使用者 %d 需要認證"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "請輸入要求"
 
 # XXX - 20061026
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "想同我交個朋友嗎？"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "送出"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "成功將 %d 加入好友清單"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid 錯誤"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "無效的 QQid"
 
@@ -8037,59 +8039,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "您只可搜尋永久群組\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "使用者 %d 要求加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "原因：%s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "QQ 群組操作"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "允許"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "管理人 %d 拒絕了您加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "管理人 %d 允許了您加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "您 [%d] 退出了群組「%d」"
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "群組「%2$d」新增了您 [%1$d]"
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "群組已新增至好友清單。"
 
@@ -8117,33 +8119,33 @@
 msgid "This group does not allow others to join"
 msgstr "這群組不容許外人加入"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "您成功離開群組"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "QQ 群組認證"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "QQ 伺服器接受了您的認證"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "指定的群組 ID 在有效範圍之外"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "您確定要離開這個群 (Qun) 嗎？"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr "請注意，假如您是創立者，這最終會把這個群 (Qun) 移除。"
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "確定"
 
@@ -8156,42 +8158,43 @@
 msgid "Group Operation Error"
 msgstr "群組操作錯誤"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "允許這個要求？"
 
 #  NOTE QQ「member」應是「成員」
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "成功更改了群的一個成員"
 
 # FIXME 暫譯 ambrose 20070415
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "成功更改了群的資訊"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "成功建立了一個群 (Qun)"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "要立刻設定該群 (Qun) 的詳情嗎？"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "設定"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "系統訊息"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "伺服器回應"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "送出即時訊息失敗\n"
 
@@ -8201,7 +8204,7 @@
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
-msgstr ""
+msgstr "「登入要求」Token 出現錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8210,11 +8213,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8265,49 +8268,49 @@
 msgstr "名稱無效"
 
 #  NOTE 參見 qq.h
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>目前上線好友</b>: %d 人<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>：%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>自己位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>登入時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>上次登入位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>上次登入時間：</b>%s\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "登入資訊"
 
@@ -8327,6 +8330,10 @@
 msgid "Exit this QQ Qun"
 msgstr "離開這個 QQ 群 (Qun)"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "封鎖這個好友"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8337,15 +8344,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "以 TCP 登入"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "以隱藏狀態登入"
 
@@ -8390,52 +8397,54 @@
 msgid "Login failed, no reply"
 msgstr "登入失敗，沒有回應"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "您想將這個使用者加入到您的好友名單中嗎？"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s 已將您加入到他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "您想將他（她）加入到您的好友清單嗎？"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "使用者「%s」拒絕了您的要求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "使用者「%s」允許了您的要求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s 想要將您（%s）加入他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "訊息：%s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友清單內"
 
 # FIXME fix the original string :P
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "您要將他（她）加入您的好友清單嗎？"
 
@@ -8530,7 +8539,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "無法連線到主機"
 
@@ -8547,54 +8556,54 @@
 msgid "Unable to send message: "
 msgstr "無法送出訊息："
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Place 已關閉"
 
+#: ../libpurple/protocols/sametime/sametime.c:3229
+msgid "Microphone"
+msgstr "麥克風"
+
 #: ../libpurple/protocols/sametime/sametime.c:3230
-msgid "Microphone"
-msgstr "麥克風"
-
-#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr "喇叭"
 
 # XXX 暫譯
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "視訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "支援"
 
 #  XXX 怪
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "外部使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "與使用者建立會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "請為新的會議室輸入一個主題，同時發出一個邀請訊息給%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "新會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "建立"
 
@@ -8626,25 +8635,25 @@
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "邀請進入會議室"
 
 #  XXX 要覆查 - 20061029
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "未指定 Sametime 社群伺服器"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8654,39 +8663,39 @@
 "入。"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile 連線設定"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知（0x%04x）<br>"
 
 #  XXX 要覆查
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "上次使用的用戶端程式（如已知）"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
-msgstr "輸入了一個不明的使用者 ID"
-
-#: ../libpurple/protocols/sametime/sametime.c:4328
+msgstr "輸入了一個不明確的使用者 ID"
+
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8695,16 +8704,16 @@
 "「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者，以便新增至好友清單"
 "內。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "選擇使用者"
 
 #  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "無法新增使用者：找不到使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8713,11 +8722,11 @@
 "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移"
 "除。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8726,63 +8735,63 @@
 "讀取檔案 %s 發生錯誤；\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "好友清單存放於遠端"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "好友清單儲存模式"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "好友清單只存放於本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "合併伺服器上的好友清單至本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "合併並存放好友清單至伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "無法新增群組：群組已存在"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "群組名稱「%s」已經存在於您的好友清單中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "無法新增群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "可能相符的項目"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8792,26 +8801,26 @@
 "「%s」可能參考到下列的 Notes 通訊錄群組。請自下方選取正確的群組，以加入您的好"
 "友清單。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "無法新增群組：找不到群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "在您的 Sametime 社群中，並沒有任何與「%s」相符的 Notes 通訊錄群組。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8819,12 +8828,12 @@
 "輸入 Notes 通訊錄群組名稱於欄位中，以新增這個群組及它所屬的成員到您的好友清單"
 "中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "對「%s」的搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8834,66 +8843,66 @@
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐，把他（她）們新增至好友清"
 "單內，或向他（她）們發出訊息。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "輸入姓名或部份 ID 於下方的欄位，來查詢您 Sametime 社群中符合的使用者。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "強行登入（忽略伺服器重新導向）"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8908,103 +8917,103 @@
 #: ../libpurple/protocols/silc/buddy.c:139
 #: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
-msgstr "交換密鑰"
+msgstr "交換密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
-msgstr "無法交換密鑰"
+msgstr "無法交換密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
-msgstr "交換密鑰中出現錯誤"
+msgstr "交換密碼匙中出現錯誤"
 
 #: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
-msgstr "交換密鑰失敗"
+msgstr "交換密碼匙失敗"
 
 #: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
-msgstr "交換密鑰逾時"
+msgstr "交換密碼匙逾時"
 
 #: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
-msgstr "交換密鑰被中止"
+msgstr "交換密碼匙被中止"
 
 #: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
-msgstr "交換密鑰己開始"
+msgstr "交換密碼匙己開始"
 
 #: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
-msgstr "不可與自己交換密鑰"
+msgstr "不可與自己交換密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "遠端使用者已不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
-msgstr "由 %s 收到一個交換密鑰要求，您想交換密鑰嗎？"
-
-#: ../libpurple/protocols/silc/buddy.c:298
+msgstr "由 %s 收到一個交換密碼匙要求，您想交換密碼匙嗎？"
+
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"遠端的使用者正在等候交換密鑰：\n"
+"遠端的使用者正在等候交換密碼匙：\n"
 "遠端主機　：%s\n"
 "遠端通訊埠：%d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
-msgstr "交換密鑰要求"
-
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+msgstr "交換密碼匙要求"
+
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
-msgstr "無法設定即時訊息密鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:465
+msgstr "無法設定即時訊息密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "設定即時訊息密碼"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
-msgstr "取得公鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:548
+msgstr "取得公開密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
-msgstr "無法取得公鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
-msgid "Show Public Key"
-msgstr "顯示公鑰"
+msgstr "無法取得公開密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1654
+msgid "Show Public Key"
+msgstr "顯示公開密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
-msgstr "無法載入公鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:712
+msgstr "無法載入公開密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -9013,216 +9022,218 @@
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "好友 %s 不被信任"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"直至您匯入好友的公鑰，您將無法收到該好友的好友通知。要取得公鑰，用「取得公"
-"鑰」指令即可。"
+"直至您匯入好友的公開密碼匙，您將無法收到該好友的好友通知。要取得公開密碼匙，"
+"用「取得公開密碼匙」指令即可。"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "開啟..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網路上"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
-msgstr "要新增好友，必須匯入他（她）的公鑰。要匯入公鑰，請按「匯入」。"
-
-#: ../libpurple/protocols/silc/buddy.c:1079
+msgstr ""
+"要新增好友，必須匯入他（她）的公開密碼匙。要匯入公開密碼匙，請按「匯入」。"
+
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"超過一個使用者使用同一公鑰。請從清單選擇正確的使用者，以便新增至好友清單內。"
-
-#: ../libpurple/protocols/silc/buddy.c:1179
+"超過一個使用者使用同一公開密碼匙。請從清單選擇正確的使用者，以便新增至好友清"
+"單內。"
+
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "超過一個使用者使用同一名稱。請從清單選擇正確的使用者，以便新增至好友清單內。"
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "暫停連線"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "叫醒我！"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "極度活躍"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "機械人"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "開心"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "憂愁"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "憤怒"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "無敵"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "戀愛中"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "想睡"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "發悶"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "興奮"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "憂慮"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "心情"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "所用裝置"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "時區"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
-msgstr "清除即時訊息密鑰"
-
-#: ../libpurple/protocols/silc/buddy.c:1635
+msgstr "清除即時訊息密碼匙"
+
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
-msgstr "要交換密鑰之即時訊息"
-
-#: ../libpurple/protocols/silc/buddy.c:1640
+msgstr "要交換密碼匙之即時訊息"
+
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
-msgstr "取得公鑰..."
-
-#: ../libpurple/protocols/silc/buddy.c:1660
+msgstr "取得公開密碼匙..."
+
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "在白板上繪圖"
 
@@ -9282,31 +9293,31 @@
 #: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>創立者之公鑰指紋：</b><br>%s"
+msgstr "<br><b>創立者之公開密碼匙指紋：</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>創立者之公鑰指紋可讀版本 (Babbleprint)：</b><br>%s"
+msgstr "<br><b>創立者之公開密碼匙指紋可讀版本 (Babbleprint)：</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
-msgstr "新增頻道公鑰"
+msgstr "新增頻道公開密碼匙"
 
 #. Add new public key
 #: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
-msgstr "開啟公鑰..."
-
-#: ../libpurple/protocols/silc/chat.c:400
+msgstr "開啟公開密碼匙..."
+
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
-msgstr "頻道公鑰清單"
-
-#: ../libpurple/protocols/silc/chat.c:412
+msgstr "頻道公開密碼匙清單"
+
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9314,140 +9325,140 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"頻道認證是用來防止頻道未經授權而被存取，認證的方法可以是透過密碼或者透過數位"
-"簽章。如果設定了密碼，加入頻道就必須事先輸入密碼；如果設定了頻道公鑰，加入頻"
-"道就必須擁有所列公鑰內之其一。"
+"頻道認證是用來防止頻道未經授權而被存取，認證的方法可以是透過密碼或者透過數碼"
+"簽署。如果設定了密碼，加入頻道就必須事先輸入密碼；如果設定了頻道公開密碼匙，"
+"加入頻道就必須擁有所列公開密碼匙內之其一。"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "新增／移除"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "密碼"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限；要清除使用者數目上限，輸入零即可。"
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "加入小圈子前，您必須首先加入頻道 %s"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "呼叫指令"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "未知的指令"
 
@@ -9472,7 +9483,7 @@
 
 #: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
-msgstr "交換密鑰失敗"
+msgstr "交換密碼匙失敗"
 
 #: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
@@ -9488,7 +9499,7 @@
 
 #: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr "無法交換密鑰以供傳輸"
+msgstr "無法交換密碼匙以供傳輸"
 
 #: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
@@ -9559,7 +9570,7 @@
 msgstr "職責"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "所屬機構"
 
@@ -9588,19 +9599,19 @@
 #: ../libpurple/protocols/silc/ops.c:1285
 #: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
-msgstr "公鑰指紋"
+msgstr "公開密碼匙指紋"
 
 #: ../libpurple/protocols/silc/ops.c:1286
 #: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
-msgstr "公鑰指紋可讀版本 (Babbleprint)"
+msgstr "公開密碼匙指紋可讀版本 (Babbleprint)"
 
 #: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr "更多(_M)..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
@@ -9626,7 +9637,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
-msgstr "沒有收到公鑰"
+msgstr "沒有收到公開密碼匙"
 
 #: ../libpurple/protocols/silc/ops.c:1519
 #: ../libpurple/protocols/silc/ops.c:1532
@@ -9712,7 +9723,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
-msgstr "密鑰交換失敗"
+msgstr "密碼匙交換失敗"
 
 #: ../libpurple/protocols/silc/ops.c:1723
 msgid ""
@@ -9735,67 +9746,69 @@
 
 #: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
-msgstr "核實伺服器的公鑰中"
-
-#: ../libpurple/protocols/silc/ops.c:1910
+msgstr "核實伺服器的公開密碼匙中"
+
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新您的用戶端程式"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "失敗：遠端不信任／不支援您的公鑰"
-
-#: ../libpurple/protocols/silc/ops.c:1945
+msgstr "失敗：遠端不信任／不支援您的公開密碼匙"
+
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "失敗：遠端不支援建議中的密鑰交換群組 (KE group)"
-
-#: ../libpurple/protocols/silc/ops.c:1948
+msgstr "失敗：遠端不支援建議中的密碼匙交換群組 (KE group)"
+
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗：遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "失敗：遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
-
-#: ../libpurple/protocols/silc/ops.c:1954
+msgstr "失敗：遠端不支援建議中的公開密碼匙加密標準"
+
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗：遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗：遠端不支援建議中的身份驗證代碼 (HMAC)"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "失敗：錯誤的簽章"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "失敗：無效的 Cookie"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
-msgstr "收到 %s 的公鑰，但收到的公鑰跟您現有的不同。仍然接受這個公鑰嗎？"
-
-#: ../libpurple/protocols/silc/pk.c:108
+msgstr ""
+"收到 %s 的公開密碼匙，但收到的公開密碼匙跟您現有的不同。仍然接受這個公開密碼"
+"匙嗎？"
+
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "收到 %s 的公鑰，接受這個公鑰嗎？"
-
-#: ../libpurple/protocols/silc/pk.c:112
+msgstr "收到 %s 的公開密碼匙，接受這個公開密碼匙嗎？"
+
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9803,22 +9816,22 @@
 "%s\n"
 "%s\n"
 msgstr ""
-"%s 的公鑰的指紋及其可讀版本 (babbleprint) 為：\n"
+"%s 的公開密碼匙的指紋及其可讀版本 (babbleprint) 為：\n"
 "\n"
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
-msgstr "核實公鑰"
-
-#: ../libpurple/protocols/silc/pk.c:119
+msgstr "核實公開密碼匙"
+
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "檢視(_V)..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
-msgstr "不支援的公鑰類型"
+msgstr "不支援的公開密碼匙類型"
 
 #: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
@@ -9830,7 +9843,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
-msgstr "交換密鑰中"
+msgstr "交換密碼匙中"
 
 #: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
@@ -9857,7 +9870,7 @@
 #: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
-msgstr "無法讀取 SILC 密鑰對：%s"
+msgstr "無法讀取 SILC 配對密碼匙：%s"
 
 #: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
@@ -9867,7 +9880,7 @@
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "正常"
 
@@ -9934,174 +9947,174 @@
 "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊，只須輸入您希望別"
 "人看得見的各項。"
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:779
-msgid "No Message of the Day available"
-msgstr "沒有是日訊息"
-
 #: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+msgid "No Message of the Day available"
+msgstr "沒有是日訊息"
+
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
-msgstr "密鑰對產生失敗"
-
-#: ../libpurple/protocols/silc/silc.c:914
+msgstr "配對密碼匙產生失敗"
+
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
-msgstr "密鑰長度"
-
-#: ../libpurple/protocols/silc/silc.c:916
+msgstr "密碼匙長度"
+
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
-msgstr "公鑰檔案"
-
-#: ../libpurple/protocols/silc/silc.c:918
+msgstr "公開密碼匙檔案"
+
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
-msgstr "私鑰檔案"
-
-#: ../libpurple/protocols/silc/silc.c:941
+msgstr "私人密碼匙檔案"
+
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "密碼（再次輸入）"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
-msgstr "產生密鑰對"
-
-#: ../libpurple/protocols/silc/silc.c:992
+msgstr "產生配對密碼匙"
+
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
-msgstr "產生 SILC 密鑰對..."
-
-#: ../libpurple/protocols/silc/silc.c:1104
+msgstr "產生 SILC 配對密碼匙..."
+
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "必須指定暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為：%s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "未知的指令：%s（可能是客戶端的錯誤）"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]：離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]：離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;頻道&gt; [&lt;密碼&gt;]：加入一個在網路上的聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list：列出目前在網絡上的聊天室清單"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;：查看這個暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1616
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;暱稱&gt; [&lt;訊息&gt;]：送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd：顯示伺服器的是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach：暫停連線這個工作階段"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]：自伺服器離線，並可選擇送出指定的訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;：執行 SILC 指定的用戶端指令"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]：從網路上移除暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;：查看暱稱的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]：設定或顯示頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10109,15 +10122,15 @@
 "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;：在指定頻道修改指定的暱稱的"
 "模式"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;：設定您在網路上的模式"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]：取得伺服器管理者的權限"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10125,37 +10138,37 @@
 "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;：邀請指定的暱稱、新增指定的暱稱到頻道的"
 "被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]：把指定的暱稱從頻道中踢出"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]：觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]：於指定的頻道禁止指定的用戶端"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;暱稱|伺服器&gt;：取得用戶端或伺服器的公鑰"
-
-#: ../libpurple/protocols/silc/silc.c:1690
+msgstr "getkey &lt;暱稱|伺服器&gt;：取得用戶端或伺服器的公開密碼匙"
+
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats：觀看伺服器及網路的統計資料"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping：向連結的伺服器送出 PING"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;：列出頻道中的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10172,71 +10185,71 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
 msgid "Network"
 msgstr "網路"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
-msgstr "公鑰檔案"
-
-#: ../libpurple/protocols/silc/silc.c:1857
+msgstr "公開密碼匙檔案"
+
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
-msgstr "私鑰檔案"
+msgstr "私人密碼匙檔案"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "加密方法"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
-msgstr "使用公鑰認證"
+msgstr "使用公開密碼匙認證"
 
 #  TODO 譯文有待改進，這是意譯
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
-msgstr "拒絕沒有交換密鑰的即時訊息"
-
-#: ../libpurple/protocols/silc/silc.c:1892
+msgstr "拒絕沒有交換密碼匙的即時訊息"
+
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
 # XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
-msgstr "數位簽署所有即時訊息"
+msgstr "數碼簽署所有即時訊息"
 
 #: ../libpurple/protocols/silc/util.c:207
 #: ../libpurple/protocols/silc/util.c:247
@@ -10284,7 +10297,7 @@
 #: ../libpurple/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "密鑰長度：　\t%d 個位元\n"
+msgstr "密碼匙長度：　\t%d 個位元\n"
 
 #: ../libpurple/protocols/silc/util.c:369
 #, c-format
@@ -10293,7 +10306,7 @@
 "%s\n"
 "\n"
 msgstr ""
-"公鑰指紋：\n"
+"公開密碼匙指紋：\n"
 "%s\n"
 "\n"
 
@@ -10303,13 +10316,13 @@
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"公鑰指紋可讀版本 (Babbleprint)：\n"
+"公開密碼匙指紋可讀版本 (Babbleprint)：\n"
 "%s"
 
 #: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
-msgstr "公鑰資訊"
+msgstr "公開密碼匙資訊"
 
 #: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
@@ -10353,26 +10366,26 @@
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -10384,36 +10397,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態（請注意：任何人都能看到您）"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -10544,8 +10557,8 @@
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
-"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-"線，那麼您的等待時間將會更加的延長。"
+"您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試連線，"
+"那麼您的等待時間將會更加的延長。"
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -10638,12 +10651,12 @@
 msgstr "TOC 協定模組"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:878
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s 在呼叫您！"
@@ -10654,16 +10667,16 @@
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10672,11 +10685,11 @@
 "使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10686,11 +10699,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式，因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10699,70 +10712,70 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
-msgid "Not at Desk"
-msgstr "不在座位"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
+msgid "Not at Desk"
+msgstr "不在座位"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10770,91 +10783,92 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線，所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID？"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3255
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "您剛送出了一個呼叫！"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "list: List rooms on the Yahoo network"
 msgstr "list：列出Yahoo網路上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -10868,57 +10882,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "傳呼伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
@@ -11128,23 +11142,23 @@
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "使用者"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "隱藏或未登入"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "任何人"
 
@@ -11155,65 +11169,65 @@
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "類別／聊天室(_C)："
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "實體／頻道(_I)："
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "接受者(_R)："
 
 #  FIXME 暫譯
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "加人聊天室（交談） %s,%s,%s 失敗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;：尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;：尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&gt;：設定這個「類別」（聊天室）的「實體」（頻道）"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&gt;：設定這個「類別」（聊天室）的「實體」（頻道）"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;實體&gt;：設定這個「類別」（聊天室）的「實體」（頻道）"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;：加入聊天室"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;實體&gt;：送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;類別&gt; &lt;實體&gt：送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 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;"
@@ -11221,7 +11235,7 @@
 "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;<i>類別</i>,<i>"
 "實體</i>,<i>接受者</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11229,18 +11243,18 @@
 "zir &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
 "</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;：送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
 #  FIXME 要覆查譯文
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -11254,16 +11268,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "使用 TZC"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "TZC 指令"
 
@@ -11273,11 +11287,11 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
@@ -11287,22 +11301,22 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "自 .anyone 檔案中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "自 .zephyr.subs 檔中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "域名"
 
 # FIXME 暫譯；譯得很差，有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -11344,18 +11358,18 @@
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "否(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "接受(_A)"
 
@@ -11367,16 +11381,16 @@
 msgstr "我現在不在位子上"
 
 # FIXME 這很明顯是誤譯，但想不到怎樣寫才對 - 20061025
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "儲存狀態"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11385,58 +11399,58 @@
 "%s 邀請 %s 到聊天室「%s」：\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "離線"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
-msgstr "使用行動裝置"
-
-#: ../libpurple/status.c:611
+msgstr "使用流動通訊器材"
+
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 從「%s」狀態改變為「%s」"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 目前為%s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再%s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
@@ -11446,13 +11460,13 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11460,79 +11474,79 @@
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:2906
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3488
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體，網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3403
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤：%s"
 
-#: ../libpurple/util.c:3434
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤：%s"
 
-#: ../libpurple/util.c:3459
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
@@ -11559,59 +11573,59 @@
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "登入選項"
 
 # NOTE Debian 譯「local」為「本地端」，「本機」是Windows譯法，但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "帳號別名（只在本機生效）："
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "使用者自定選項"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "使用下列好友圖示："
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」，但講國語「毋須」會不通順，「不使用」較好
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -11620,60 +11634,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "通訊埠(_P)："
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11697,233 +11711,233 @@
 
 # TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "別名..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2763
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2764
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../pidgin/gtkblist.c:2765
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2766
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11932,132 +11946,128 @@
 "\n"
 "<b>帳號：</b>%s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/工具/好友狀態捕捉"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線：%s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱：</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>密碼：</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12075,23 +12085,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../pidgin/gtkblist.c:4428
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../pidgin/gtkblist.c:4434
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../pidgin/gtkblist.c:4437
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:5367
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12100,66 +12110,66 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱，而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "群組："
 
-#: ../pidgin/gtkblist.c:5590
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:5743
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名，或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
@@ -12172,65 +12182,65 @@
 "re-enable the account."
 msgstr ""
 "%s\n"
-"在您更正這個錯誤並重新啟動這個帳號前，%s 將不會再試著重新連線。"
-
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+"在您更正這個錯誤並重新啟動這個帳號前，%s 將不會再嘗試重新連線。"
+
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "搜尋(_S)："
 
-#: ../pidgin/gtkconv.c:1338
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
@@ -12253,130 +12263,130 @@
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2790
-msgid "/Conversation/Se_nd File..."
-msgstr "/交談/傳送檔案(_N)..."
-
-#: ../pidgin/gtkconv.c:2791
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/交談/新增好友狀態捕捉(_P)..."
-
 #: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/Se_nd File..."
+msgstr "/交談/傳送檔案(_N)..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/交談/新增好友狀態捕捉(_P)..."
+
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
@@ -12385,238 +12395,238 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3030
-msgid "/Options/Enable Logging"
-msgstr "/選項/開始記錄日誌"
-
 #: ../pidgin/gtkconv.c:3033
+msgid "/Options/Enable Logging"
+msgstr "/選項/開始記錄日誌"
+
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3052
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
-msgstr "使用者正在輸入..."
-
-#: ../pidgin/gtkconv.c:3176
+msgstr "對方正在輸入..."
+
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
-msgstr "使用者輸入了一些東西，不過暫停了"
+msgstr "對方輸入了一些東西，不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎？"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "依帳號"
 
 #  NOTE「除錯日誌」很怪，「除錯紀錄」較順口，而且已經有人用
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
 #  NOTE 除錯視窗的工具列的快取選單的指令，指「工具列的按紐以圖示標示」，下二同
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "顯示文字(_T)"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "按右鍵以顯示更多選項。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "全部訊息"
 
 # NOTE 這個不是指「Info」（因為已經有「Info」一項），而是一種比「Info」還要低層次的除錯訊息，應是指「Debug」
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "閒雜訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "警告訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
 msgstr "錯誤訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "主要開發者"
 
@@ -12625,8 +12635,9 @@
 #: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "developer"
 msgstr "開發者"
 
@@ -12634,160 +12645,170 @@
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
 msgid "support"
 msgstr "支援"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support/QA"
 msgstr "支援兼品管"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "維護者"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaim 維護者"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
-#: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber 開發者"
-
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
+msgid "XMPP developer"
+msgstr "XMPP 開發者"
+
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "原作者"
 
-#  NOTE 譯文完全不統一，依其他 open source project「慣例」（只有兩三個）譯成「南非荷蘭文」
-#: ../pidgin/gtkdialogs.c:121
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "阿拉伯文"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
-msgid "Bulgarian"
-msgstr "保加利亞文"
-
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:209
+msgid "Bulgarian"
+msgstr "保加利亞文"
+
 #: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "孟加拉文"
 
-# NOTE 港譯「波斯尼亞」
-#: ../pidgin/gtkdialogs.c:129
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
+# NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
-msgstr "波士尼亞文"
-
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+msgstr "波斯尼亞文"
+
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
 msgstr "加泰隆文"
 
 # NOTE 直譯是「瓦倫西亞式加泰隆文」，但正常的叫法是直接寫「瓦倫西亞語」(Valencian)
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
 msgid "Czech"
 msgstr "捷克文"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "丹麥文"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:213
 msgid "German"
 msgstr "德文"
 
 # NOTE 國名是「不丹」，中譯文依國名不依語文名
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "不丹文"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "澳洲式英文"
 
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:146
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:147
 msgid "British English"
 msgstr "英式英文"
 
 #  XXX 寫下的應是文，不是語，但實在真是好像沒有人寫「世界文」的 - Ambrose
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "巴斯克文"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "French"
 msgstr "法文"
 
-#: ../pidgin/gtkdialogs.c:155
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "加里西亞文"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "古吉拉特文翻譯小組"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: ../pidgin/gtkdialogs.c:159
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
+#: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
-msgstr "北印度文"
-
-#: ../pidgin/gtkdialogs.c:160
+msgstr "印度文"
+
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "印尼文"
 
@@ -12795,41 +12816,53 @@
 #  NOTE 國語去聲不分陰陽，廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」，
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條，譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#  NOTE 註：因 zh_TW 和 zh_HK 正式分家，還原成台式譯法「義大利」
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
 msgstr "意大利文"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
 msgid "Japanese"
 msgstr "日文"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
 msgid "Georgian"
 msgstr "喬治亞文"
 
-# NOTE: 這是KDE譯法，也見於台灣某大學網站 :P
-#: ../pidgin/gtkdialogs.c:165
+# FIXME 可以譯好一點 20070520 acli
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+# NOTE 註：KDE 譯「坎納達」
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
-msgstr "坎納達文"
-
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+msgstr "康納達文"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "康納達文翻譯小組"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "韓文"
 
-# NOTE 台譯「庫德」，港譯「庫爾德」；但台灣政府也有用「庫爾德」，故「庫爾德」較好
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#  NOTE 港譯只有「庫爾德」，台譯有「庫德」（標準譯法，看來亦較常見）和「庫爾德」
+#  NOTE 註：因 zh_TW 和 zh_HK 正式分家，保留台式譯法「庫德」
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
-msgstr "庫爾德文"
-
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+msgstr "庫德文"
+
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:173
 msgid "Macedonian"
 msgstr "馬其頓文"
 
@@ -12837,234 +12870,242 @@
 #  NOTE 音譯包括：博克馬爾、波克默爾、布克莫爾、巴克摩
 #  NOTE 其他譯法包括：丹麥－挪威文（大英百科）、丹麥式挪威文（維基百科）、東挪威文、標準挪威文（國內不是標準，國外是 :P）
 #  NOTE 譯音一般放在「挪威文」後的括弧內，也有不用括弧把譯音放在「挪威」和「文」之間
-#  XXX 暫時譯成「挪威布克莫爾文」
-#: ../pidgin/gtkdialogs.c:172
+#  NOTE 採用「標準」一詞，參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
+#: ../pidgin/gtkdialogs.c:174
 msgid "Bokmål Norwegian"
-msgstr "挪威布克莫爾文"
-
-#: ../pidgin/gtkdialogs.c:173
+msgstr "標準挪威文"
+
+#: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:176
 msgid "Dutch, Flemish"
 msgstr "荷蘭文／法蘭德斯文"
 
-#: ../pidgin/gtkdialogs.c:175
+#  NOTE 這是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當
+#: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
-msgstr "挪威文"
-
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+msgstr "新挪威文"
+
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:181
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#  XXX 某大學論文譯法
-#: ../pidgin/gtkdialogs.c:181
+#  NOTE「普什圖」在三地都看來是較正常的譯法
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
+#: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
-msgstr "巴斯多文 (Pashto)"
-
-#: ../pidgin/gtkdialogs.c:182
+msgstr "普什圖文"
+
+#: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Russian"
 msgstr "俄文"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "斯洛伐克文"
-
 #  NOTE 港譯「斯洛文尼亞」，臺譯「斯洛維尼亞」。粵語「文」字為Ｍ起音，
 #  NOTE 以粵語發音，跟臺譯反而發音較準；況且，這至少名義上也是zh_TW；
 #  NOTE 所以不跟港譯（其實是大陸譯法），跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
 msgid "Slovenian"
-msgstr "斯洛維尼亞文"
-
-#: ../pidgin/gtkdialogs.c:187
+msgstr "斯洛文尼亞文"
+
+#: ../pidgin/gtkdialogs.c:189
 msgid "Albanian"
 msgstr "阿爾巴尼亞文"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
 msgid "Swedish"
 msgstr "瑞典文"
 
-# NOTE 港譯「泰米爾」
-#: ../pidgin/gtkdialogs.c:191
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」
+#: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
-msgstr "塔米爾文"
-
-#: ../pidgin/gtkdialogs.c:192
+msgstr "泰米爾文"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+#: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
-msgstr "特魯固文"
-
-#: ../pidgin/gtkdialogs.c:193
+msgstr "德拉威文"
+
+#: ../pidgin/gtkdialogs.c:195
 msgid "Thai"
 msgstr "泰文"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+msgid "Hong Kong Chinese"
+msgstr "港式中文"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:242
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-# XXX Yahoo譯法
-#: ../pidgin/gtkdialogs.c:204
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+#: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:327
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:359
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s 係一個以 GTK+ 開發的模組化訊息程式，同時提供 AIM、MSN、Yahoo!、Jabber、"
-"ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、Bonjour、"
-"Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修改或發佈這個程式，只需按"
-"照 GPL（第二版或任何以後的版本）的條款即可；%s 內已附有一份 GPL, 收錄在名為"
-"「COPYING」的檔案之內。%s 係有版權的著作，版權歸全部貢獻者共同所有，貢獻者芳"
-"名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:374
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to 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 ""
+"%s 係一個以 GTK+ 開發，圖形介面式的模組化訊息程式，以 libpurple 為基礎，同時"
+"提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
+"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修"
+"改或發佈這個程式，只需按照 GPL（任擇第二版或較新的其他版本）的條款即可；%s 內"
+"已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作，版權歸全"
+"部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
+"何保用。<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
-# NOTE 不過，翻成「狂熱的模組作者」會比較好
-#: ../pidgin/gtkdialogs.c:398
+# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
+# NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: ../pidgin/gtkdialogs.c:428
+#  NOTE 可譯「美工人員」，但那是很保守的譯法；Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人，所以很明顯是「設計員」
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
-msgstr "美工人員"
-
-#: ../pidgin/gtkdialogs.c:443
+msgstr "平面設計"
+
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13073,82 +13114,82 @@
 "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 個好友從您的好友清單中移除。您要繼續這個動"
-"作嗎？"
+"您正在嘗試將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個"
+"動作嗎？"
 msgstr[1] ""
-"您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動"
-"作嗎？"
+"您正在嘗試將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個"
+"動作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
-msgstr "您正試著將群組 %s 與 %s 合併，新群組以後者命名。您要繼續這個動作嗎？"
-
-#: ../pidgin/gtkdialogs.c:1093
+msgstr "您正在嘗試將群組 %s 與 %s 合併，新群組以後者命名。您要繼續這個動作嗎？"
+
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1159
 #, 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
+"您正在嘗試將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
+
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎？"
+msgstr "您正在嘗試將 %s  從您的好友清單中移除。您要繼續這個動作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1225
 #, 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
+msgstr "您正在嘗試將 %s 從您的好友清單中移除。您要繼續這個動作嗎？"
+
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
@@ -13157,37 +13198,34 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "變更狀態"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "有新訊息時閃動"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "結束程式"
 
-#  XXX 這個太奇怪了 (^^;)
+#  NOTE 這是指「未開始」傳輸檔案，不是「未啟動」
 #: ../pidgin/gtkft.c:153
 msgid "Not started"
-msgstr "未啟動"
+msgstr "未開始"
 
 # XXX 暫譯
 #: ../pidgin/gtkft.c:273
@@ -13267,7 +13305,7 @@
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "暫停(_P)"
 
@@ -13277,11 +13315,11 @@
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:792
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:809
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
@@ -13314,7 +13352,7 @@
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13325,7 +13363,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13335,7 +13373,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13346,7 +13384,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13357,11 +13395,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -13472,21 +13510,21 @@
 msgstr "插入表情"
 
 #  XXX 不通順 - ambrose 20070415
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄，與 %1$s 交談的日誌？"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄，在聊天室「%1$s」交談的日誌？"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13494,22 +13532,22 @@
 msgstr "您確定您要刪除由%s開始記錄的系統日誌？"
 
 #  NOTE 第一個 %s 是聊天室名稱，第二個 %s 是時間
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>在%s於 %s 的交談</span>"
 
 #  NOTE 第一個 %s 是聯絡人名稱，第二個 %s 是時間
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:430
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>與%s於 %s 的交談</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%Y年%m月"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13517,51 +13555,51 @@
 "只有在「記錄所有狀態改變至系統日誌」選項被啟動時，系統事件才會被記錄到系統日"
 "誌中。"
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "即時訊息只有在「記錄所有即時訊息」選項被開啟時才會被記錄。"
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "聊天室的內容將只有在「記錄所有的聊天室」選項被啟動時才會被記錄。"
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:535
 msgid "No logs were found"
 msgstr "找不到日誌"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "瀏覽日誌目錄(_B)"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "全部日誌大小："
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr "於 %s 的交談"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13586,26 +13624,26 @@
 "哪些帳號，並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:550
+#: ../pidgin/gtkmain.c:493
 #, 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"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\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"
+"%swiki/GetABacktrace\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"
+"%swiki/DeveloperPages\n"
 msgstr ""
 
 #: ../pidgin/gtknotify.c:337
@@ -13634,22 +13672,22 @@
 msgstr[0] "<b>您有 %d 封新郵件。</b>"
 msgstr[1] "<b>您有 %d 封新郵件。</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, 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
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤：%s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
@@ -13662,11 +13700,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "多個模組將會被卸載。"
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "卸載模組"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13677,7 +13715,7 @@
 "<span weight=\"bold\">網站：</span>\t\t%s\n"
 "<span weight=\"bold\">檔名：</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13688,11 +13726,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">錯誤: %s\n"
 "檢查模組的網站以獲得更新。</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "設定模組(_U)"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>模組明細</b>"
 
@@ -13701,95 +13739,95 @@
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "好友名稱(_B)："
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "離開(_W)"
-
 #: ../pidgin/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "返回(_U)"
+msgid "Goes a_way"
+msgstr "離開(_W)"
 
 #: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "返回(_U)"
+
+#: ../pidgin/gtkpounce.c:593
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:595
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "停止輸入(_Y)"
-
 #: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "停止輸入(_Y)"
+
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
@@ -13818,7 +13856,7 @@
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S)："
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13837,7 +13875,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
 msgid "When away"
 msgstr "離開期間"
 
@@ -14064,59 +14102,64 @@
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "(預設)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "播放方式(_M)："
 
-#: ../pidgin/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "嗶一聲"
-
 #: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "嗶一聲"
+
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "自動"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1606
 msgid "Command"
 msgstr "指令"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1607
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1615
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14125,118 +14168,118 @@
 "音效指令(_C)：\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1641
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Enable sounds:"
 msgstr "啟動音效："
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when not available"
 msgstr "離開期間"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1655
 msgid "Volume:"
 msgstr "音量："
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1683
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1734
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1741
 msgid "Event"
 msgstr "事件"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 msgid "Test"
 msgstr "測試"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1764
 msgid "Reset"
 msgstr "重置"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1768
 msgid "Choose..."
 msgstr "選擇..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1811
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1816
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1825
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應："
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1829
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1835
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1837
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1839
+#: ../pidgin/gtkprefs.c:1841
 msgid "_Minutes before changing status:"
 msgstr "閒置多少分鐘設為離開(_M)："
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1849
 msgid "Change _status to:"
 msgstr "更改狀態為(_S)："
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1870
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1872
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1878
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態："
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1916
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1918
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1919
 msgid "Sounds"
 msgstr "音效"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Status / Idle"
 msgstr "狀態／閒置"
 
@@ -14273,7 +14316,7 @@
 msgid "Set privacy for:"
 msgstr "帳號："
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "許可使用者"
 
@@ -14285,38 +14328,38 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "許可(_P)"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您？"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎？"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s？"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s？"
@@ -14325,23 +14368,23 @@
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎？"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
@@ -14365,38 +14408,38 @@
 msgstr "您確定您要刪除被選取的狀態？"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 msgid "Title already in use.  You must choose a unique title."
 msgstr "目前標題正在使用中。您必須選取一個唯一的標題。"
 
 # TODO - 這個有點不妥，但想不到更好的 - 20061123
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "差異"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "狀態(_S)："
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "狀態：%s"
@@ -14449,37 +14492,41 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失敗。"
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤：%s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1472
 #, 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
+"individually."
+msgstr "%s 沒有辦法傳送目錄，您需要個別傳送目錄內的檔案。"
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1505
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14487,23 +14534,23 @@
 "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎？"
 
-#: ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1524
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14511,7 +14558,7 @@
 "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1526
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14524,17 +14571,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器；您大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14545,59 +14592,66 @@
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」：%s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入影像「%s」，原因不明，大概是影像檔已損壞"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "儲存檔案"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "選擇顏色"
 
-#: ../pidgin/pidginstock.c:88
+#  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "關閉分頁(_T)"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "邀請(_I)"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
@@ -14620,7 +14674,7 @@
 msgstr "好友作出回覆的時間上限："
 
 #: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "分鐘"
 
@@ -14671,12 +14725,12 @@
 
 #: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "好友離開"
+msgstr "好友「長時間離開」"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
-msgstr "好友使用行動裝置"
+msgstr "好友使用流動通訊器材"
 
 #: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
@@ -14693,7 +14747,7 @@
 "in the contact.\n"
 msgstr ""
 "若果一個好友其實概括了好幾個好友帳號，通訊時便根據這裏\n"
-"所給定的得分值計分，積分最多者為「優先」，成為當時實際\n"
+"所指定的得分值計分，積分最多者為「優先」，成為當時實際\n"
 "使用的好友帳號。\n"
 
 # NOTE 舊版 (1.x) Pidgin 中此譯文經 Etan Reisner (開發者之一) 核實，新版 (2.0) Pidgin 譯文要重新核實
@@ -14712,20 +14766,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "好友優先次序"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "讓你自定各個好友狀態的得分值。"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14787,12 +14841,19 @@
 msgid "Conversation Placement"
 msgstr "交談位置"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr "注意：「新交談」選項必須設定為「依交談個數」。"
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
 #  XXX 要核實譯文！
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "依交談個數放置新交談時，以不同的視窗顯示即時訊息和聊天"
 
@@ -14802,56 +14863,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "視窗位置額外選項"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
 #  XXX 譯得很差，請改良 :-(
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr "限制視窗可容之交談數目，亦可選擇以不同的視窗顯示即時訊息和聊天"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin 範例模組"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "範例模組————請看介紹。"
-
-# NOTE 譯文更動 by Ambrose
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"這是一個很有趣的模組，它具有下列的功能：\n"
-"- 它可以在您登入的時候，告訴您是誰寫了這個程式\n"
-"- 它會將所有收到的訊息左右掉轉\n"
-"- 它會在您的好友登入時，立刻送出一個訊息給他們"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14876,19 +14906,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "滑鼠動作"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "提供滑鼠動作的支援"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14991,7 +15021,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -15002,8 +15032,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
@@ -15162,12 +15192,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15256,7 +15286,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "訊息通知"
 
@@ -15264,10 +15294,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin 範例模組"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "範例模組————請看介紹。"
+
+# NOTE 譯文更動 by Ambrose
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"這是一個很有趣的模組，它具有下列的功能：\n"
+"- 它可以在您登入的時候，告訴您是誰寫了這個程式\n"
+"- 它會將所有收到的訊息左右掉轉\n"
+"- 它會在您的好友登入時，立刻送出一個訊息給他們"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "游標顏色"
@@ -15281,39 +15342,31 @@
 msgid "Hyperlink Color"
 msgstr "超連結顏色"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView 展開器大小"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "交談歷史"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "日誌檢視器"
 
 #  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "通知視窗 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView展開器"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "選擇顏色"
@@ -15335,36 +15388,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "介面顏色"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Widget 大小"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "字型"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "工具"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "將設定寫入%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
@@ -15381,11 +15454,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"讓您直接輸入指令對各種文字模式的通訊協定（例如 Jabber、MSN、IRC 及 TOC）進行"
-"操作。在輸入欄位輸入指令，按 Enter 後鍵送出；相關資訊會在除錯視窗顯示。"
+"讓您直接輸入指令對各種文字模式的通訊協定（例如 XMPP、MSN、IRC 及 TOC）進行操"
+"作。在輸入欄位輸入指令，按 Enter 後鍵送出；相關資訊會在除錯視窗顯示。"
 
 # XXX 暫譯
 #: ../pidgin/plugins/relnot.c:71
@@ -15501,11 +15574,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "最後輸入的一個字也進行文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
@@ -15527,7 +15600,7 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "時間戳記顯示頻率"
 
@@ -15537,19 +15610,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "時間戳記"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "顯示 iChat 式的時間戳記"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "每隔 N 分鐘顯示 iChat 風格的時間戳記。"
 
@@ -15558,9 +15631,8 @@
 msgstr "時間戳記格式選項"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "強制使用（%s 傳統使用的）24小時制時間格式(_F)"
+msgid "_Force 24-hour time format"
+msgstr "強制使用24小時制時間格式(_F)"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15591,19 +15663,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "訊息時間戳記格式"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "使用者自定的訊息時間戳記格式。"
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15657,19 +15729,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "交談視窗及好友清單產生的半透明效果。"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15712,18 +15784,18 @@
 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
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Windows 版 Pidgin 選項"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
-msgstr "Windows Pidgin 的相關選項。"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+msgstr "Windows 版 Pidgin 的相關選項。"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "提供 Windows Pidgin 的相關選項，例如好友清單的停駐功能。"
+msgstr "提供 Windows 版 Pidgin 的相關選項，例如好友清單的停駐功能。"
 
 #: ../pidgin/plugins/xmppconsole.c:665
 msgid "<font color='#777777'>Logged out.</font>"
@@ -15774,6 +15846,139 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "GtkTreeView 展開器大小"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "GtkTreeView展開器"
+
+# FIXME 譯文有待改進 - 20061028
+#~ msgid "Toggle offline buddies"
+#~ msgstr "顯示／不顯示離線好友"
+
+#~ msgid "Timestamps"
+#~ msgstr "時間戳記"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber 帳號"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "無法加入 %s："
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "搜尋Jabber使用者"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Jabber 帳號無效"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "修改 Jabber 密碼"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber 協定模組"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber 開發者"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#  XXX 這是指模組既沒有設定任何選項，也沒有指明自己是沒有選項的
+#~ msgid "Still need to do something about this."
+#~ msgstr "此模組尚未完成。"
+
+#~ msgid "Autoreply"
+#~ msgstr "自動回覆"
+
+#~ msgid "Autoreply for all the protocols"
+#~ msgstr "適用於所有通訊協定的自動回覆"
+
+#~ msgid ""
+#~ "This plugin lets you set autoreply message for any protocol. You can set "
+#~ "the global autoreply message from the Plugin-options dialog. To set some "
+#~ "specific autoreply message for a particular buddy, right click on the "
+#~ "buddy in the buddy-list window. To set autoreply messages for some "
+#~ "account, go to the `Advanced' tab of the Account-edit dialog."
+#~ msgstr ""
+#~ "這個模組為全部通訊協定提供自動回覆的功能。設定全域適用的自動回覆，只需在這"
+#~ "模組的選項視窗設定即可；為個別好友設定自動回覆，請在好友清單中以滑鼠右鍵點"
+#~ "擊該個好友；為您的個別帳戶設定自動回覆，請在這模組的選項視窗按「進階」按"
+#~ "紐。"
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "設定自動回覆給 %s 的訊息"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "設定自動回覆訊息"
+
+#~ msgid ""
+#~ "The following message will be sent to the buddy when the buddy sends you "
+#~ "a message and autoreply is enabled."
+#~ msgstr ""
+#~ "當自動回覆功能啟動後，每當好友給您送出訊息時，下列訊息將被自動送出："
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "設定自動回覆訊息(_A)"
+
+#~ msgid "Autoreply message"
+#~ msgstr "自動回覆訊息"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "何時發出自動回覆"
+
+#~ msgid "When my account is _away"
+#~ msgstr "當我的帳號是在「離開」狀態時(_A)"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "當我的帳號是在「閒置」狀態時(_I)"
+
+#~ msgid "_Default reply"
+#~ msgstr "預設回覆訊息(_D)"
+
+#~ msgid "Status message"
+#~ msgstr "狀態訊息"
+
+#~ msgid "Autoreply with status message"
+#~ msgstr "以狀態訊息作為自動回覆"
+
+#~ msgid "Always when there is a status message"
+#~ msgstr "每當設定了狀態訊息時"
+
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "只在沒有設定自動回覆訊息時"
+
+#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
+#  NOTE: (23:41:12) elb: wing: it is the latter
+#~ msgid "Delay between autoreplies"
+#~ msgstr "自動回覆之間的相隔時間"
+
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "相隔時間下限（分）(_M)"
+
+#~ msgid "Times to send autoreplies"
+#~ msgstr "送出自動回覆訊息的次數"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "次數上限 (_X)"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr ""
+#~ "我現在不在位子上。請您留下您的訊息，當我回來的時候，我將儘快給您回覆。"
+
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "沒有提供密碼，伺服器無法為你進行認證"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "速率限制錯誤。"
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/工具/好友狀態捕捉"
+
+#~ msgid "Slovack"
+#~ msgstr "斯洛伐克文"
+
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim 網路即時通"
 
@@ -16493,9 +16698,6 @@
 #~ msgid "Offline "
 #~ msgstr "離線"
 
-#~ msgid "Default"
-#~ msgstr "預設"
-
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">來自：</span> %s\n"
 
diff -r 6ec8bae7d98a -r cb5bd3c045a9 po/zh_TW.po
--- a/po/zh_TW.po	Wed May 23 23:13:11 2007 +0000
+++ b/po/zh_TW.po	Wed May 23 23:17:50 2007 +0000
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.447 2007/05/02 06:33:40 acli Exp $
+# $InternalId: zh_TW.po,v 1.468 2007/05/21 21:53:48 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -23,7 +23,6 @@
 # - Key 暫譯「密鑰」，原因：「Key Exchange」既有譯文為「交換密鑰」
 # - Public Key 暫譯「公鑰」
 # - Private Key 暫譯「私鑰」
-# - Key Pair 暫無譯文 (TODO)
 # - Key Agreement 與 Key Exchange 似乎同義，譯「交換密鑰」
 # - Passphrase 譯「密碼」
 # (是否應參照 Mozilla 的譯法 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
@@ -50,8 +49,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
-"POT-Creation-Date: 2007-05-02 00:00-0400\n"
-"PO-Revision-Date: 2007-05-02 02:00-0400\n"
+"POT-Creation-Date: 2007-05-21 00:01-0400\n"
+"PO-Revision-Date: 2007-05-20 01:57-0400\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -86,8 +85,15 @@
 "  -n, --nologin       不自動登入\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
+#  NOTE Untranslated
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
 #  NOTE 第二、三個 %s 係目錄名稱（不是程式名）
-#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -97,18 +103,13 @@
 "%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤，請調查後改以人手完成轉移程序，"
 "並透過 http://developer.pidgin.im 回報這個錯誤。"
 
-#  NOTE Untranslated
-#: ../finch/finch.c:306
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
-#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:288 ../finch/gntblist.c:413
+#: ../finch/gntblist.c:426 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
 #: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1401
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
 #: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
@@ -123,16 +124,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:590
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:519
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1442
-#: ../pidgin/gtkblist.c:3946
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1456
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -141,49 +142,49 @@
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:427 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定："
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
-#: ../pidgin/gtkblist.c:5355
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:435
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "帳號："
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:510
 msgid "Password:"
 msgstr "密碼："
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5376
-#: ../pidgin/gtkblist.c:5739
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "別名："
 
 #. Cancel button
 #. Cancel
 #: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
-#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2137 ../finch/gntplugin.c:336
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntaccount.c:838 ../finch/gntblist.c:332 ../finch/gntblist.c:401
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:768 ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1061 ../finch/gntblist.c:2155 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
 #: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1164
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
 #: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1763
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:874
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
-#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6004
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -199,9 +200,9 @@
 #: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
 #: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5481
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
 #: ../libpurple/protocols/silc/buddy.c:468
 #: ../libpurple/protocols/silc/buddy.c:1084
 #: ../libpurple/protocols/silc/buddy.c:1189
@@ -210,16 +211,16 @@
 #: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
 #: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:991
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1880
-#: ../pidgin/gtkaccount.c:2471 ../pidgin/gtkblist.c:5795
-#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
-#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
-#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
-#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3231
+#: ../libpurple/protocols/yahoo/yahoo.c:3242 ../pidgin/gtkaccount.c:1894
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
+#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:419
 #: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
 #: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
 #: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -229,15 +230,15 @@
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:747
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1872
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1886
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -250,14 +251,14 @@
 #. Delete button
 #: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
 #: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1879 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1893 ../pidgin/gtklog.c:301
 #: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2043 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2297 ../pidgin/gtkdocklet.c:541
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2060 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2311 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "帳號清單"
 
@@ -266,15 +267,15 @@
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:331
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:436 ../finch/gntnotify.c:369
 #: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2470
-#: ../pidgin/gtkblist.c:5794 ../pidgin/gtkconv.c:1633
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkblist.c:5828 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
@@ -284,34 +285,34 @@
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2417
+#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2431
 #, 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:833 ../pidgin/gtkaccount.c:2469
+#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2483
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單？"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2521
+#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2535
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他（她）的好友清單%s%s。"
 
 #: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+#: ../pidgin/gtkaccount.c:2558 ../pidgin/gtkaccount.c:2564
 msgid "Authorize buddy?"
 msgstr "給予認證？"
 
 #: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+#: ../pidgin/gtkaccount.c:2559 ../pidgin/gtkaccount.c:2565
 msgid "Authorize"
 msgstr "給予認證"
 
 #: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2546 ../pidgin/gtkaccount.c:2552
+#: ../pidgin/gtkaccount.c:2560 ../pidgin/gtkaccount.c:2566
 msgid "Deny"
 msgstr "拒絕"
 
@@ -327,62 +328,66 @@
 msgid "You must select an account."
 msgstr "必須指定帳號"
 
-#: ../finch/gntblist.c:286
+#: ../finch/gntblist.c:284
+msgid "The selected account is not online."
+msgstr "所指定的帳號目前沒有連線。"
+
+#: ../finch/gntblist.c:288
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2837
-#: ../pidgin/gtkaccount.c:1955 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:313 ../libpurple/protocols/oscar/oscar.c:2843
+#: ../pidgin/gtkaccount.c:1969 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
-#: ../finch/gntblist.c:1193 ../libpurple/protocols/msn/msn.c:1351
+#: ../finch/gntblist.c:316 ../finch/gntblist.c:393 ../finch/gntblist.c:1209
+#: ../libpurple/protocols/msn/msn.c:1359
 #: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+#: ../finch/gntblist.c:319 ../finch/gntblist.c:396
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1243
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:323 ../finch/gntblist.c:384 ../finch/gntblist.c:1259
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2947 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
 #: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
+#: ../finch/gntblist.c:329 ../finch/gntblist.c:817
 #: ../libpurple/protocols/silc/buddy.c:737
 #: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/buddy.c:1080
 #: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5309
+#: ../libpurple/protocols/yahoo/yahoo.c:3144 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:329
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:356 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
-#: ../libpurple/protocols/msn/msn.c:1524 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../finch/gntblist.c:390 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1532 ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1624
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -390,168 +395,185 @@
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5685
+#: ../finch/gntblist.c:399 ../finch/gntblist.c:819 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:398
+#: ../finch/gntblist.c:400
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節，請用快顯選單。"
 
-#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+#: ../finch/gntblist.c:413 ../finch/gntblist.c:426
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:414
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:427
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實：是「加入」抑或「新增」?
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
-#: ../libpurple/protocols/sametime/sametime.c:5390
-#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5791
+#: ../finch/gntblist.c:434 ../finch/gntblist.c:821
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5825
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:434
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:767
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:768 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:778
+#: ../finch/gntblist.c:784
 msgid "Auto-join"
 msgstr "自動加入"
 
 # XXX 還是「修改選項」？
-#: ../finch/gntblist.c:787
+#: ../finch/gntblist.c:793
 msgid "Edit Settings"
 msgstr "修改設定"
 
-#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+# XXX 20070518
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "資訊"
+
+#: ../finch/gntblist.c:831 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "讀取中..."
+
+#: ../finch/gntblist.c:864 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:855
+#: ../finch/gntblist.c:868
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:635
-#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+#: ../finch/gntblist.c:875 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:866
+#: ../finch/gntblist.c:879
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:947
+#: ../finch/gntblist.c:960
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:949 ../finch/gntblist.c:1193
+#: ../finch/gntblist.c:962 ../finch/gntblist.c:1209
 msgid "Rename"
 msgstr "重命名"
 
+#: ../finch/gntblist.c:962
+msgid "Set Alias"
+msgstr "設定別名"
+
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:950
+#: ../finch/gntblist.c:963
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱，請輸入空白字串。"
 
-#: ../finch/gntblist.c:1026
+#: ../finch/gntblist.c:1039
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1034
+#: ../finch/gntblist.c:1047
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1052
 #, 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:1042
+#: ../finch/gntblist.c:1055
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1195 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
+#: ../finch/gntblist.c:1060 ../finch/gntblist.c:1211 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
 #: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1169 ../finch/gntblist.c:2214 ../finch/gntprefs.c:239
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4188
+#: ../finch/gntblist.c:1185 ../finch/gntblist.c:2232 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1200
+#: ../finch/gntblist.c:1216
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1205
+#: ../finch/gntblist.c:1221
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1238 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1254 ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
 #: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
 #: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1564
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/jabber/jabber.c:815
-#: ../libpurple/protocols/msn/msn.c:1359 ../libpurple/protocols/msn/msn.c:1527
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1367 ../libpurple/protocols/msn/msn.c:1535
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2971
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1258 ../finch/gntprefs.c:242
+#: ../finch/gntblist.c:1274 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
 #: ../libpurple/protocols/jabber/buddy.c:643
 #: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:524 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2902
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2991
-#: ../pidgin/gtkblist.c:3380 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/yahoo/yahoo.c:2898
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1809
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1347
+#: ../finch/gntblist.c:1363
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -560,12 +582,12 @@
 "上線：%d 人\n"
 "總數：%d 人"
 
-#: ../finch/gntblist.c:1356
+#: ../finch/gntblist.c:1372
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號：%s (%s)"
 
-#: ../finch/gntblist.c:1368
+#: ../finch/gntblist.c:1384
 #, c-format
 msgid ""
 "\n"
@@ -575,52 +597,52 @@
 "<b>最後見到：</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1632 ../pidgin/gtkdocklet.c:489
+#: ../finch/gntblist.c:1649 ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1639 ../pidgin/gtkdocklet.c:490
+#: ../finch/gntblist.c:1656 ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2011 ../finch/gntplugin.c:224 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2028 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2118 ../pidgin/gtkdialogs.c:703
-#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:706
+#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:711
+#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2131 ../pidgin/gtkdialogs.c:716
+#: ../finch/gntblist.c:2149 ../pidgin/gtkdialogs.c:719
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2133 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2151 ../pidgin/gtkdialogs.c:721
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../finch/gntblist.c:2136 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
+#: ../finch/gntblist.c:2154 ../finch/gntconn.c:48 ../finch/gntnotify.c:77
 #: ../libpurple/account.c:983 ../libpurple/account.c:1233
 #: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
 #: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6003
 #: ../libpurple/protocols/silc/buddy.c:467
 #: ../libpurple/protocols/silc/buddy.c:1188
 #: ../libpurple/protocols/silc/chat.c:425
@@ -629,37 +651,36 @@
 #: ../libpurple/protocols/silc/ops.c:1297
 #: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:990
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
-#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3945
-#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3241 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2156 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2174 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2162
+#: ../finch/gntblist.c:2180
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-# FIXME 譯文有待改進 - 20061028
-#: ../finch/gntblist.c:2166
-msgid "Toggle offline buddies"
-msgstr "顯示／不顯示離線好友"
-
-#: ../finch/gntblist.c:2172
+#: ../finch/gntblist.c:2184
+msgid "Show offline buddies"
+msgstr "顯示離線好友"
+
+#: ../finch/gntblist.c:2190
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2176
+#: ../finch/gntblist.c:2194
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2180
+#: ../finch/gntblist.c:2198
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
@@ -683,56 +704,56 @@
 "%s"
 
 #: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3942
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3961
 msgid "Connection Error"
 msgstr "連線錯誤"
 
 #: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3947
+#: ../pidgin/gtkblist.c:3966
 msgid "Connect"
 msgstr "連線"
 
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤：輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗，原因不明。"
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效，在即時訊息中無效。"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效，在聊天室內無效。"
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
 # NOTE 沒辦法，用不到着重號，又沒法改換字型……
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "尚未支援指令，訊息因此沒有被送出。"
 
 # XXX 這是什麼？
-#: ../finch/gntconv.c:217
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:240
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -741,24 +762,48 @@
 "\n"
 "%s 正在輸入..."
 
-#: ../finch/gntconv.c:390
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "您離開了聊天室。"
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "傳送到"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "交談"
+
+#: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "清空交談內容"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "顯示時間戳記"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "加入好友狀態捕捉..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "使用者列表：\n"
 
-#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有：version"
 
-#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "沒有這個指令（可在這裏使用）"
 
-#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -766,57 +811,60 @@
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
-#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;：將指定的訊息當成一般訊息正常送出，而非當為指令處理。"
 
-#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;：模仿IRC，執行一個動作。"
 
-#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;：向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear：清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;：顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:710
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users：顯示這個聊天室內的使用者。"
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins：顯示「模組」視窗"
 
-#: ../finch/gntconv.c:713
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist：顯示好友清單。"
 
-#: ../finch/gntconv.c:716
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts：顯示帳號清單。"
 
-#: ../finch/gntconv.c:719
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin：顯示除錯視窗"
 
-#: ../finch/gntconv.c:722
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs：顯示「偏好設定」視窗"
 
-# FIXME - 20061028
-#: ../finch/gntconv.c:725
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses：「已儲存的狀態」視窗"
-
-#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+msgstr "statuses：「狀態清單」視窗"
+
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:693
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -824,18 +872,18 @@
 #. * 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:232 ../pidgin/gtkdebug.c:769
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:752
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "過濾器："
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:761
 msgid "Pause"
 msgstr "暫停"
 
-#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
-msgid "Timestamps"
-msgstr "時間戳記"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -874,18 +922,18 @@
 #: ../libpurple/protocols/jabber/buddy.c:634
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:523
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2650
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:3767
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3035
-#: ../pidgin/gtkblist.c:3048 ../pidgin/gtkblist.c:3050
+#: ../libpurple/protocols/yahoo/yahoo.c:3049 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
 #: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "狀態"
@@ -903,10 +951,10 @@
 msgstr "中止"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2444 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2458 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "關閉"
 
@@ -937,75 +985,88 @@
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "電子郵件"
 
 # XXX 要覆查
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "您收到郵件！"
 
-# FIXME check - 20061025
-#  NOTE Jabber 術語，見上
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+# FIXME 原文一詞兩義，根本無法翻譯
+#  NOTE gntnotify 字義為「發信人」
+#  NOTE Jabber 術語字義見「Both」條
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "已認證對方"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "主題"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "繼續"
 
 # XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別……
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:833
 msgid "Info"
 msgstr "資訊"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "即時訊息"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "加入"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "邀請"
 
 # TODO 要覆查 - 20061028
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:111
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "錯誤"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "模組載入失敗"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "模組卸載失敗"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1016,30 +1077,30 @@
 "Filename: %s\n"
 msgstr ""
 "名稱：%s\n"
-"板本：%s\n"
+"版本：%s\n"
 "簡介：%s\n"
 "作者：%s\n"
 "網站：%s\n"
 "檔名：%s\n"
 
-#: ../finch/gntplugin.c:164
+#: ../finch/gntplugin.c:182
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前，請先載入模組。"
 
-#: ../finch/gntplugin.c:208
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "此模組並無選項可供設定。"
 
-#: ../finch/gntplugin.c:229
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "您可透過以下列表載入或卸載模組。"
 
-#: ../finch/gntplugin.c:272
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "設定模組"
 
-#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1953
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -1061,8 +1122,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5403
-#: ../pidgin/gtkblist.c:5719
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "帳號："
 
@@ -1213,68 +1274,68 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題！"
 
-#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "以鍵盤的使用為基準"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1814
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
 #: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "從不"
 
-#: ../finch/gntprefs.c:170
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntprefs.c:177
-msgid "Show Timestamps"
-msgstr "顯示時間戳記"
-
-#: ../finch/gntprefs.c:178
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "通知您的好友您正在發訊息給他們"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "日誌格式"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "記錄所有即時訊息內容"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "記錄所有聊天內容"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "記錄所有的狀態改變"
 
 #. Conversations
-#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntrequest.c:530
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
 #: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
 #: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "開啟檔案..."
@@ -1315,31 +1376,31 @@
 #: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
 #: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
 #: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5463
-#: ../libpurple/protocols/oscar/oscar.c:5681
-#: ../libpurple/protocols/oscar/oscar.c:5695
-#: ../libpurple/protocols/oscar/oscar.c:5711
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5464
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/oscar/oscar.c:5696
+#: ../libpurple/protocols/oscar/oscar.c:5712
+#: ../libpurple/protocols/oscar/oscar.c:5719
+#: ../libpurple/protocols/oscar/oscar.c:5726
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
 #: ../libpurple/protocols/sametime/sametime.c:3377
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../libpurple/protocols/yahoo/yahoo.c:3477
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "訊息"
@@ -1351,7 +1412,7 @@
 
 #: ../finch/gntstatus.c:294
 msgid "Invalid title"
-msgstr "無效的標題"
+msgstr "標題無效"
 
 #: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
@@ -1409,66 +1470,66 @@
 "X, if possible."
 msgstr "當 gnt 的剪則薄內容有所變更時，儘可能把新的內容滙出至 X 視窗系統。"
 
-#: ../finch/plugins/gntgf.c:223
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s 登入"
 
-#: ../finch/plugins/gntgf.c:230
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s 登出"
 
-#: ../finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s 送出一個訊息給您"
 
-#: ../finch/plugins/gntgf.c:257
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s 在 %s 提到您的暱稱"
 
-#: ../finch/plugins/gntgf.c:259
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s 在 %s 送出一個訊息給您。"
 
-#: ../finch/plugins/gntgf.c:297
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "好友登入／登出"
 
-#: ../finch/plugins/gntgf.c:298
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "您收到即時訊息"
 
-#: ../finch/plugins/gntgf.c:299
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "有人在聊天室談話"
 
-#: ../finch/plugins/gntgf.c:300
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "有人在聊天室中提到您的名字"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麵包一樣
-#: ../finch/plugins/gntgf.c:328
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "以下情況下使用多士爐式彈出通知"
 
-#: ../finch/plugins/gntgf.c:343
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "也要「嗶」聲！"
 
-#: ../finch/plugins/gntgf.c:349
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "給終端機視窗設定「URGENT」（緊急資訊）提示"
 
-#: ../finch/plugins/gntgf.c:369
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
 #  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麪包一樣
-#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "多士爐式彈出通知模組"
 
@@ -1550,7 +1611,7 @@
 msgstr "找不到 %s 的協定模組"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
@@ -1598,8 +1659,8 @@
 # XXX - Ambrose 20061123
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1399
-#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
@@ -1607,7 +1668,7 @@
 
 #: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
 #: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5199 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "好友"
@@ -1631,7 +1692,7 @@
 msgstr "+++ %s 登出"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1654,40 +1715,40 @@
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
-#: ../libpurple/conversation.c:1160
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
@@ -1763,7 +1824,7 @@
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:420
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1863,31 +1924,31 @@
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
-#: ../libpurple/ft.c:1090
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1095
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: ../libpurple/ft.c:1153
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1158
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了檔案傳輸"
 
-#: ../libpurple/ft.c:1215
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "傳送檔案到 %s 失敗。"
 
-#: ../libpurple/ft.c:1217
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "自 %s 傳送檔案失敗。"
@@ -2189,13 +2250,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2225
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/oscar/oscar.c:5850
-#: ../libpurple/protocols/oscar/oscar.c:6076
-#: ../libpurple/protocols/oscar/oscar.c:6146 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:5796
+#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6147 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -2253,8 +2314,8 @@
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1600
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Notes"
 msgstr "備註"
 
@@ -2693,7 +2754,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:161
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:314
 #: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
@@ -2703,7 +2764,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:162
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:530 ../libpurple/protocols/msn/msn.c:540
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:315
 #: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
@@ -2747,9 +2808,9 @@
 #: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"對方一開始與您交談，就立即打開交談視窗。適用於 AIM、ICQ、Jabber、Sametime 及 "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"對方一開始與您交談，就立即打開交談視窗。適用於 AIM、ICQ、XMPP、Sametime 及 "
 "Yahoo。"
 
 #: ../libpurple/plugins/psychic.c:72
@@ -2958,17 +3019,17 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4490
-#: ../libpurple/protocols/oscar/oscar.c:5541
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:5542
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3384
-#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../libpurple/protocols/yahoo/yahoo.c:3453 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1823
 #: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "離開"
@@ -2990,46 +3051,46 @@
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:475
-#: ../libpurple/protocols/bonjour/bonjour.c:482
-#: ../libpurple/protocols/bonjour/bonjour.c:540
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "連絡人"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:579
+#: ../libpurple/protocols/bonjour/bonjour.c:589
 #: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "主機名稱"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:593
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:820
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:586
+#: ../libpurple/protocols/bonjour/bonjour.c:596
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:825
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/bonjour/bonjour.c:599
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
 #: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:592
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:595
-msgid "Jabber Account"
-msgstr "Jabber 帳號"
+#: ../libpurple/protocols/bonjour/bonjour.c:605
+msgid "XMPP Account"
+msgstr "XMPP 帳號"
 
 # NOTE 這是通訊協定名稱，不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3135,8 +3196,8 @@
 msgstr "註冊成功！"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:799
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "密碼"
 
@@ -3162,9 +3223,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:835
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3789
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
@@ -3173,8 +3234,8 @@
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1529
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../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
@@ -3187,14 +3248,14 @@
 msgstr "男性或女性"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "男"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3254,37 +3315,37 @@
 msgstr "新增到聊天室..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/buddy.c:1428
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5513
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5514
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3035 ../pidgin/gtkblist.c:3359
-#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "離線"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "上線"
 
 #: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2649
-#: ../libpurple/protocols/oscar/oscar.c:3680
+#: ../libpurple/protocols/oscar/oscar.c:2655
+#: ../libpurple/protocols/oscar/oscar.c:3686
 msgid "UIN"
 msgstr "帳號"
 
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1560
-#: ../libpurple/protocols/jabber/buddy.c:1736
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "名"
@@ -3294,7 +3355,7 @@
 msgstr "出生年"
 
 #: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3898
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
@@ -3339,7 +3400,7 @@
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:539
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "封鎖"
 
@@ -3430,14 +3491,14 @@
 msgstr "未知的指令：%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為：%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "沒有設定主題"
@@ -3473,7 +3534,7 @@
 msgstr "%s 的是日訊息"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
@@ -3496,34 +3557,34 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1673
-#: ../libpurple/protocols/yahoo/yahoo.c:2749
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "連線中"
 
 # XXX 暫譯
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:595
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
@@ -3531,28 +3592,28 @@
 # NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章）
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:761
+#: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/irc/irc.c:778
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
@@ -3568,45 +3629,44 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:901
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:902
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:314
-#: ../libpurple/protocols/jabber/libxmpp.c:194
-#: ../libpurple/protocols/msn/msn.c:2122
-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2130
+#: ../libpurple/protocols/oscar/oscar.c:6581
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5712
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/oscar/oscar.c:6580
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:307
-#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
@@ -3616,7 +3676,7 @@
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:308
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "姓名"
@@ -3625,232 +3685,232 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:178
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: ../libpurple/protocols/irc/msgs.c:189
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: ../libpurple/protocols/irc/msgs.c:190
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "被禁止"
 
-#: ../libpurple/protocols/irc/msgs.c:207
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "無法禁止 %s：禁止清單已滿"
 
-#: ../libpurple/protocols/irc/msgs.c:292
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:293
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:294
-#: ../libpurple/protocols/oscar/oscar.c:3681
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3687
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:320
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "所在頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "閒置時間"
 
-#: ../libpurple/protocols/irc/msgs.c:328
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "上線自"
 
 #  XXX 其實譯得不太對，可以改進一點
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>描述：</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:332
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "光宗耀祖"
 
 # NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為：%s"
 
 # NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:410
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 已經把主題清除。"
 
-#: ../libpurple/protocols/irc/msgs.c:418
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為：%s"
 
-#: ../libpurple/protocols/irc/msgs.c:436
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: ../libpurple/protocols/irc/msgs.c:437
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 伺服器收到了個它不明白的訊息。"
 
-#: ../libpurple/protocols/irc/msgs.c:458
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者：%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:555
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:556
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為："
 
-#: ../libpurple/protocols/irc/msgs.c:567
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:578
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:581
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: ../libpurple/protocols/irc/msgs.c:586
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "無法送出"
 
-#: ../libpurple/protocols/irc/msgs.c:662
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: ../libpurple/protocols/irc/msgs.c:663
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:775
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出：(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:780 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:888 ../libpurple/protocols/irc/msgs.c:889
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
-msgstr "無效的暱稱"
-
-#: ../libpurple/protocols/irc/msgs.c:890
+msgstr "暱稱無效"
+
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的暱稱，暱稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:895
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱，名稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:934
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:955
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "錯誤：來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:999
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲：%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1080
-#, c-format
-msgid "Cannot join %s:"
-msgstr "無法加入 %s："
-
-#: ../libpurple/protocols/irc/msgs.c:1081
+#: ../libpurple/protocols/irc/msgs.c:1097
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "無法加入 %s：必須註冊。"
+
+#: ../libpurple/protocols/irc/msgs.c:1098
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#: ../libpurple/protocols/irc/msgs.c:1115
+#: ../libpurple/protocols/irc/msgs.c:1132
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該個暱稱或頻道。"
 
-#: ../libpurple/protocols/irc/msgs.c:1127
+#: ../libpurple/protocols/irc/msgs.c:1144
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要執行的動作&gt;：執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [訊息]：設定一個離開訊息，或者在離開時不指定任何訊息。"
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv：送出一個指令到 chanserv"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3858,7 +3918,7 @@
 "deop &lt;暱稱1&gt; [暱稱2] ...：移除某個人的「頻道管理者」權限。您必須具有"
 "「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3867,7 +3927,7 @@
 "devoice &lt;暱稱1&gt; [暱稱2] ...：移除某個人的「發言」權限。禁止某些人在頻道"
 "中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3875,7 +3935,7 @@
 "invite &lt暱稱&gt; [聊天室]：邀請某個人來加入您所指定的頻道，或是目前您所在的"
 "頻道。"
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3883,7 +3943,7 @@
 "j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]：以指定的密鑰（如有給"
 "予並有需要）加入所指定的聊天室。"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3891,7 +3951,7 @@
 "join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]：以指定的密鑰（如"
 "有給予並有需要）加入所指定的聊天室。"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3899,7 +3959,7 @@
 "kick &lt;暱稱&gt; [訊息]：將某個使用者踢出頻道。您必需具有「頻道管理者」權限"
 "才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3907,22 +3967,22 @@
 "list：列出目前在網絡上的聊天室清單。<i>請注意，有些伺服器會在您執行了這個動作"
 "之後，強行中止您的連線。</i>"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要執行的動作&gt;：執行一個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv：送出一個指令到 memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;暱稱|頻道&gt;：設定或解除頻道╱使用者模式。"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3930,20 +3990,20 @@
 "msg &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者（避免傳送到公眾"
 "頻道中）。"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]：列出目前在頻道中的使用者清單。"
 
-#: ../libpurple/protocols/irc/parse.c:136
-#: ../libpurple/protocols/jabber/jabber.c:1800
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱。"
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv：送出一個指令到 nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3951,7 +4011,7 @@
 "op &lt;暱稱&gt; [暱稱] ...：賦與某個使用者「頻道管理者」權限。您必須具有「頻"
 "道管理者」權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3959,11 +4019,11 @@
 "operwall &lt;訊息&gt;：如果您不知道這是幹什麼用的，您可能沒有辦法使用這個指"
 "令。"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv：送出一個指令到 operserv"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3971,7 +4031,7 @@
 "part [頻道] [訊息]：離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊"
 "息。"
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3979,7 +4039,7 @@
 "ping [暱稱]：查詢某一個使用者的網路回應速度（或在沒有指定使用者時，查詢伺服器"
 "的回應速度）。"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3987,16 +4047,16 @@
 "query &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者（避免發送到公"
 "眾頻道）。"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]：自伺服器離線，並送出指定的訊息。"
 
 # XXX 暫譯
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]：送出一個 RAW 指令到伺服器。"
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4004,23 +4064,23 @@
 "remove &lt;暱稱&gt; [訊息]：將某個使用者踢出頻道。您必須具有「頻道管理者」的"
 "權限才能夠執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time：顯示 IRC 伺服器所在地之本地時間。"
 
-#: ../libpurple/protocols/irc/parse.c:148
-msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [新主題]：檢視或修改頻道主題"
-
 #: ../libpurple/protocols/irc/parse.c:149
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;：設定或解除使用者模式。"
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [新主題]：檢視或修改頻道主題"
 
 #: ../libpurple/protocols/irc/parse.c:150
-msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [暱稱]：送出 CTCP VERSION 要求給使用者"
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;：設定或解除使用者模式。"
 
 #: ../libpurple/protocols/irc/parse.c:151
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [暱稱]：給使用者送出 CTCP VERSION 要求"
+
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4028,7 +4088,7 @@
 "voice &lt;暱稱&gt; [暱稱] ...：賦與使用者的「發言」權限。您必須具有「頻道管理"
 "者」的權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4036,29 +4096,29 @@
 "wallops &lt;message&gt;：如果您不知道這是幹什麼用的，您可能就沒有辦法使用它"
 "了。"
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [伺服器名稱] &lt;暱稱&gt;：取得使用者資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;暱稱&gt;：取得已離線的使用者的資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:448
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時：%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:560
-#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../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."
@@ -4073,46 +4133,52 @@
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
 #: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:295
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:481
-#: ../libpurple/protocols/jabber/auth.c:564
-#: ../libpurple/protocols/jabber/auth.c:565
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:482
-#: ../libpurple/protocols/jabber/auth.c:566
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+msgid "Server does not use any supported authentication method"
+msgstr "伺服器並不提供任何一種被支援的認證方式"
+
+#. This should never happen!
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:714
+#: ../libpurple/protocols/jabber/auth.c:848
+#: ../libpurple/protocols/jabber/auth.c:873
+#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "伺服器送來了無效的回應。"
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
 
-#: ../libpurple/protocols/jabber/auth.c:306
-#: ../libpurple/protocols/jabber/auth.c:492
-#: ../libpurple/protocols/jabber/auth.c:576
-msgid "Server does not use any supported authentication method"
-msgstr "伺服器並不提供任何一種被支援的認證方式"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:434
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:708
-#: ../libpurple/protocols/jabber/auth.c:842
-#: ../libpurple/protocols/jabber/auth.c:867
-#: ../libpurple/protocols/jabber/auth.c:886
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "無效的伺服器回應。"
-
 # XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:735
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:817
+#: ../libpurple/protocols/jabber/auth.c:823
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
@@ -4135,7 +4201,7 @@
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
@@ -4179,7 +4245,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:902
 #: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1566
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4203,22 +4269,22 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/oscar/oscar.c:3730
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3736
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3046
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "描述"
 
 #: ../libpurple/protocols/jabber/buddy.c:578
 #: ../libpurple/protocols/jabber/buddy.c:579
-msgid "Edit Jabber vCard"
-msgstr "編輯 Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "編輯 XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
@@ -4243,16 +4309,16 @@
 # NOTE 用以表示在多處地方同時登入了的情形下，目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:197
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "優先次序"
 
@@ -4264,9 +4330,9 @@
 msgstr "英文別名"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:830
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3775
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
@@ -4285,20 +4351,20 @@
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1346
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1358
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -4307,43 +4373,43 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1374
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1407
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5717
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5718
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:1558
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1562
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3692
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3698
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1594
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1669
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4351,69 +4417,69 @@
 "請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1689
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1690
+#: ../libpurple/protocols/jabber/buddy.c:1715
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1724
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令：%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1731
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "填入一個或多個欄位，以搜尋Jabber使用者。"
-
-#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
+
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/oscar/oscar.c:3701
+#: ../libpurple/protocols/oscar/oscar.c:3710
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:1760
-#: ../libpurple/protocols/jabber/buddy.c:1761
-msgid "Search for Jabber users"
-msgstr "搜尋Jabber使用者"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:145
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "搜尋"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:1777
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1795
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5224
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R)："
@@ -4426,88 +4492,88 @@
 msgid "_Handle:"
 msgstr "暱稱(_H)："
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是一個有效的聊天室名稱"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "聊天室名稱無效"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是一個有效的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的暱稱"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "暱稱無效"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "設定錯誤"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "無法設定"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
 # XXX 暫譯，譯文有問題，要改善
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "註冊錯誤"
 
 # XXX 暫譯
 # NOTE 據 faceprint (模組作者) 稱，MUC 是一種新的聊天室協定，
 # NOTE 較舊式的「Group Chat」有更多功能
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改暱稱"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "選擇查詢的會議伺服器"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
@@ -4531,174 +4597,178 @@
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:565
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Jabber 帳號無效"
-
-#: ../libpurple/protocols/jabber/jabber.c:636
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
+msgid "Invalid XMPP ID"
+msgstr "XMPP 帳號無效"
+
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "XMPP 帳號無效，域名是必須設定的。"
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
-#: ../libpurple/protocols/jabber/jabber.c:639
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:645
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:648
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:763
-#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:840
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
 msgid "State"
 msgstr "省／州"
 
-#: ../libpurple/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:850
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:860
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊，請填寫下列資料："
 
-#: ../libpurple/protocols/jabber/jabber.c:871
-#: ../libpurple/protocols/jabber/jabber.c:872
-msgid "Register New Jabber Account"
-msgstr "註冊新的 Jabber 帳戶"
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
+msgid "Register New XMPP Account"
+msgstr "註冊新的 XMPP 帳戶"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1504
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1489
-#: ../libpurple/protocols/jabber/jabber.c:1530
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5511
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Not Authorized"
 msgstr "未認證"
 
-# NOTE 這些奇怪術語（至「Subscription」條）的解釋由 faceprint 提供
+# NOTE 這些奇怪 Jabber 術語（至「Subscription」條）的解釋由 faceprint 提供
 # NOTE LSchiere2 的補充如下：
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "已互相認證"
 
-#  NOTE Jabber 術語，見上
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "已認證對方（但仍等待對方認證您）"
 
-#  NOTE Jabber 術語，見上
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "已獲對方認證"
 
-#  NOTE Jabber 術語，見上
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "無（但正等待對方認證您）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "無"
 
-#  NOTE Jabber 術語，見上
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "舊密碼（再次確認）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "修改 Jabber 密碼"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "修改 XMPP 密碼"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6298
 #: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1386
-#: ../libpurple/protocols/oscar/oscar.c:6308
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6309
 #: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1391
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4706,51 +4776,52 @@
 #  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>，意思正常（表示權限不夠）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
-msgid "Malformed Jabber ID"
-msgstr "畸型的 Jabber ID"
+# FIXME 譯文聽來好像有點怪 20070518 acli
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "畸型的 XMPP 帳號"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>，表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件（例如訊息中含有禁字），以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4758,78 +4829,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>，表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>，表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」（認證）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1521
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -4839,181 +4910,181 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種，即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯，譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯，譯文有待改進。不過好像真的有人這樣寫，大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種，即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1677
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1682
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1708
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1761
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1792
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1796
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]：離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register：加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]：禁止某使用者進入聊天室"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5022,7 +5093,7 @@
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1834
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5030,19 +5101,19 @@
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]：加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]：將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使用者"
@@ -5059,54 +5130,64 @@
 #. *  description
 #: ../libpurple/protocols/jabber/libxmpp.c:166
 #: ../libpurple/protocols/jabber/libxmpp.c:168
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 協定模組"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:200
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP 協定模組"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195
+msgid "Domain"
+msgstr "域名"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文，在未經加密的串流上進行認證"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "連線埠"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:215
 #: ../libpurple/protocols/silc/silc.c:1866
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s 已經離開這個交談。"
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為：%s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題：%s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s：%s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber 訊息錯誤"
-
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP 訊息錯誤"
+
+#: ../libpurple/protocols/jabber/message.c:350
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
@@ -5263,7 +5344,7 @@
 
 #: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "嚐試將一個使用者加入不存在的群組"
+msgstr "嘗試將一個使用者加入不存在的群組"
 
 #: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
@@ -5381,7 +5462,7 @@
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5420,42 +5501,42 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤：%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "您剛送出了一個呼叫！"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱，
 # NOTE 即使和使用者的帳號毫無關係，似乎也是有效的
 # XXX 這看來是一個鈙述句，事實上是對使用者發出的請求／問題
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:281
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼？"
 
-#: ../libpurple/protocols/msn/msn.c:314
+#: ../libpurple/protocols/msn/msn.c:323
 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?"
@@ -5463,317 +5544,317 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動"
 "裝置上呢？"
 
-#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:365
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "你在他（她）的好友清單裏"
 
-#: ../libpurple/protocols/msn/msn.c:559 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3491
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3487
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:563 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3490
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:567
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3502
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:571
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3512
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:599
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:608
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "設定行動電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:618
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉行動裝置..."
 
-#: ../libpurple/protocols/msn/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:633
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:657
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:667
+#: ../libpurple/protocols/msn/msn.c:660
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:730
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1450 ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1458 ../libpurple/protocols/msn/msn.c:1803
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1521 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1529 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1528
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1530
+#: ../libpurple/protocols/msn/msn.c:1538
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1531
+#: ../libpurple/protocols/msn/msn.c:1539
 #: ../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
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1544 ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1749
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1542 ../libpurple/protocols/msn/msn.c:1662
-#: ../libpurple/protocols/msn/msn.c:1668 ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/msn/msn.c:1683 ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1550 ../libpurple/protocols/msn/msn.c:1670
+#: ../libpurple/protocols/msn/msn.c:1676 ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1691 ../libpurple/protocols/msn/msn.c:1698
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1567
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1561
+#: ../libpurple/protocols/msn/msn.c:1569
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1562
+#: ../libpurple/protocols/msn/msn.c:1570
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1563
+#: ../libpurple/protocols/msn/msn.c:1571
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1564
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1565
+#: ../libpurple/protocols/msn/msn.c:1573
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1566
+#: ../libpurple/protocols/msn/msn.c:1574
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1569 ../libpurple/protocols/msn/msn.c:1750
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1577 ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1764
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1598
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1593
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:3780
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1602
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1625
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/oscar/oscar.c:3801
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1623
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1636
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1699 ../libpurple/protocols/msn/msn.c:1705
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1707 ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1720 ../libpurple/protocols/msn/msn.c:1727
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1772
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1783
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msn/msn.c:1804
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1805
 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 "
@@ -5782,14 +5863,14 @@
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在；亦有可能使"
 "用者存在，但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -5804,19 +5885,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2095 ../libpurple/protocols/msn/msn.c:2097
+#: ../libpurple/protocols/msn/msn.c:2103 ../libpurple/protocols/msn/msn.c:2105
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2131
+#: ../libpurple/protocols/msn/msn.c:2139
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2136
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2144
+#: ../libpurple/protocols/msn/msn.c:2152
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -5892,17 +5973,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1321
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5957,7 +6038,7 @@
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3448
+#: ../libpurple/protocols/oscar/oscar.c:3454
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
@@ -6067,130 +6148,130 @@
 msgid "The screen name specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "沒有提供所需的參數"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "無法寫入網路"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "無法由網路讀取"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "和伺服器溝通時發生錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "找不到該會議"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "該會議並不存在"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
 #  XXX 這個太奇怪了 (^^;)
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "不支援"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "密碼已過期"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "密碼錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "找不到該使用者"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "伺服器無法存取目錄"
 
 #  XXX 要覆查譯文
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系統管理員不容許這個動作"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "暫時無法使用伺服器；請稍後重試"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "無法在同一資料夾內新增同一好友兩次"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "無法新增您自己至好友清單"
 
 #  TODO 不知「Master archive」有無正式譯文，也不知應如何譯
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "錯誤的帳號或密碼"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "無法辦識您所輸入的帳號內的主機名稱"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "您的帳號已被停用，因為輸入了太多無效的密碼"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您不能在同一交談內新增同一個人兩次"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您的好友人數已達上限"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "您輸入了無效的帳號"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "更新目錄途中發生錯誤"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "協定版本不相容"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "該使用者拒絕了您"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "試用版最多只容許十個使用者同時登入"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "該使用者可能是離線，或者您已被他（她）拒絕"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤：0x%X"
@@ -6419,8 +6500,8 @@
 msgstr "伺服器通訊埠"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2294
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/yahoo.c:2290
+#: ../libpurple/protocols/yahoo/yahoo.c:2449
 #: ../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
@@ -6428,8 +6509,8 @@
 msgstr "伺服器關閉連線。"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2288
-#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2284
+#: ../libpurple/protocols/yahoo/yahoo.c:2443 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6487,8 +6568,8 @@
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4098
-#: ../libpurple/protocols/zephyr/zephyr.c:2996
+#: ../libpurple/protocols/yahoo/yahoo.c:4094
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
 
@@ -6623,7 +6704,7 @@
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 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 "
@@ -6634,7 +6715,7 @@
 "編碼；如果您知道那是什麼編碼，請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
 "欄位指定。）"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6644,53 +6725,54 @@
 "用有問題的用戶端程式。）"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2346
-#: ../pidgin/gtkutils.c:2368
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "遊戲"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+# NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
-msgstr "應用程式使用者"
-
-#: ../libpurple/protocols/oscar/oscar.c:654
+msgstr "AP 使用者"
+
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6701,100 +6783,100 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "照相機"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5689
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5690
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5725
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5710
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5711
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2896 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "上線"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3694
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2840
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2846
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6803,7 +6885,7 @@
 "無法連線至認證伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6812,20 +6894,20 @@
 "無法連線到 BOS 伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "連線已建立，並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6835,30 +6917,31 @@
 "無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須以英文字母起始，"
 "並只含英文字母、數字及空白；或者只由數字組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1936
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1932
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1954
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 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."
@@ -6866,44 +6949,44 @@
 "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線，那麼您的等待時間將會更加的延長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2224
-#: ../libpurple/protocols/oscar/oscar.c:2271
-#: ../libpurple/protocols/oscar/oscar.c:5794
-#: ../libpurple/protocols/oscar/oscar.c:6075 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:6076 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1472
-#: ../libpurple/protocols/oscar/oscar.c:1515
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6912,53 +6995,53 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1475
-#: ../libpurple/protocols/oscar/oscar.c:1518
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1604
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1633
+#: ../libpurple/protocols/oscar/oscar.c:1639
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:1695
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2194
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2222
+#: ../libpurple/protocols/oscar/oscar.c:2228
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2223
+#: ../libpurple/protocols/oscar/oscar.c:2229
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: ../libpurple/protocols/oscar/oscar.c:2263
-#: ../libpurple/protocols/oscar/oscar.c:2270
-#: ../libpurple/protocols/oscar/oscar.c:2397
-#: ../libpurple/protocols/oscar/oscar.c:5192
-#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2269
+#: ../libpurple/protocols/oscar/oscar.c:2275
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2397
+#: ../libpurple/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6968,17 +7051,17 @@
 "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2398
+#: ../libpurple/protocols/oscar/oscar.c:2404
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6991,7 +7074,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7004,7 +7087,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7017,38 +7100,38 @@
 "訊息為：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2450
+#: ../libpurple/protocols/oscar/oscar.c:2456
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2462
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他（她）加入到您的好友名單中嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:2461 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2468
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2546
+#: ../libpurple/protocols/oscar/oscar.c:2552
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2555
+#: ../libpurple/protocols/oscar/oscar.c:2561
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們太大了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2564
+#: ../libpurple/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7058,21 +7141,21 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
-#: ../libpurple/protocols/oscar/oscar.c:2573
+#: ../libpurple/protocols/oscar/oscar.c:2579
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2582
+#: ../libpurple/protocols/oscar/oscar.c:2588
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2591
+#: ../libpurple/protocols/oscar/oscar.c:2597
 #, 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."
@@ -7080,70 +7163,70 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2746
+#: ../libpurple/protocols/oscar/oscar.c:2752
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2746
-#: ../libpurple/protocols/oscar/oscar.c:2751
-#: ../libpurple/protocols/oscar/oscar.c:2813
-#: ../libpurple/protocols/oscar/oscar.c:2817
+#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2823
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2749
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s："
 
-#: ../libpurple/protocols/oscar/oscar.c:2813
+#: ../libpurple/protocols/oscar/oscar.c:2819
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊：%s"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2816
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊："
 
-#: ../libpurple/protocols/oscar/oscar.c:2845
+#: ../libpurple/protocols/oscar/oscar.c:2851
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順？
-#: ../libpurple/protocols/oscar/oscar.c:2850
+#: ../libpurple/protocols/oscar/oscar.c:2856
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2855
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../libpurple/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2917
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2994
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3181
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息，因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:3384
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7151,113 +7234,113 @@
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3450
+#: ../libpurple/protocols/oscar/oscar.c:3456
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3463
+#: ../libpurple/protocols/oscar/oscar.c:3469
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3716
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3858
+#: ../libpurple/protocols/oscar/oscar.c:3864
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3904
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3903
+#: ../libpurple/protocols/oscar/oscar.c:3909
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3929
+#: ../libpurple/protocols/oscar/oscar.c:3935
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3952
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3989
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:3992
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號與原本的不同。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號太長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個帳號尚有要求等待處理。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7265,37 +7348,37 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4022
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4187
+#: ../libpurple/protocols/oscar/oscar.c:4194
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像；要傳送即時訊息影像，必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4432
+#: ../libpurple/protocols/oscar/oscar.c:4439
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4433
+#: ../libpurple/protocols/oscar/oscar.c:4440
 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 "
@@ -7304,7 +7387,7 @@
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4454
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7315,11 +7398,11 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4452
+#: ../libpurple/protocols/oscar/oscar.c:4459
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7330,11 +7413,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4571
+#: ../libpurple/protocols/oscar/oscar.c:4578
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7345,17 +7428,17 @@
 "文字母為開頭，同時由「英文字母」、「數字」和「空白」所組成，或者單純以「數"
 "字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4573
-#: ../libpurple/protocols/oscar/oscar.c:4996
-#: ../libpurple/protocols/oscar/oscar.c:5010
+#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5017
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4677
+#: ../libpurple/protocols/oscar/oscar.c:4684
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4678
+#: ../libpurple/protocols/oscar/oscar.c:4685
 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."
@@ -7363,16 +7446,16 @@
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失，可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4882
-#: ../libpurple/protocols/oscar/oscar.c:4883
-#: ../libpurple/protocols/oscar/oscar.c:4888
-#: ../libpurple/protocols/oscar/oscar.c:5064
-#: ../libpurple/protocols/oscar/oscar.c:5065
-#: ../libpurple/protocols/oscar/oscar.c:5070
+#: ../libpurple/protocols/oscar/oscar.c:4889
+#: ../libpurple/protocols/oscar/oscar.c:4890
+#: ../libpurple/protocols/oscar/oscar.c:4895
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5077
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
+#: ../libpurple/protocols/oscar/oscar.c:5001
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7381,12 +7464,12 @@
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4994
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5001
+#: ../libpurple/protocols/oscar/oscar.c:5015
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5008
+#: ../libpurple/protocols/oscar/oscar.c:5015
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7396,7 +7479,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:5108
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7406,23 +7489,23 @@
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5116
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5188
+#: ../libpurple/protocols/oscar/oscar.c:5189
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他（她）加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5189
+#: ../libpurple/protocols/oscar/oscar.c:5190
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5193
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7432,32 +7515,32 @@
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5194
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:5230
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E)："
 
-#: ../libpurple/protocols/oscar/oscar.c:5269
+#: ../libpurple/protocols/oscar/oscar.c:5270
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5339
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5478
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5479
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對，又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5483
+#: ../libpurple/protocols/oscar/oscar.c:5484
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7465,89 +7548,89 @@
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 所以這應該是有問題的譯文，但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5684
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5791
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/oscar/oscar.c:5793
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5840
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5843
+#: ../libpurple/protocols/oscar/oscar.c:5844
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址，因此可能會有隱私上的風險。您想要繼續嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5850
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5884
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/oscar.c:5891
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5898
+#: ../libpurple/protocols/oscar/oscar.c:5899
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/oscar/oscar.c:5912
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」，不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:5992
+#: ../libpurple/protocols/oscar/oscar.c:5993
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態（會導致您收到垃圾訊息！）"
 
-#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6001
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6019
-msgid "The new formatting is invalid."
-msgstr "新的格式是無效的。"
-
 #: ../libpurple/protocols/oscar/oscar.c:6020
+msgid "The new formatting is invalid."
+msgstr "新的格式是無效的。"
+
+#: ../libpurple/protocols/oscar/oscar.c:6021
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6073
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: ../libpurple/protocols/oscar/oscar.c:6119
+#: ../libpurple/protocols/oscar/oscar.c:6120
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6122
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6123
+#: ../libpurple/protocols/oscar/oscar.c:6124
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7555,74 +7638,74 @@
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6140
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6142
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6142
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6303
+#: ../libpurple/protocols/oscar/oscar.c:6304
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6314
+#: ../libpurple/protocols/oscar/oscar.c:6315
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6318
+#: ../libpurple/protocols/oscar/oscar.c:6319
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6328
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6335
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6350
+#: ../libpurple/protocols/oscar/oscar.c:6351
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Show how long you have been idle"
 msgstr "顯示你閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/oscar/oscar.c:6588
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8119,7 +8202,7 @@
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
-msgstr ""
+msgstr "「登入要求」Token 出現錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8128,11 +8211,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:2410
-#: ../libpurple/protocols/yahoo/yahoo.c:2517
-#: ../libpurple/protocols/yahoo/yahoo.c:2538
-#: ../libpurple/protocols/yahoo/yahoo.c:2622
+#: ../libpurple/protocols/yahoo/yahoo.c:2378
+#: ../libpurple/protocols/yahoo/yahoo.c:2406
+#: ../libpurple/protocols/yahoo/yahoo.c:2513
+#: ../libpurple/protocols/yahoo/yahoo.c:2534
+#: ../libpurple/protocols/yahoo/yahoo.c:2618
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8559,7 +8642,7 @@
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "主題："
 
@@ -8597,18 +8680,18 @@
 msgstr "上次使用的用戶端程式（如已知）"
 
 #: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5500
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "使用者名稱"
 
 #: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
 #: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
-msgstr "輸入了一個不明的使用者 ID"
+msgstr "輸入了一個不明確的使用者 ID"
 
 #: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
@@ -8674,39 +8757,39 @@
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5249
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5303
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "無法新增群組：群組已存在"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "群組名稱「%s」已經存在於您的好友清單中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5307
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "無法新增群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "可能相符的項目"
 
-#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5383
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8716,26 +8799,26 @@
 "「%s」可能參考到下列的 Notes 通訊錄群組。請自下方選取正確的群組，以加入您的好"
 "友清單。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "無法新增群組：找不到群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "在您的 Sametime 社群中，並沒有任何與「%s」相符的 Notes 通訊錄群組。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5474
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5475
+#: ../libpurple/protocols/sametime/sametime.c:5481
 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."
@@ -8743,12 +8826,12 @@
 "輸入 Notes 通訊錄群組名稱於欄位中，以新增這個群組及它所屬的成員到您的好友清單"
 "中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5524
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "對「%s」的搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5525
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8758,59 +8841,59 @@
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐，把他（她）們新增至好友清"
 "單內，或向他（她）們發出訊息。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5558
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5562
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5599
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "輸入姓名或部份 ID 於下方的欄位，來查詢您 Sametime 社群中符合的使用者。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5603
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../libpurple/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "強行登入（忽略伺服器重新導向）"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5735
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
@@ -9983,7 +10066,7 @@
 msgstr "whois &lt;暱稱&gt;：查看這個暱稱的相關資訊"
 
 #: ../libpurple/protocols/silc/silc.c:1618
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者"
 
@@ -10277,26 +10360,26 @@
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1486
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1520
-#: ../libpurple/protocols/simple/simple.c:1562
-#: ../libpurple/protocols/simple/simple.c:1575
-#: ../libpurple/protocols/simple/simple.c:1626
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1543
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1651
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -10308,36 +10391,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1826
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1827
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態（請注意：任何人都能看到您）"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "使用 UDP"
 
+#: ../libpurple/protocols/simple/simple.c:1861
+msgid "Use proxy"
+msgstr "使用 Proxy"
+
 #: ../libpurple/protocols/simple/simple.c:1863
-msgid "Use proxy"
-msgstr "使用 Proxy"
-
-#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1869
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -10573,21 +10656,21 @@
 msgstr "%s 在呼叫您！"
 
 # XXX 暫譯
-#: ../libpurple/protocols/yahoo/yahoo.c:928
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:984
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1069
+#: ../libpurple/protocols/yahoo/yahoo.c:1065
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1072
+#: ../libpurple/protocols/yahoo/yahoo.c:1068
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10596,11 +10679,11 @@
 "使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1075
+#: ../libpurple/protocols/yahoo/yahoo.c:1071
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1826
+#: ../libpurple/protocols/yahoo/yahoo.c:1822
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10610,11 +10693,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式，因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1829
+#: ../libpurple/protocols/yahoo/yahoo.c:1825
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1895
+#: ../libpurple/protocols/yahoo/yahoo.c:1891
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10623,70 +10706,70 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1898
+#: ../libpurple/protocols/yahoo/yahoo.c:1894
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1957
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1960
+#: ../libpurple/protocols/yahoo/yahoo.c:1956
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2014
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2017
+#: ../libpurple/protocols/yahoo/yahoo.c:2013
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2464
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2492
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
-#: ../libpurple/protocols/yahoo/yahoo.c:2774
-#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoo.c:2488
+#: ../libpurple/protocols/yahoo/yahoo.c:2667
+#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2780
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3493
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3496
 msgid "Not at Desk"
 msgstr "不在座位"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+msgid "Not in Office"
+msgstr "不在辦公室"
+
 #: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3503
-msgid "Not in Office"
-msgstr "不在辦公室"
+#: ../libpurple/protocols/yahoo/yahoo.c:3505
+msgid "On Vacation"
+msgstr "渡假去了"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
-msgid "On Vacation"
-msgstr "渡假去了"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo.c:3515
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10694,92 +10777,92 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/yahoo/yahoo.c:3021
+#: ../libpurple/protocols/yahoo/yahoo.c:2987
+#: ../libpurple/protocols/yahoo/yahoo.c:3017
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3038
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3041
-#: ../libpurple/protocols/yahoo/yahoo.c:3117
+#: ../libpurple/protocols/yahoo/yahoo.c:3037
+#: ../libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線，所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3107
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3155
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3165
+#: ../libpurple/protocols/yahoo/yahoo.c:3161
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3189
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3195
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID？"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3239
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室？"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
+msgid "Activate ID..."
+msgstr "啟動 ID..."
+
 #: ../libpurple/protocols/yahoo/yahoo.c:3255
-msgid "Activate ID..."
-msgstr "啟動 ID..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
 #  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
 msgid "You have just sent a Buzz!"
 msgstr "您剛送出了一個呼叫！"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3825
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
+msgid "list: List rooms on the Yahoo network"
+msgstr "list：列出Yahoo網路上的聊天室清單"
+
 #: ../libpurple/protocols/yahoo/yahoo.c:3830
-msgid "list: List rooms on the Yahoo network"
-msgstr "list：列出Yahoo網路上的聊天室清單"
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3834
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: 給好友一個「嗶」引他（她）注意"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -10793,57 +10876,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4071
+#: ../libpurple/protocols/yahoo/yahoo.c:4067
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4070
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4073
 msgid "Japan Pager server"
 msgstr "傳呼伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4076
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4083
+#: ../libpurple/protocols/yahoo/yahoo.c:4079
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4086
+#: ../libpurple/protocols/yahoo/yahoo.c:4082
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
+#: ../libpurple/protocols/yahoo/yahoo.c:4085
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4092
+#: ../libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4095
+#: ../libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4103
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4106
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4109
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
@@ -11053,23 +11136,23 @@
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "使用者"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "隱藏或未登入"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "任何人"
 
@@ -11080,65 +11163,65 @@
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "類別／聊天室(_C)："
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "實體／頻道(_I)："
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "接受者(_R)："
 
 #  FIXME 暫譯
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "加人聊天室（交談） %s,%s,%s 失敗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;：尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;：尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&gt;：設定這個「類別」（聊天室）的「實體」（頻道）"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&gt;：設定這個「類別」（聊天室）的「實體」（頻道）"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;實體&gt;：設定這個「類別」（聊天室）的「實體」（頻道）"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;：加入聊天室"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;實體&gt;：送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;類別&gt; &lt;實體&gt：送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 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;"
@@ -11146,7 +11229,7 @@
 "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;<i>類別</i>,<i>"
 "實體</i>,<i>接受者</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11154,18 +11237,18 @@
 "zir &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
 "</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;：送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
 #  FIXME 要覆查譯文
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -11179,16 +11262,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2945
-#: ../libpurple/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "使用 TZC"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "TZC 指令"
 
@@ -11198,11 +11281,11 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
@@ -11212,22 +11295,22 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "自 .anyone 檔案中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "自 .zephyr.subs 檔中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2990
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "域名"
 
 # FIXME 暫譯；譯得很差，有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: ../libpurple/protocols/zephyr/zephyr.c:2993
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -11296,12 +11379,12 @@
 msgid "saved statuses"
 msgstr "儲存狀態"
 
-#: ../libpurple/server.c:231
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libpurple/server.c:673
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11310,58 +11393,58 @@
 "%s 邀請 %s 到聊天室「%s」：\n"
 "%s"
 
-#: ../libpurple/server.c:678
+#: ../libpurple/server.c:684
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 
-#: ../libpurple/server.c:682
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "離線"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "使用行動裝置"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 從「%s」狀態改變為「%s」"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 目前為%s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再%s"
 
-#: ../libpurple/status.c:1288
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1305
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1371
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1373
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
@@ -11371,13 +11454,13 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2495
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#: ../libpurple/util.c:2496
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11385,79 +11468,79 @@
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:2980
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:2983
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3009
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3021
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:3029
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3035
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3043
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3049
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3315 ../libpurple/util.c:3613
+#: ../libpurple/util.c:3362 ../libpurple/util.c:3660
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3441
+#: ../libpurple/util.c:3488
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體，網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3476
+#: ../libpurple/util.c:3523
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤：%s"
 
-#: ../libpurple/util.c:3507
+#: ../libpurple/util.c:3554
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤：%s"
 
-#: ../libpurple/util.c:3532
+#: ../libpurple/util.c:3579
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
@@ -11484,59 +11567,59 @@
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:398
+#: ../pidgin/gtkaccount.c:406
 msgid "Login Options"
 msgstr "登入選項"
 
 # NOTE Debian 譯「local」為「本地端」，「本機」是Windows譯法，但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:500
+#: ../pidgin/gtkaccount.c:515
 msgid "Local alias:"
 msgstr "帳號別名（只在本機生效）："
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:562
+#: ../pidgin/gtkaccount.c:577
 msgid "User Options"
 msgstr "使用者自定選項"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:580
+#: ../pidgin/gtkaccount.c:595
 msgid "Use this buddy icon for this account:"
 msgstr "使用下列好友圖示："
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:700
+#: ../pidgin/gtkaccount.c:715
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../pidgin/gtkaccount.c:897
+#: ../pidgin/gtkaccount.c:912
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:898
+#: ../pidgin/gtkaccount.c:913
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」，但講國語「毋須」會不通順，「不使用」較好
-#: ../pidgin/gtkaccount.c:904
+#: ../pidgin/gtkaccount.c:919
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:910
+#: ../pidgin/gtkaccount.c:925
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:916
+#: ../pidgin/gtkaccount.c:931
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:922
+#: ../pidgin/gtkaccount.c:937
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:943 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -11545,60 +11628,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkaccount.c:982
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkaccount.c:985
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:991
+#: ../pidgin/gtkaccount.c:1006
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1020 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "通訊埠(_P)："
 
-#: ../pidgin/gtkaccount.c:1026
+#: ../pidgin/gtkaccount.c:1041
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1048 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
-#: ../pidgin/gtkaccount.c:1440
+#: ../pidgin/gtkaccount.c:1454
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1464
+#: ../pidgin/gtkaccount.c:1478
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1475
+#: ../pidgin/gtkaccount.c:1489
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1947 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1961 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:1975
+#: ../pidgin/gtkaccount.c:1989
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2169
+#: ../pidgin/gtkaccount.c:2183
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11622,233 +11705,233 @@
 
 # TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:722
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:743
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
 #: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1028
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1079
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:86
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1095
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
-#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1115
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "別名..."
 
-#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
-#: ../pidgin/gtkblist.c:1236
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1178
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1183
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1203
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1269
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
-#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4499
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
 #: ../pidgin/gtkpounce.c:423
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2814
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2816
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2818
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2820
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../pidgin/gtkblist.c:2822
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2823
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2826
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2827
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2828
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2830
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2833
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2834 ../pidgin/gtkblist.c:6412
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6446
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2837
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2843
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11857,128 +11940,128 @@
 "\n"
 "<b>帳號：</b>%s"
 
-#: ../pidgin/gtkblist.c:2959
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:2980
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX
-#: ../pidgin/gtkblist.c:3046
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3048
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3050
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3375
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3377
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3514
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3515 ../pidgin/gtkblist.c:3548
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3516
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3517
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3518 ../pidgin/gtkblist.c:3551
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3519
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3554
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3557
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3654 ../pidgin/gtkdocklet.c:156
+#: ../pidgin/gtkblist.c:3673 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3731
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3733
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3734
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3735
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:3937 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:3947
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:3968
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線：%s</span>"
 
-#: ../pidgin/gtkblist.c:4121
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱：</b>"
 
-#: ../pidgin/gtkblist.c:4128
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>密碼：</b>"
 
-#: ../pidgin/gtkblist.c:4139
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4224
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4238
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11996,23 +12079,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4483
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../pidgin/gtkblist.c:4486
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../pidgin/gtkblist.c:4492
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../pidgin/gtkblist.c:4495
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../pidgin/gtkblist.c:5333
+#: ../pidgin/gtkblist.c:5367
 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. "
@@ -12021,66 +12104,66 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱，而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: ../pidgin/gtkblist.c:5393 ../pidgin/gtkblist.c:5754
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5788
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "群組："
 
-#: ../pidgin/gtkblist.c:5652
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5668
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5709
+#: ../pidgin/gtkblist.c:5743
 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:5792
+#: ../pidgin/gtkblist.c:5826
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6432
+#: ../pidgin/gtkblist.c:6466
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6456
+#: ../pidgin/gtkblist.c:6490
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6469 ../pidgin/gtkconv.c:2900
+#: ../pidgin/gtkblist.c:6503 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6477
+#: ../pidgin/gtkblist.c:6511
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6489
+#: ../pidgin/gtkblist.c:6523
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6495
+#: ../pidgin/gtkblist.c:6529
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6544
+#: ../pidgin/gtkblist.c:6578
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6614
+#: ../pidgin/gtkblist.c:6648
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
@@ -12095,209 +12178,209 @@
 "%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前，%s 將不會再試著重新連線。"
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:808
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
 #: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:217
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:165 ../pidgin/gtkdebug.c:741
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "搜尋(_S)："
 
-#: ../pidgin/gtkconv.c:1340
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1348
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1596
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」，但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思，故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1642
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2484
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2535
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2587
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2592
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2595
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2599
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2612
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2754
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2756
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2761
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2764
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2766
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2770
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2785
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
@@ -12306,234 +12389,234 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3033
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3052
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3032
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
-msgstr "使用者正在輸入..."
-
-#: ../pidgin/gtkconv.c:3159
+msgstr "對方正在輸入..."
+
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
-msgstr "使用者輸入了一些東西，不過暫停了"
+msgstr "對方輸入了一些東西，不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3341
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4049
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4197
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6054
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6059
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6069
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7196
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7228
+#: ../pidgin/gtkconv.c:7290
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎？"
 
-#: ../pidgin/gtkconv.c:7763
+#: ../pidgin/gtkconv.c:7807
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7769
+#: ../pidgin/gtkconv.c:7813
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7777
+#: ../pidgin/gtkconv.c:7821
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7783
+#: ../pidgin/gtkconv.c:7827
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8086
+#: ../pidgin/gtkconv.c:8211
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8550
+#: ../pidgin/gtkconv.c:8732
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8552
+#: ../pidgin/gtkconv.c:8734
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8736 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8556
+#: ../pidgin/gtkconv.c:8738
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8558
+#: ../pidgin/gtkconv.c:8740
 msgid "By account"
 msgstr "依帳號"
 
 #  NOTE「除錯日誌」很怪，「除錯紀錄」較順口，而且已經有人用
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:596
+#: ../pidgin/gtkdebug.c:580
 msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:599
+#: ../pidgin/gtkdebug.c:583
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
 #  NOTE 除錯視窗的工具列的快取選單的指令，指「工具列的按紐以圖示標示」，下二同
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:650
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:667
+#: ../pidgin/gtkdebug.c:651
 msgid "_Text Only"
 msgstr "顯示文字(_T)"
 
-#: ../pidgin/gtkdebug.c:668
+#: ../pidgin/gtkdebug.c:652
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:804
+#: ../pidgin/gtkdebug.c:773
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:792
 msgid "Right click for more options."
 msgstr "按右鍵以顯示更多選項。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:853
+#: ../pidgin/gtkdebug.c:822
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:823 ../pidgin/gtkdebug.c:829
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:862
+#: ../pidgin/gtkdebug.c:831
 msgid "All"
 msgstr "全部訊息"
 
 # NOTE 這個不是指「Info」（因為已經有「Info」一項），而是一種比「Info」還要低層次的除錯訊息，應是指「Debug」
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:832
 msgid "Misc"
 msgstr "閒雜訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:834
 msgid "Warning"
 msgstr "警告訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:866
+#: ../pidgin/gtkdebug.c:835
 msgid "Error "
 msgstr "錯誤訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:867
+#: ../pidgin/gtkdebug.c:836
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
@@ -12582,14 +12665,14 @@
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
 #: ../pidgin/gtkdialogs.c:115
-msgid "Jabber developer"
-msgstr "Jabber 開發者"
+msgid "XMPP developer"
+msgstr "XMPP 開發者"
 
 #: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "原作者"
 
-#  NOTE 譯文完全不統一，依其他 open source project「慣例」（只有兩三個）譯成「南非荷蘭文」
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
@@ -12608,11 +12691,13 @@
 msgid "Bengali"
 msgstr "孟加拉文"
 
-# NOTE 港譯「波斯尼亞」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
+# NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
 #: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
-msgstr "波士尼亞文"
-
+msgstr "波希尼亞文"
+
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
 #: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
 #: ../pidgin/gtkdialogs.c:211
 msgid "Catalan"
@@ -12637,6 +12722,7 @@
 msgstr "德文"
 
 # NOTE 國名是「不丹」，中譯文依國名不依語文名
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
 #: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 #: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
@@ -12689,21 +12775,28 @@
 msgid "French"
 msgstr "法文"
 
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
 #: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "加里西亞文"
 
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
 #: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "古吉拉特文翻譯小組"
+
 #: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
 msgid "Hebrew"
 msgstr "希伯來文"
 
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
 #: ../pidgin/gtkdialogs.c:161
 msgid "Hindi"
-msgstr "北印度文"
+msgstr "印度文"
 
 #: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
@@ -12717,9 +12810,10 @@
 #  NOTE 國語去聲不分陰陽，廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」，
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條，譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
+#  NOTE 註：因 zh_TW 和 zh_HK 正式分家，還原成台式譯法「義大利」
 #: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
 msgid "Italian"
-msgstr "意大利文"
+msgstr "義大利文"
 
 #: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
 #: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
@@ -12730,20 +12824,31 @@
 msgid "Georgian"
 msgstr "喬治亞文"
 
-# NOTE: 這是KDE譯法，也見於台灣某大學網站 :P
+# FIXME 可以譯好一點 20070520 acli
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+# NOTE 註：KDE 譯「坎納達」
 #: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
-msgstr "坎納達文"
+msgstr "康納達文"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "康納達文翻譯小組"
 
 #: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
 msgid "Korean"
 msgstr "韓文"
 
-# NOTE 台譯「庫德」，港譯「庫爾德」；但台灣政府也有用「庫爾德」，故「庫爾德」較好
+#  NOTE 港譯只有「庫爾德」，台譯有「庫德」（標準譯法，看來亦較常見）和「庫爾德」
+#  NOTE 註：因 zh_TW 和 zh_HK 正式分家，保留台式譯法「庫德」
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
-msgstr "庫爾德文"
+msgstr "庫德文"
 
 #: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
 #: ../pidgin/gtkdialogs.c:232
@@ -12759,10 +12864,10 @@
 #  NOTE 音譯包括：博克馬爾、波克默爾、布克莫爾、巴克摩
 #  NOTE 其他譯法包括：丹麥－挪威文（大英百科）、丹麥式挪威文（維基百科）、東挪威文、標準挪威文（國內不是標準，國外是 :P）
 #  NOTE 譯音一般放在「挪威文」後的括弧內，也有不用括弧把譯音放在「挪威」和「文」之間
-#  XXX 暫時譯成「挪威布克莫爾文」
+#  NOTE 採用「標準」一詞，參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
 #: ../pidgin/gtkdialogs.c:174
 msgid "Bokmål Norwegian"
-msgstr "挪威布克莫爾文"
+msgstr "標準挪威文"
 
 #: ../pidgin/gtkdialogs.c:175
 msgid "Nepali"
@@ -12774,9 +12879,10 @@
 msgid "Dutch, Flemish"
 msgstr "荷蘭文／法蘭德斯文"
 
+#  NOTE 這是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當
 #: ../pidgin/gtkdialogs.c:177
 msgid "Norwegian"
-msgstr "挪威文"
+msgstr "新挪威文"
 
 #: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
 #: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
@@ -12791,10 +12897,11 @@
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#  XXX 某大學論文譯法
+#  NOTE「普什圖」在三地都看來是較正常的譯法
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
 #: ../pidgin/gtkdialogs.c:183
 msgid "Pashto"
-msgstr "巴斯多文 (Pashto)"
+msgstr "普什圖文"
 
 #: ../pidgin/gtkdialogs.c:184
 msgid "Romanian"
@@ -12831,14 +12938,16 @@
 msgid "Swedish"
 msgstr "瑞典文"
 
-# NOTE 港譯「泰米爾」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」
 #: ../pidgin/gtkdialogs.c:193
 msgid "Tamil"
-msgstr "塔米爾文"
-
+msgstr "坦米爾文"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 #: ../pidgin/gtkdialogs.c:194
 msgid "Telugu"
-msgstr "特魯固文"
+msgstr "德拉威文"
 
 #: ../pidgin/gtkdialogs.c:195
 msgid "Thai"
@@ -12869,7 +12978,7 @@
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-# XXX Yahoo譯法
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:208
 msgid "Amharic"
 msgstr "阿姆哈拉文"
@@ -12879,115 +12988,118 @@
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:363
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s 係一個以 GTK+ 開發的模組化訊息程式，同時提供 AIM、MSN、Yahoo!、Jabber、"
-"ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、Bonjour、"
-"Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修改或發佈這個程式，只需按"
-"照 GPL（第二版或任何以後的版本）的條款即可；%s 內已附有一份 GPL, 收錄在名為"
-"「COPYING」的檔案之內。%s 係有版權的著作，版權歸全部貢獻者共同所有，貢獻者芳"
-"名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
+#: ../pidgin/gtkdialogs.c:365
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to 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 ""
+"%s 係一個以 GTK+ 開發，圖形介面式的模組化訊息程式，以 libpurple 為基礎，同時"
+"提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
+"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修"
+"改或發佈這個程式，只需按照 GPL（任擇第二版或較新的其他版本）的條款即可；%s 內"
+"已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作，版權歸全"
+"部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
+"何保用。<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:381
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:381
+#: ../pidgin/gtkdialogs.c:384
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:390
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
-# NOTE 不過，翻成「狂熱的模組作者」會比較好
-#: ../pidgin/gtkdialogs.c:402
+# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
+# NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
+#: ../pidgin/gtkdialogs.c:405
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:420
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: ../pidgin/gtkdialogs.c:432
+#  NOTE 可譯「美工人員」，但那是很保守的譯法；Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人，所以很明顯是「設計員」
+#: ../pidgin/gtkdialogs.c:435
 msgid "Artists"
-msgstr "美工人員"
-
-#: ../pidgin/gtkdialogs.c:447
+msgstr "平面設計"
+
+#: ../pidgin/gtkdialogs.c:450
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:467
+#: ../pidgin/gtkdialogs.c:470
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:485
+#: ../pidgin/gtkdialogs.c:488
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:854
+#: ../pidgin/gtkdialogs.c:857
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:859
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:949
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:971
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:969
+#: ../pidgin/gtkdialogs.c:972
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:991
+#: ../pidgin/gtkdialogs.c:994
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:996
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13003,32 +13115,32 @@
 "作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1065
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1068
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1096
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "您正試著將群組 %s 與 %s 合併，新群組以後者命名。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1156
+#: ../pidgin/gtkdialogs.c:1159
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13036,81 +13148,78 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1162
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1165
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1195
+#: ../pidgin/gtkdialogs.c:1198
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1201
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1204
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1222
+#: ../pidgin/gtkdialogs.c:1225
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1228
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1231
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-#: ../pidgin/gtkdocklet.c:454
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "變更狀態"
 
-#: ../pidgin/gtkdocklet.c:506
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../pidgin/gtkdocklet.c:532
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../pidgin/gtkdocklet.c:547
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:535
 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:565
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "結束程式"
 
-#  XXX 這個太奇怪了 (^^;)
+#  NOTE 這是指「未開始」傳輸檔案，不是「未啟動」
 #: ../pidgin/gtkft.c:153
 msgid "Not started"
-msgstr "未啟動"
+msgstr "未開始"
 
 # XXX 暫譯
 #: ../pidgin/gtkft.c:273
@@ -13190,7 +13299,7 @@
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "暫停(_P)"
 
@@ -13237,7 +13346,7 @@
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3202
+#: ../pidgin/gtkimhtml.c:3211
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13248,7 +13357,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3205
+#: ../pidgin/gtkimhtml.c:3214
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13258,7 +13367,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3218
+#: ../pidgin/gtkimhtml.c:3227
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13269,7 +13378,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3221
+#: ../pidgin/gtkimhtml.c:3230
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13280,11 +13389,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+#: ../pidgin/gtkimhtml.c:3310 ../pidgin/gtkimhtml.c:3322
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3350
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -13509,26 +13618,26 @@
 "哪些帳號，並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:498
+#: ../pidgin/gtkmain.c:493
 #, 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"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\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"
+"%swiki/GetABacktrace\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"
+"%swiki/DeveloperPages\n"
 msgstr ""
 
 #: ../pidgin/gtknotify.c:337
@@ -13557,22 +13666,22 @@
 msgstr[0] "<b>您有 %d 封新郵件。</b>"
 msgstr[1] "<b>您有 %d 封新郵件。</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, 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
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤：%s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
@@ -13987,6 +14096,11 @@
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1756
+msgid "(default)"
+msgstr "(預設)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "選取音效"
@@ -14376,33 +14490,37 @@
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:516
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1372 ../pidgin/gtkutils.c:1395
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤：%s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1375 ../pidgin/gtkutils.c:1397
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1419
+#: ../pidgin/gtkutils.c:1471
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1472
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr "%s 沒有辦法傳送目錄。您需要個別傳送檔案"
-
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
-#: ../pidgin/gtkutils.c:1471
+"individually."
+msgstr "%s 沒有辦法傳送目錄，您需要個別傳送目錄內的檔案。"
+
+#: ../pidgin/gtkutils.c:1504 ../pidgin/gtkutils.c:1516
+#: ../pidgin/gtkutils.c:1523
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1505
 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."
@@ -14410,23 +14528,23 @@
 "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+#: ../pidgin/gtkutils.c:1511 ../pidgin/gtkutils.c:1532
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1512 ../pidgin/gtkutils.c:1533
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1513 ../pidgin/gtkutils.c:1533
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1465
+#: ../pidgin/gtkutils.c:1517
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎？"
 
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1524
 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."
@@ -14434,7 +14552,7 @@
 "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1526
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14447,17 +14565,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1584
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1584
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器；您大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2302
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14468,25 +14586,25 @@
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2592
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2594
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2595
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2695
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」：%s"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14500,27 +14618,34 @@
 msgid "Select color"
 msgstr "選擇顏色"
 
-#: ../pidgin/pidginstock.c:83
+#  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "別名(_A)"
 
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "關閉分頁(_T)"
+
 #: ../pidgin/pidginstock.c:85
-msgid "Close _tabs"
-msgstr "關閉分頁(_T)"
-
-#: ../pidgin/pidginstock.c:87
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "邀請(_I)"
 
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
@@ -14594,7 +14719,7 @@
 
 #: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "好友離開"
+msgstr "好友「長時間離開」"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
@@ -14710,12 +14835,19 @@
 msgid "Conversation Placement"
 msgstr "交談位置"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr "注意：「新交談」選項必須設定為「依交談個數」。"
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
 #  XXX 要核實譯文！
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "依交談個數放置新交談時，以不同的視窗顯示即時訊息和聊天"
 
@@ -14725,20 +14857,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:141
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "視窗位置額外選項"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:143
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
 #  XXX 譯得很差，請改良 :-(
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:145
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -15204,39 +15336,31 @@
 msgid "Hyperlink Color"
 msgstr "超連結顏色"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView 展開器大小"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "交談歷史"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "日誌檢視器"
 
 #  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "通知視窗 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView展開器"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "選擇顏色"
@@ -15258,36 +15382,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "介面顏色"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Widget 大小"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "字型"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "工具"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "將設定寫入%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:622
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
@@ -15304,11 +15448,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"讓您直接輸入指令對各種文字模式的通訊協定（例如 Jabber、MSN、IRC 及 TOC）進行"
-"操作。在輸入欄位輸入指令，按 Enter 後鍵送出；相關資訊會在除錯視窗顯示。"
+"讓您直接輸入指令對各種文字模式的通訊協定（例如 XMPP、MSN、IRC 及 TOC）進行操"
+"作。在輸入欄位輸入指令，按 Enter 後鍵送出；相關資訊會在除錯視窗顯示。"
 
 # XXX 暫譯
 #: ../pidgin/plugins/relnot.c:71
@@ -15481,9 +15625,8 @@
 msgstr "時間戳記格式選項"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "強制使用（%s 傳統使用的）24小時制時間格式(_F)"
+msgid "_Force 24-hour time format"
+msgstr "強制使用24小時制時間格式(_F)"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15514,19 +15657,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:150
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "訊息時間戳記格式"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:153
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "使用者自定的訊息時間戳記格式。"
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:155
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15697,6 +15840,40 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "GtkTreeView 展開器大小"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "GtkTreeView展開器"
+
+# FIXME 譯文有待改進 - 20061028
+#~ msgid "Toggle offline buddies"
+#~ msgstr "顯示／不顯示離線好友"
+
+#~ msgid "Timestamps"
+#~ msgstr "時間戳記"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber 帳號"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "無法加入 %s："
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "搜尋Jabber使用者"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Jabber 帳號無效"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "修改 Jabber 密碼"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber 協定模組"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber 開發者"
+
 #~ msgid "..."
 #~ msgstr "..."
 
@@ -16515,9 +16692,6 @@
 #~ msgid "Offline "
 #~ msgstr "離線"
 
-#~ msgid "Default"
-#~ msgstr "預設"
-
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">來自：</span> %s\n"