changeset 29454:5c9c4557fec2

merge of '20a2cebedc53676ed04bba9375a4e5a9cd97b6fd' and 'c0adc68d6e21c013beb36f789a05d94234c3696a'
author Paul Aurich <paul@darkrain42.org>
date Tue, 16 Feb 2010 15:16:28 +0000 (2010-02-16)
parents 89f072f356ef (current diff) e4cf053a1d7a (diff)
children 28714ff543cd 9c5158a62705 e446b56c01e4 cc6d733a192a
files
diffstat 9 files changed, 760 insertions(+), 1602 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 15 06:39:09 2010 +0000
+++ b/ChangeLog	Tue Feb 16 15:16:28 2010 +0000
@@ -62,6 +62,9 @@
 	* The default value for the file transfer proxies is automatically
 	  updated when an account connects, if it is still the old (broken)
 	  default (from 'proxy.jabber.org' to 'proxy.eu.jabber.org').
+	* Fix an issue where libpurple created duplicate buddies if the roster
+	  contains a buddy in two groups that differ only by case
+	  (e.g. "XMPP" and "xmpp") (or not at all).
 
 	Yahoo:
 	* Don't send <span> and </span> tags.  (Fartash Faghri)
--- a/libpurple/protocols/jabber/roster.c	Mon Feb 15 06:39:09 2010 +0000
+++ b/libpurple/protocols/jabber/roster.c	Tue Feb 16 15:16:28 2010 +0000
@@ -259,7 +259,16 @@
 					seen_empty = TRUE;
 				}
 
-				groups = g_slist_prepend(groups, group_name);
+				/*
+				 * See the note in add_purple_buddy_to_groups; the core handles
+				 * names case-insensitively and this is required to not
+				 * end up with duplicates if a buddy is in, e.g.,
+				 * 'XMPP' and 'xmpp'
+				 */
+				if (g_slist_find_custom(groups, group_name, (GCompareFunc)purple_utf8_strcasecmp))
+					g_free(group_name);
+				else
+					groups = g_slist_prepend(groups, group_name);
 			}
 
 			add_purple_buddy_to_groups(js, jid, name, groups);
--- a/pidgin/gtkimhtml.c	Mon Feb 15 06:39:09 2010 +0000
+++ b/pidgin/gtkimhtml.c	Tue Feb 16 15:16:28 2010 +0000
@@ -5027,11 +5027,9 @@
 	}
 
 	if (icon) {
-		char *text = g_strdup(unescaped); /* Do not g_free 'text'.
-		                                     It will be destroyed when 'anchor' is destroyed. */
 		anchor = gtk_text_buffer_create_child_anchor(imhtml->text_buffer, iter);
-		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", text, g_free);
-		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_tiptext", g_strdup(text), g_free);
+		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", g_strdup(unescaped), g_free);
+		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_tiptext", g_strdup(unescaped), g_free);
 		g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_htmltext", g_strdup(smiley), g_free);
 
 		/* This catches the expose events generated by animated
@@ -5049,12 +5047,10 @@
 		imhtml_smiley->anchors = g_slist_append(imhtml_smiley->anchors, g_object_ref(anchor));
 		if (ebox) {
 			GtkWidget *img = gtk_image_new_from_stock(GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_MENU);
-			char *text = g_strdup(unescaped);
 			gtk_container_add(GTK_CONTAINER(ebox), img);
 			gtk_widget_show(img);
-			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", text, g_free);
-			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_tiptext",
-				g_strdup(text), g_free);
+			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", g_strdup(unescaped), g_free);
+			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_tiptext", g_strdup(unescaped), g_free);
 			g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_htmltext", g_strdup(smiley), g_free);
 			gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(imhtml), ebox, anchor);
 		}
--- a/pidgin/gtkprefs.c	Mon Feb 15 06:39:09 2010 +0000
+++ b/pidgin/gtkprefs.c	Tue Feb 16 15:16:28 2010 +0000
@@ -223,16 +223,8 @@
 
 	g_return_val_if_fail(menuitems != NULL, NULL);
 
-#if 0 /* GTK_CHECK_VERSION(2,4,0) */
-	if(type == PURPLE_PREF_INT)
-		model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
-	else if(type == PURPLE_PREF_STRING)
-		model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
-	dropdown = gtk_combo_box_new_with_model(model);
-#else
 	dropdown = gtk_option_menu_new();
 	menu = gtk_menu_new();
-#endif
 
 	if (type == PURPLE_PREF_INT)
 		stored_int = purple_prefs_get_int(key);
@@ -910,9 +902,11 @@
 	cell_rend = gtk_cell_renderer_text_new();
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, FALSE);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "markup", 1, NULL);
-/*#if GTK_CHECK_VERSION(2,6,0)
-			g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-#endif*/
+	/* TODO: We need to force a size or something, or each theme dropdown ends 
+	         up as just "..." */
+#if 0 && GTK_CHECK_VERSION(2,6,0)
+	g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+#endif
 
 	gtk_drag_dest_set(combo_box, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, te,
 					sizeof(te) / sizeof(GtkTargetEntry) , GDK_ACTION_COPY | GDK_ACTION_MOVE);
--- a/po/ChangeLog	Mon Feb 15 06:39:09 2010 +0000
+++ b/po/ChangeLog	Tue Feb 16 15:16:28 2010 +0000
@@ -4,11 +4,15 @@
 	* Afrikaans translation updated (Friedel Wolff)
 	* Albanian translation updated (Besnik Bleta)
 	* Bengali translation updated (Jamil Ahmed)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R. Liu)
 	* Chinese (Simplified) translation updated (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
 	* Czech translation updated (David Vachulka)
 	* French translation updated (�ric Boumaour)
 	* German translation updated (Bj旦rn Voigt and Jochen Kemnade)
 	* Gujarati translation updated (Sweta Kothari, Gujarati Language team)
+	* Hebrew translation updated (Shalom Craimer)
 	* Kannada translation updated (Shankar Prasad, Kannada Translation team)
 	* Marathi translation added (Sandeep Shedmake)
 	* Norwegian Bokm奪l translation updated (Hans Fredrik Nordhaug)
@@ -19,6 +23,7 @@
 	* Polish win32 installer updated (Piotr Dr�g)
 	* Punjabi translation updated (Amanpreet Singh Alam)
 	* Russian translation updated (�仆�仂仆 弌舒仄仂�于舒仍仂于)
+	* Slovak translation updated (loptosko)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Spanish translation updated (Francisco Javier F. Serrador)
 	* Tamil translation updated (I. Felix)
--- a/po/he.po	Mon Feb 15 06:39:09 2010 +0000
+++ b/po/he.po	Tue Feb 16 15:16:28 2010 +0000
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-11-29 20:20+0200\n"
-"Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
+"POT-Creation-Date: 2010-02-15 11:16-0800\n"
+"PO-Revision-Date: 2010-02-15 19:51+0200\n"
+"Last-Translator: Shalom Craimer <scraimer at google's mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1903,6 +1903,9 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ���� 廡��廛 廨���. �廖廨� �廚����廬 ��廬�� 廣���.\n"
 
+msgid "File is not readable."
+msgstr "�廡��廛 ���� 廡廨��."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 廨�廢� �廩��� �� %s (%s)"
@@ -3707,6 +3710,13 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "�廩廨廬 ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "廬���� �� 廬廡廚� ��廩廨廬"
+
+msgid "Server does not use any supported authentication method"
+msgstr "�廩廨廬 �� 廬��� �����廬 ��廝 廬廢�廨�"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3716,25 +3726,34 @@
 msgid "Plaintext Authentication"
 msgstr "����廬 �� ��廢廚�"
 
-msgid "SASL authentication failed"
-msgstr "����廬 SASL ��廩�"
-
-msgid "Invalid response from server"
-msgstr "廬���� �� 廬廡廚� ��廩廨廬"
-
-msgid "Server does not use any supported authentication method"
-msgstr "�廩廨廬 �� 廬��� �����廬 ��廝 廬廢�廨�"
-
 msgid "You require encryption, but it is not available on this server."
 msgstr "�廬廬 �廨�廩� ��廢廚��, ��� �廩廨廬 �� �廖廚廡 ��廬."
 
 msgid "Invalid challenge from server"
 msgstr "廬廩��廬 ����廬 �� 廬廡廚� ��廩廨廬"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "�廩廨廬 廖��廨 廩�����廬 �廖廬��� ��廢���, ��� 廬���廬 ��廡�� �� �廖����"
+
+msgid "SASL authentication failed"
+msgstr "����廬 SASL ��廩�"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "廩���廬 SASL: %s"
 
+msgid "Unable to canonicalize username"
+msgstr "�� ��廬� �廚廨廡 �廬 廩� ��廩廬�廩"
+
+msgid "Unable to canonicalize password"
+msgstr "�� ��廬� �廚廨廡 �廬 �廖�廖��"
+
+msgid "Malicious challenge from server"
+msgstr "廬廩��廬-��� �廨廖��廬 ��廩廨廬"
+
+msgid "Unexpected response from server"
+msgstr "廬���� ��-廢廚��� ��廩廨廬"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "���� �廬廡廩�廨廬 BOSH ��廬廡 �廬 ����廨�."
 
@@ -3833,13 +3852,16 @@
 msgid "Resource"
 msgstr "�廩��"
 
+msgid "Uptime"
+msgstr "��� ����廨"
+
+msgid "Logged Off"
+msgstr "�廬�廬廡/�"
+
 #, c-format
 msgid "%s ago"
 msgstr "�廚�� %s"
 
-msgid "Logged Off"
-msgstr "�廬�廬廡/�"
-
 msgid "Middle Name"
 msgstr "廩� ��廢廣�"
 
@@ -4028,11 +4050,6 @@
 msgid "Ping timed out"
 msgstr "廚��� �� ��廨 ����"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr "�� ���� ��廢�� 廢�廨�廬 ����廨 XMPP ���廚��廬 ��廨� ��廩��� �����廨 �廩�廨�廬."
-
 msgid "Invalid XMPP ID"
 msgstr "���� XMPP �� 廬廡��"
 
@@ -4574,6 +4591,9 @@
 msgid "(Code %s)"
 msgstr "(廡�� %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "������ 廩�� ���� ���� ���廩�� �廬�� ����廣�."
+
 msgid "XML Parse error"
 msgstr "廩���廬 廚�廣��� XML"
 
@@ -4975,6 +4995,10 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "�廩� ������廬� ���廩 廩�� �-MSN �廨�� ���."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "廡�廣 廩� �����廬� 廣��廨 %s."
+
 msgid "Set your friendly name."
 msgstr "廡�廣/� �廬 廩�� ������廬�."
 
@@ -6528,7 +6552,10 @@
 msgid "Server port"
 msgstr "廚�廨� �廩廨廬"
 
-#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "�廬廡��� 廬���� ��-廢廚��� ��廬 %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "�廬廡��� 廬���� ��-廢廚��� ��廬 %s"
@@ -6546,6 +6573,13 @@
 msgid "Error requesting %s: %s"
 msgstr "廩���� ��廡廩廬 %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"�廩廨廬 ��廡廩 ��� ���� ����廬 廩���� ���廬 ���廩�/廬 廣� ��廬 ��廬��廨, �� 廬���� �� �� "
+"廬���廬 ���廬."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ���� ��廚廩廨�� ���廬 �廬 廩� ��廩廬�廩 廩�� ���"
 
@@ -7090,13 +7124,6 @@
 "characters.]"
 msgstr "[�� ��廬� ��廢�� ���廣� ��廩廬�廩 �� ����� 廩��� ����� 廬���� �� ��廡���.]"
 
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"�廚廣��� ���廨��� 廩��廖�廬 ��廢廣 �� �廬�廢廣� ����� 廩�廬� �廚廨�廬 �廣� ����廬 ����廨�廬. �廩 "
-"����廬 10 廩���廬 ���廖�廬 廩��廬.\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��廬廡廬 ���廨 �廢'�� %s."
@@ -11654,15 +11681,15 @@
 msgid "Lao"
 msgstr "���廬"
 
-msgid "Lithuanian"
-msgstr "�������廬"
-
 msgid "Macedonian"
 msgstr "�廡����廬"
 
 msgid "Mongolian"
 msgstr "�������廬"
 
+msgid "Marathi"
+msgstr "�廨���"
+
 msgid "Malay"
 msgstr "�����廬"
 
@@ -11681,6 +11708,9 @@
 msgid "Occitan"
 msgstr "��廡廖����廬"
 
+msgid "Oriya"
+msgstr "��廨���"
+
 msgid "Punjabi"
 msgstr "廚���'���"
 
@@ -11759,6 +11789,9 @@
 msgid "Amharic"
 msgstr "���廨�廬"
 
+msgid "Lithuanian"
+msgstr "�������廬"
+
 #, c-format
 msgid "About %s"
 msgstr "����廬 %s"
@@ -13359,6 +13392,9 @@
 msgid "_Save File"
 msgstr "_廩��廨 廡��廛"
 
+msgid "Do you really want to clear?"
+msgstr "��� ���廬 �廨廢��� ����廡 ���?"
+
 msgid "Select color"
 msgstr "��廨 廢�廣"
 
@@ -14541,1041 +14577,3 @@
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "廬�廖廝 �� 廩���廩� ���廚�� ����� �廩廨廬�� ��廡���廬 廩� XMPP."
-
-#, fuzzy
-#~ msgid "(Default)"
-#~ msgstr "�廨�廨廬 �����))"
-
-#~ msgid "Install Theme"
-#~ msgstr "�廬廡� 廣�廢��"
-
-#~ msgid "Icon"
-#~ msgstr "廖��"
-
-#~ msgid "Use document font from _theme"
-#~ msgstr "�廬廩�廩 ���廚� ��廖�� �������"
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "廩廨廬 廬���� ��廚�廚�"
-
-#~ msgid "Auto-away"
-#~ msgstr "廨���廡 �������"
-
-#~ msgid "Change _status to:"
-#~ msgstr "廩�� 廨���廡 �:"
-
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "廬廣��廬-�廩�廨廩 廩����廨� ��廚�廡� �廬 �廬廣��� ���� ���廨廬 �廚���'��."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "��廚廩廨廬 �廩��� ���廣�廬 ������廬 �廨� �廖廚廨 廨� 廩� 廚廨���廡����"
-
-#~ msgid "_Start port:"
-#~ msgstr "�廢��� _廨�廩���:"
-
-#~ msgid "_End port:"
-#~ msgstr "�廢��� _��廨���:"
-
-#~ msgid "_User:"
-#~ msgstr "_�廩廬�廩:"
-
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "�廨廖廬 �廨廢� 廩� GTK+"
-
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "��� �� 廨廡 ��廩��� �廨�廩�� ���� 廚廣��)."
-
-#~ msgid "Calling ... "
-#~ msgstr "�廬廡廩廨 ..."
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "廩廨廩廨廬 廬廣���廬 ��-廬廡廚�"
-
-#~ msgid ""
-#~ "The certificate chain presented by %s does not have a valid digital "
-#~ "signature from the Certificate Authority from which it claims to have a "
-#~ "signature."
-#~ msgstr ""
-#~ "廩廨廩廨廬 �廬廣���廬 廩��廢�� 廣� ��� %s �� ����� �廬��� 廬廡廚� �廨廩���廬 ���廚廡� 廩��� "
-#~ "��� ��廣�廬 廩�廩 �� �廬���."
-
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "�廬��廬 廨廩�廬 ��廚廡�廬 �� 廬廡廚�"
-
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "���廨�廬 �廖廬廨廬 �廢�廨廚�廬/廣����"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "���� ��廨 �������"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "��廖廨 廚廣���廬 �廩廬�廩 (��廡�廬)"
-
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "�廩���� �廣��, �廩 ��廩廬 ��廬廨 廩� Yahoo."
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "���廖廡廨�(�廖廡�廬)"
-
-#~ msgid ""
-#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
-#~ "im\">support@pidgin.im</A><BR/><BR/>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">廣�廨� �廨� �������:</FONT> <A HREF=\"mailto:support@pidgin."
-#~ "im\">support@pidgin.im</A><BR/><BR/>"
-
-#~ 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"
-#~ "  -f, --force-online  force online, regardless of network status\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ "  -m, --multiple      do not ensure single instance\n"
-#~ "  -n, --nologin       don't automatically login\n"
-#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
-#~ "NAME\n"
-#~ "                      specifies account(s) to use, separated by commas.\n"
-#~ "                      Without this only the first account will be "
-#~ "enabled).\n"
-#~ "  --display=DISPLAY   X display to use\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ msgstr ""
-#~ "%s %s\n"
-#~ "廩���廩: %s [�廚廩廨�廬]...\n"
-#~ "\n"
-#~ "  -c, --config=廖廚廨��  �廩廬�廩 �廖廚廨��� �廡�廢� ���廨�廬\n"
-#~ "  -d, --debug         廩�� ���廣�廬 ��廚�� ����� �-stdout\n"
-#~ "  -f, --force-online  ��廛 �廢� �廡���, ��� ��廬�廩� ��廢� �廨廩廬\n"
-#~ "  -h, --help          �廢� ���廣� �� �廢�\n"
-#~ "  -m, --multiple      �� 廬���� 廩廨廡 廣�廬廡 ��� 廨廛\n"
-#~ "  -n, --nologin       �� 廬廬��廨 �������廬\n"
-#~ "  -l, --login[=廩��廬]  ����廖 �������廬 )�廚廩廨�廬 �廬廬 廩��廬 �廩����廬 ���廨,\n"
-#~ "                      ���� �� 廩� 廢廨�� ����廬 廚廖�廡)\n"
-#~ "  --display=DISPLAY   �廖廚廨 �廬廢��� ��廩廬�廩 �� ������廬 X\n"
-#~ "  -v, --version       �廢� �廬 ���廨廖�廩� �廬���� �廢�\n"
-
-#~ 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"
-#~ "  -f, --force-online  force online, regardless of network status\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ "  -m, --multiple      do not ensure single instance\n"
-#~ "  -n, --nologin       don't automatically login\n"
-#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
-#~ "NAME\n"
-#~ "                      specifies account(s) to use, separated by commas.\n"
-#~ "                      Without this only the first account will be "
-#~ "enabled).\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ msgstr ""
-#~ "%s %s\n"
-#~ "廩���廩: %s [�廚廩廨�廬]...\n"
-#~ "\n"
-#~ "  -c, --config=廖廚廨��  �廩廬�廩 �廖廚廨��� �廡�廢� ���廨�廬\n"
-#~ "  -d, --debug         廩�� ���廣�廬 ��廚�� ����� �-stdout\n"
-#~ "  -f, --force-online  ��廛 �廢� �廡���, ��� ��廬�廩� ��廢� �廨廩廬\n"
-#~ "  -h, --help          �廢� ���廣� �� �廢�\n"
-#~ "  -m, --multiple      �� 廬���� 廩廨廡 廣�廬廡 ��� 廨廛\n"
-#~ "  -n, --nologin       �� 廬廬��廨 �������廬\n"
-#~ "  -l, --login[=廩��廬]  ����廖 �������廬 )�廚廩廨�廬 �廬廬 廩��廬 �廩����廬 ���廨,\n"
-#~ "                      ���� �� 廩� 廢廨�� ����廬 廚廖�廡)\n"
-#~ "  --display=DISPLAY   �廖廚廨 �廬廢��� ��廩廬�廩 �� ������廬 X\n"
-#~ "  -v, --version       �廢� �廬 ��廨廖� 廩� �廬���� �廢�\n"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "��廩��� �廣廬 廚廬��廬 �廡��廛"
-
-#~ msgid "_Resume"
-#~ msgstr "�_�廩�"
-
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "廩廨廬 ����廨 BOSH �廩��廩"
-
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "�� ��廬� 廩�� ��廣�� �廬 ��� �廚廬��廬 �-SILC"
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s 廖廨� �廬 ������ 廩�� ��廣��� ���廨 \"%s\" ����� 廩-\"%s\"."
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "������ ���廬�"
-
-#, fuzzy
-#~ msgid "_Proxy"
-#~ msgstr "�廬���"
-
-#~ msgid "Cannot open socket"
-#~ msgstr "��� �廚廩廨�廬 �廚廬�� 廩廡廣"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "��� �廚廩廨�廬 ��廡廩�� �廩廡廣 ��"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "��� �廚廩廨�廬 �廡廨�� �廬 �廩廡廣"
-
-#~ msgid "Connection failed."
-#~ msgstr "��廬��廨�廬 ��廩��."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "�廩廨廬 �廬�廬廡"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "�� ��廬� ��廬��廨 �廩廨廬"
-
-#~ msgid "Read error"
-#~ msgstr "廩���� �廡廨���"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "�� ��廬� ��廢�廨 ����廨 廣� �廩廨廬:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "廩���� ��廬���"
-
-#~ msgid "Last Activity"
-#~ msgstr "廚廣���廬 ��廨���"
-
-#~ msgid "Service Discovery Info"
-#~ msgstr "���廣 廩� 廩�廨�廬 廬���廬"
-
-#~ msgid "Service Discovery Items"
-#~ msgstr "廚廨��� 廩�廨�廬 廬���廬"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "�廬���廬 ��廨���廬 �廖�����廬"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "廢'�� �廨��� �廩廬�廩��"
-
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "���廣 �����廬� �廢'�� �廨��� �廩廬�廩��"
-
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "�廨��-�廬���� �廚� �廖�廨"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "廚廡���廬 �����廬"
-
-#~ msgid "PubSub Service"
-#~ msgstr "廩�廨�廬 PubSub"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "�廨��-�廬���� 廩� SOCKS5"
-
-#~ msgid "Out of Band Data"
-#~ msgstr "���廣 廩�� �廚� 廖�廨"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#~ msgid "In-Band Registration"
-#~ msgstr "廨�廩�� �廨� �廬�廨"
-
-#~ msgid "User Location"
-#~ msgstr "��廡�� �廩廬�廩"
-
-#~ msgid "User Avatar"
-#~ msgstr "廬���廬 �廩廬�廩"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "�廬廨廣�廬 廣� �廢�� 廢'��"
-
-#~ msgid "Software Version"
-#~ msgstr "��廨廖廬 廬����"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "��廬��� �廨�"
-
-#~ msgid "User Activity"
-#~ msgstr "廚廣���廬 �廩廬�廩"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "�����廬 �廩�廬"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "��廡���� �����廨 ��廢廚�"
-
-#~ msgid "User Tune"
-#~ msgstr "廩�廨 �廩廬�廩"
-
-#~ msgid "Roster Item Exchange"
-#~ msgstr "���廚廬 廚廨��� 廨廩���"
-
-#~ msgid "Reachability Address"
-#~ msgstr "�廬��廬 �����廬"
-
-#~ msgid "Jingle"
-#~ msgstr "�'����"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "廢��� �'����"
-
-#~ msgid "User Nickname"
-#~ msgstr "����� �廩廬�廩"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "�'���� ICE UDP"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "�'���� ICE TCP"
-
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "�'���� UDP ��-�廣���"
-
-#~ msgid "Jingle Video"
-#~ msgstr "�'���� �����"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "�'���� DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "廡���廬 ���廣�廬"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "廚�廨廖�� �廚廬� 廢���廨�"
-
-#~ msgid "User Chatting"
-#~ msgstr "�廩廬�廩 �廢'���"
-
-#~ msgid "User Browsing"
-#~ msgstr "�廩廬�廩 ���廩"
-
-#~ msgid "User Gaming"
-#~ msgstr "�廩廬�廩 �廩�廡"
-
-#~ msgid "User Viewing"
-#~ msgstr "�廩廬�廩 廢�廚�"
-
-#~ msgid "Stanza Encryption"
-#~ msgstr "�廢廚�廬 廖����"
-
-#~ msgid "Entity Time"
-#~ msgstr "��� �廩�廬"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "�廩��� �廣���"
-
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "�����廡�� ���廣 廩�廬�廚���"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "廖廚廨��廬 廡�廢�� �廩�廬�廝"
-
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "廩�廨�廬 廬���廬 STUN 廣��廨 �'����"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "��廡�� 廚廩�� �����廨 ���廢廚�"
-
-#~ msgid "Hop Check"
-#~ msgstr "���廡廬 廡廚�廢�廬"
-
-#~ msgid "Read Error"
-#~ msgstr "廩���� �廡廨���"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "�廩� ��廬��廨�廬 �廩廨廬"
-
-#~ msgid "Read buffer full (2)"
-#~ msgstr "廬�廨-�廡廨��� ��� (2)"
-
-#~ msgid "Unparseable message"
-#~ msgstr "���廣廬 廩�� ��廬�廬 �廚�廣���"
-
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "�� ��廬� ��廬��廨 �廩廨廬: %s (%d)"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "�� ��廬� ��廬��廨 (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "��廬廡廬 ����� 廩�廬��廨廬 ���廩� ��廨."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "廩����. �� ��廬廡�廬 廬���� �-SSL."
-
-#~ msgid "Incorrect password."
-#~ msgstr "廖�廖�� �� �����."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "�� ��廬� ��廬��廨 �廩廨廬 �-BOS:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "��廬�� �廬��廬廡/� �廡廨��. �廩 ����廡 �廬 %s �廣�������."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "�� ��廬� ��廬��廨"
-
-#~ msgid "Invalid username."
-#~ msgstr "廩� �廩廬�廩 �� 廬廡廝."
-
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "��� �廚廩廨�廬 �廚�廣��� ��廩�� �廣廬 ����廬 �廩廬�廩"
-
-#~ msgid "Connection lost"
-#~ msgstr "�����廨 ���"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "�� ��廬� ��廢�� �廬��廬 廩廨廬"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "�����廨 �廖�廨 (�廬���)"
-
-#~ msgid "Connection reset"
-#~ msgstr "�����廨 ��廬��"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "廩���� �廡廨��廬 �廬���� ��廩廡廣: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "�� ��廬� ��廬��廨 �廩廨廬"
-
-#~ msgid "Could not write"
-#~ msgstr "�� ��廬� ��廬��"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣-廡廩�"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "�� ��廬� ��廢�� �廬��廬 廩廨廬"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "廖�廖�� �� �����"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "�� ��� ��廬� ��廢�廨 ����廨 廣� %s:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo �廚�"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "廩廨廬 �-Pager ��廚�"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "廩廨廬 �廚�� ��廣�廨廬 廡�廢��"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "��� �����廨 廣� �廩廨廬\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "�� ��廬� ��廢�� �廬��廬 廩廨廬"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr "�廩廨廬 ��廨廩 TLS/SSL ��廬��廨�廬. �� ��廢�� 廬���� �-TLS/SSL."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "�廖廬廨廬 �����廬 廩���"
-
-#~ msgid "More Data needed"
-#~ msgstr "���廛 ���廣 ��廖廝"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "�� ����� 廡�廢�廨-�廨� �廡廩廨 廣� ������."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "�廩 ����廨 廬���� 廣��廨 ������."
-
-#~ msgid "Activate which ID?"
-#~ msgstr "���� ID ��廚廣��?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "廢�廣 �廖��"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "廢�廣 �廩�� 廩� �廖��"
-
-#~ msgid "Interface colors"
-#~ msgstr "廢�廣� ��廩廡"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "���� 廚廨��� ��廩廡"
-
-#~ msgid "Invite message"
-#~ msgstr "���廣廬 �����"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "�廩 ����� �廬 廩� ��廩廬�廩 廩�廨廢��� ������,\n"
-#~ "��� 廣� ���廣廬 ����� ��廚廢�����廬."
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "�� ���� ����廨 �廬 廨廩��廬 ��廬���廬 廩� MSN"
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] "��� �����廨 �� �廩廨廬 (�� �廬廡�� ���廣 廬�� %d 廩���)"
-#~ msgstr[1] "��� �����廨 �� �廩廨廬 (�� �廬廡�� ���廣 廬�� %d 廩���廬)"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "��廬�� �廬��廬廡/� �廡廨��. ���� 廬廨廢/� ���廣�廨 �-TOC 廣� �廩廨 �� �廬�廡�. �廚廩廨 ����廡 "
-#~ "�%s �廣�������."
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "��廖廝 ��廩 廡廩廨"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "��� �廚廩廨�廬 �廚�廣��� ��廩�� �廣廬 ����廬 �廩廬�廩"
-
-#~ msgid "Keep alive error"
-#~ msgstr "廩���� ��廩�廨-��"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "���� �廬廡廩�廨廬 廣� 廩廨廬:\n"
-#~ "%d, %s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "廩廨廬 ��廬��廨�廬"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "��廩��� �廩���廬 ���廣�."
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "���� ��廨/� �廡��廢� \"%s\"\n"
-
-#~ msgid "Looking up %s"
-#~ msgstr "��廚廩 �廬 %s..."
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "��廬��廨�廬 �� %s �� �廢����."
-
-#~ msgid "Signon: %s"
-#~ msgstr "�廬��廨: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "��� �廚廩廨�廬 ��廬�� �� �廡��廛 %s"
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "��� �廚廩廨�廬 �廡廨�� �廬 �廡��廛 %s."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "���廣� �廨��� ���, %s ������� ���廨���� �廡���."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s ���� ����廨 �廨�廣."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "���廨� 廩� %s  ���� ��廬廨廬."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr "���� ���廣�; �廬� 廣��廨 廣� ����廬 ����廨�廬 廩� �廩廨廬."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "廢'�� �-%s ���� ����."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "�廬� 廩��� ���廣�廬 �� %s ��廨 ����."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "廚廖廚廖廬 ���廣� �-%s ����� 廩��� ���廬� �廨��� ���."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "廚廖廚廖廬 ���廣� �-%s ����� 廩��� �廩��� ��廨 ���."
-
-#~ msgid "Failure."
-#~ msgstr "��廩���."
-
-#~ msgid "Too many matches."
-#~ msgstr "��廬廨 ���� 廬�廢��廬"
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "���廚�廩 �廡�廡 ���廬廨 ����廨��."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "廩�廨�廬 ���廨�� ���� ���� ����廬."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "��廚�廩 ����\"� �����."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "�廬廣�� ����廬 ��廚廬�."
-
-#~ msgid "No keywords."
-#~ msgstr "��� ����廬 �廚廬�."
-
-#~ msgid "User has no directory information."
-#~ msgstr "��� ���廣 廣��廨 �廩廬�廩 ��"
-
-#~ msgid "Country not supported."
-#~ msgstr "������ ���� �廬��廬."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "�廩� ���廨: %s"
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "廩� �廩廬�廩 �� 廖�廖�� 廩�����."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "�廩�廨�廬 ���� ���� ����廬."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr "廨�廬 ����廨� 廩�� ����� ���� �廨�廣 ���� �����廖 ��廣廨�廬."
-
-#~ 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 ""
-#~ "�廬��廨廬 ��廬�廬廡廬 �廬��廨�廬 ����� ����. ��廬� 10 �廡�廬 ��廖� 廩��廬. �� 廬�廩�� "
-#~ "��廖�廬, 廬���廛 ���廬�� �廚��� ��廬廨."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "�廨廣� 廩���� �� ���廨廬, %d, ���廣: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "廩� �廡��廢� 廩���"
-
-#~ msgid "Connection Closed"
-#~ msgstr "�����廨 �廖�廨."
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "��廬�� �廬廩���..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC ��廨 �� �-pause 廩��. ��廬� �廩��� ���廣�廬 廩��."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "�廖�廖�� 廩�� 廩��廬� ��廢���."
-
-#~ msgid "Get Dir Info"
-#~ msgstr "�廩� ���廣 廣� ��廩廬�廩"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "廡�廣 ���廣 廣� ��廩廬�廩"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "�� ��廬� �廚廬�� %s ��廬���"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr "�廩� ��廣�廨廬 �廡��廛, ��廨�� 廢� 廩�� ����"
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "�� ��廬� ���廨 �廬 ��廣�廨�."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr "�� ��廬� ��廬�� �廬 廨�廩廬 �廡��廛. �廡��廛 �� ��廣�廨."
-
-#~ msgid "Save As..."
-#~ msgstr "廩��廨 �廩�..."
-
-#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-#~ msgstr[0] "%s ��廡廩 �-%s �廡�� %d 廡��廛: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s ��廡廩 �-%s �廡�� %d 廡�廢��: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s ��廡廩/廬 ��� �廩��� ��/�� 廡��廛"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "廬�廖廝 廚廨���廡�� TOC"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "廚廨�� ��廩廬�廩 %s ���� ������"
-
-#~ msgid "%s Options"
-#~ msgstr "%s �廚廩廨���廬"
-
-#~ msgid "Proxy Options"
-#~ msgstr "�廚廩廨���廬 廚廨�廡廖�"
-
-#~ msgid "By log size"
-#~ msgstr "�廚� ���� ���� �廩���廬"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_廚廬� �廬 �廡�廩�廨 ��廚�廚�"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "_廬���廬 �����"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "廡�廢�廨�� �_�������"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "_���� �廬 ���� �廩��� �廣廬 廡��廬 ���廣�廬 廢'��"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "廡��廢� �廩� �� ��廨 廡���廬."
-
-#~ msgid "Primary Information"
-#~ msgstr "���廣 廨�廩�"
-
-#~ msgid "Blood Type"
-#~ msgstr "廖�� ��"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "廣��� �廬 ����廣 廩��"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "���廨�廬:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr "��� �廨�廣 廬���� ��廬��� ��廩�廬 廩� 廚廨廢�廚��. �廩 ����廨 �廬���� �廬�� %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "廚廨廢�廝 QQ �� 廬廡廝"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "���廬 �廬 �廡廩廬 %d"
-
-#~ msgid "Reject request"
-#~ msgstr "��� �廡廩�"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "��廩��� ���廖廚廬 ��廩-廡廩廨 廣� �廡廩廬 ����廬"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "�� ��廬� ��廣�� �廬 廨廩��廬 ��廩� �廡廩廨"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "�廖廚廨 QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "廬���廨 �廡��廢�"
-
-#~ msgid "Auth"
-#~ msgstr "����廬"
-
-#~ msgid "Approve"
-#~ msgstr "�廩廨"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "�廡廩廬� ��廢�廨廝 �廡��廢� %d ���廬� 廣� ��� ����� %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "�廬/� [%d] 廣��廬 �廬 廡��廢� \"%d\""
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "�廬/� [%d] ��廖廚廬 �� �廡��廢� \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "��� ���� ��廨/�"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "�廡廩� 廩����"
-
-#~ msgid "I am the admin"
-#~ msgstr "��� �����/廬"
-
-#~ msgid "Unknown status"
-#~ msgstr "�廢� �� ���廣"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "�廖廨 廡��廢�"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "���廬 ����-廡��廢� ���廛 ����� �廬廡廝"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "��� �廨廢��� �廣��� �廬 Qun ��?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "��� �廨廢��� ��廩廨 �廬 ��廡廩�?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "��廚廨 ��廚��"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "���廣 廣� �廣廨�廛"
-
-#~ msgid "System Message"
-#~ msgstr "���廣廬 �廣廨�廬"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>�廬��廬 ����廨 ��廨���</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>��� ����廨 ��廨��</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "廡�廣 �廬 ����廣 廩��"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "廣��� QQ Qun ��"
-
-#~ msgid "Block this buddy"
-#~ msgstr "�廖�� �廩廬�廩 ��"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "廡��-廬���� 廩���, 0x%02X"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "廩���� ����� 廩���� �廖�廖��"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "��廩��� ��廬��廨�廬 �廩廨廬"
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "�廬��廨 廣� 廩廨廬 %s, ��廖����廬 %d"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "��� �廨廢��� ��廩廨 �廬 ��廡廩�?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "��� �廨廢��� ���廖�廝 �廬 ��廩廬�廩 ���?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s ��廖�廚/� ��廬� [%s] �廨廩��廬 ��廩� �廡廩廨 廩�� �� 廩��."
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "��廩 �廡廩廨"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s 廨�廢� ���廖�廝 ��廬� [%s] ���廨"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s ���� �廨廩��廬 ��廩�-�廡廩廨 廩��"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "��� �廨廢��� ���廖�廝 ��廬�?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "廚�廨� �廩廨廬"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "�廢� ��廨��廡 ���廬廡"
-
-#~ msgid "developer"
-#~ msgstr "�廚廬�"
-
-#~ msgid "XMPP developer"
-#~ msgstr "�廚廬� XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "�����"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "%s 廩�廩���廩 ��� ��廨廖� %s. ���廨廖� ������廬 ��� %s.  ��廬� ��廩�� ��廬� �-<a "
-#~ "href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>廨廩��廬 廩������:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "廡��廬 廖���-廡��廛 �廣廬 廡廨��� �廬���� �-resolver"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "����廣 廩�� 廣����"
-
-#~ msgid "Input your reason:"
-#~ msgstr "���/� �廬 廖��廬�:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "�廖廨廬 ��廩-廡廩廨 ��廢���"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "�廖廨廬 �廬 廣廢�� ��廢��� �廨廩��廬 ��廩� �廡廩廨 廩� ��廨�"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "��廖廚廬 �廬 %d �廨廩��廬 ��廩�-廡廩廨"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid �� 廬廡廝"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "�廩 ����� ID 廩� �廡��廢� ���廢���廬"
-
-#~ msgid "Reason: %s"
-#~ msgstr "廖���: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr "�廡廩廬� ��廢�廨廝 �廡��廢� %d ��廩廨� 廣� ��� ����� %d"
-
-#~ msgid "I am applying to join"
-#~ msgstr "��� ��廡廩/廬 ��廢�廨廝"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "廣�廬 �廬 �廡��廢� ��廢��� "
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "����廬 �廡��廢廬 QQ"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "�廡廩廬 �����廬 廩�� �廬廡��� ����� 廣� ��� 廩廨廬 �-QQ"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "���/� �廬 廖��廬�:"
-
-#~ msgid " Space"
-#~ msgstr " 廖廚��廖"
-
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>廩� ��廩� ���廬�</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "�廢� ���廣 廣� �����廨"
-
-#~ msgid "resend interval(s)"
-#~ msgstr "廚廨廡 ��� ��� 廩����廬 ���廨�廬"
-
-#~ msgid "hostname is NULL or port is 0"
-#~ msgstr "廩� ���廩� 廨�廡, �� �廖廚廨 �廩廡廣 0"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "�� ��廬� �����廖. �廩 ����廡 ����� 廨�廩�� ������"
-
-#~ msgid "Failed room reply"
-#~ msgstr "�廩� ��廩�� ����廨"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "��廩廬�廩 %s 廖廨� ��廡廩廬�"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "��廩廬�廩 %s ��廩廨 �廬 �廡廩廬�"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "���廣� ��廬: %s"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "廡�� [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "廩���� �廚廣��廬-廡��廢�"
-
-#~ msgid "Error setting socket options"
-#~ msgstr "廩���� �廡��廣廬 ���廨�廬 �廩廡廣"
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr "����廬 ���� Windows Live: �� ��廬� ��廢�� 廖�� ����廬 �廬���廬 �廩廨廬"
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "����廬 ���� Windows Live ��廩��"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "�廩��� �廨�廩廣 ���"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "��廡�� �廨�廩廣 ���"
-
-#~ msgid "Available Message"
-#~ msgstr "���廣廬 �����廬"
-
-#~ msgid "Away Message"
-#~ msgstr "���廣廬 廨���廡 ����廩�"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr " <i>(廩��廝)</i>"
-
-#~ msgid "TCP Address"
-#~ msgstr "�廬��廬 TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "�廬��廬 UDP"
-
-#, fuzzy
-#~ msgid "Display Statistics"
-#~ msgstr "廖���廖��廡�廬 廩� �廩廨廬"
-
-#~ msgid "Screen name:"
-#~ msgstr "廩� �廬廢���:"
-
-#~ msgid "Someone says your screen name in chat"
-#~ msgstr "��廩�� ����廨 �廬 廩�� �廢'��"
-
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr "�廩廨廬 ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬.���廩�� ��� ��廬?"
-
-#~ msgid "Use GSSAPI (Kerberos v5) for authentication"
-#~ msgstr "�廩廬�廩 �GSSAPI (廡廨�廨�廖 ��廨廖� 5) �廢�廨� ����廬"
-
-#~ msgid "Invalid screen name"
-#~ msgstr "廩� �廬廢��� �� 廬廡��"
-
-#~ msgid "Invalid screen name."
-#~ msgstr "廩�-廬廢��� �� 廬廡��."
-
-#~ msgid "Screen _name:"
-#~ msgstr "廩� �廬廢���:"
-
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "%s%s<span weight=\"bold\">��廬� 廣\"�:</span>\t%s\n"
-#~ "<span weight=\"bold\">�廬廨:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">廩� 廡��廛:</span>\t\t%s"
-
-#~ msgid ""
-#~ "The contact availability plugin (cap) is used to display statistical "
-#~ "information about buddies in a users contact list."
-#~ msgstr ""
-#~ "�廬�廖廝 ������ �����廬 ��廩�-廡廩廨 �廢�� ���廣 廖���廖�� 廣� ���廨�� �廨廩��廬 ��廩� �廡廩廨 "
-#~ "廩� ��廩廬�廩."
--- a/po/sk.po	Mon Feb 15 06:39:09 2010 +0000
+++ b/po/sk.po	Tue Feb 16 15:16:28 2010 +0000
@@ -1,7 +1,7 @@
 # translation of pidgin.po to Slovak
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Pidgin package.
-# loptosko <loptosko@gmail.com>, 2007, 2008, 2009.
+# loptosko <loptosko@gmail.com>, 2007, 2008, 2009, 2010.
 # Jozef K叩�er <quickparser@gmail.com>, 2007.
 # Ivan Mas叩r <helix84@centrum.sk>, 2007.
 # Pavol Kla�ansk箪 <pavolzetor@gmail.com>, 2008.
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2009-09-03 14:47+0100\n"
+"POT-Creation-Date: 2010-02-15 18:31-0800\n"
+"PO-Revision-Date: 2010-02-15 21:06+0100\n"
 "Last-Translator: loptosko <loptosko@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -635,9 +635,8 @@
 msgid "Enable Sounds"
 msgstr "Zapn炭泥 zvuky"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Nepodarilo sa pripoji泥"
+msgstr "Nie ste pripojen箪."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATICK� ODPOVE�> "
@@ -649,9 +648,8 @@
 msgstr[1] "Zoznam %d pou転鱈vate直ov:\n"
 msgstr[2] "Zoznam %d pou転鱈vate直ov:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Podporovan辿 ladiace vo直by s炭:  version"
+msgstr "Podporovan辿 ladiace vo直by s炭: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Tento pr鱈kaz neexistuje (v tejto situ叩cii)."
@@ -1529,10 +1527,10 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL pre vy邸邸ie: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "�akajte, pros鱈m, k箪m TinyURL z鱈ska krat邸iu URL ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "TinyURL vytv叩ra泥 iba pre adresy tejto d頂転ky alebo dlh邸ie"
@@ -1552,6 +1550,7 @@
 msgid "Online"
 msgstr "Prihl叩sen箪"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Odhl叩sen箪"
 
@@ -1661,6 +1660,8 @@
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Certifik叩t nie je d担verihodn箪, preto転e 転iadny z certifik叩tov, ktor辿 ho m担転u "
+"overi泥, moment叩lne nie je d担verihodn箪.  "
 
 msgid "The certificate is not valid yet."
 msgstr "Certifik叩t zatia直 nie je platn箪."
@@ -1892,9 +1893,9 @@
 msgid "Resolver process exited without answering our request"
 msgstr "Proces resolvera bol ukon�en箪 bez toho, aby odpovedal na po転iadavku"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Chyba pri preklade %s: %d"
+msgstr "Chyba pri preklade %s na punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1941,6 +1942,9 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nie je be転n箪 s炭bor. Odmietam ho prep鱈sa泥.\n"
 
+msgid "File is not readable."
+msgstr "Nie je mo転n辿 �鱈ta泥 s炭bor."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "Pou転鱈vate直 %s v叩m chce posla泥 s炭bor %s (%s)"
@@ -2203,17 +2207,14 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Vyskytla sa z叩va転n叩 chyba v Farsight2."
 
-#, fuzzy
 msgid "Conference error"
-msgstr "Chyba konferencie."
-
-#, fuzzy
+msgstr "Chyba konferencie"
+
 msgid "Error with your microphone"
-msgstr "Chyba mikrof坦nu."
-
-#, fuzzy
+msgstr "Chyba mikrof坦nu"
+
 msgid "Error with your webcam"
-msgstr "Chyba webkamery."
+msgstr "Chyba webkamery"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3149,10 +3150,12 @@
 msgid "Add to chat..."
 msgstr "Prida泥 na chat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Prihl叩sen箪"
 
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3779,6 +3782,13 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vy転aduje textov炭 autentifik叩ciu cez neza邸ifrovan箪 pr炭d"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "Chybn叩 odpove� zo servera"
+
+msgid "Server does not use any supported authentication method"
+msgstr "Server nepou転鱈va 転iadny z podporovan箪ch sp担sobov autentifik叩cie"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3790,25 +3800,34 @@
 msgid "Plaintext Authentication"
 msgstr "�isto textov叩 autentifik叩cia"
 
-msgid "SASL authentication failed"
-msgstr "SASL autentifik叩cia zlyhala"
-
-msgid "Invalid response from server"
-msgstr "Chybn叩 odpove� zo servera"
-
-msgid "Server does not use any supported authentication method"
-msgstr "Server nepou転鱈va 転iadny z podporovan箪ch sp担sobov autentifik叩cie"
-
 msgid "You require encryption, but it is not available on this server."
 msgstr "Po転adovali ste 邸ifrovanie, ale na tomto serveri nie je dostupn辿."
 
 msgid "Invalid challenge from server"
 msgstr "Chybn叩 v箪zva zo servera"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "Server pova転uje autentiz叩ciu za dokon�en炭, ale klient nie"
+
+msgid "SASL authentication failed"
+msgstr "SASL autentifik叩cia zlyhala"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Chyba SASL: %s"
 
+msgid "Unable to canonicalize username"
+msgstr "Nebolo mo転n辿 kanonikalizova泥 pou転鱈vate直sk辿 meno"
+
+msgid "Unable to canonicalize password"
+msgstr "Nebolo mo転n辿 kanonikalizova泥 heslo"
+
+msgid "Malicious challenge from server"
+msgstr "Nebezpe�n叩 v箪zva zo servera"
+
+msgid "Unexpected response from server"
+msgstr "Ne�akan叩 odpove� zo servera"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Mana転辿r pripojen鱈 BOSH preru邸il va邸e sedenie."
 
@@ -3909,13 +3928,16 @@
 msgid "Resource"
 msgstr "Zdroj"
 
+msgid "Uptime"
+msgstr "�as v prev叩dzke"
+
+msgid "Logged Off"
+msgstr "Odhl叩sen箪"
+
 #, c-format
 msgid "%s ago"
 msgstr "%s dozadu"
 
-msgid "Logged Off"
-msgstr "Odhl叩sen箪"
-
 msgid "Middle Name"
 msgstr "Prostredn辿 meno"
 
@@ -3964,12 +3986,14 @@
 msgid "Log Out"
 msgstr "Odhl叩si泥"
 
+#. 2
 msgid "Chatty"
 msgstr "Zhovor�iv箪"
 
 msgid "Extended Away"
 msgstr "Dlh邸ie nepr鱈tomn箪"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "Neru邸i泥"
 
@@ -4104,12 +4128,6 @@
 msgid "Ping timed out"
 msgstr "Ping vypr邸al"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Neboli n叩jden辿 in辿 met坦dy XMPP spojenia po tom �o zlyhalo priame spojenie."
-
 msgid "Invalid XMPP ID"
 msgstr "Chybn辿 XMPP ID"
 
@@ -4234,6 +4252,7 @@
 msgid "None (To pending)"
 msgstr "貼iadny (�ak叩 sa)"
 
+#. 0
 msgid "None"
 msgstr "貼iadne"
 
@@ -4541,9 +4560,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavenie miestnosti chatu."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [miestnos泥]:  Opust鱈 miestnos泥."
+msgstr "part [spr叩va]:  Opust鱈 miestnos泥."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Zaregistrova泥 sa v diskusnej miestnosti."
@@ -4663,6 +4681,9 @@
 msgid "(Code %s)"
 msgstr "(K坦d %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Vlastn箪 smajl鱈k v spr叩ve je na odoslanie pr鱈li邸 ve直k箪."
+
 msgid "XML Parse error"
 msgstr "Chyba pri spracovan鱈 XML"
 
@@ -5071,6 +5092,10 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "Va邸e nov辿 MSN priate直sk辿 meno je pr鱈li邸 dlh辿."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Vypl�te priate直sk辿 meno pre %s."
+
 msgid "Set your friendly name."
 msgstr "Vypl�te va邸e priate直sk辿 meno."
 
@@ -5203,13 +5228,13 @@
 "Pre MSN je potrebn叩 podpora SSL. Nain邸talujte, pros鱈m, podporovan炭 SSL "
 "kni転nicu."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"Nepodarilo sa prida泥 priate直a %s, preto転e pou転鱈vate直sk辿 meno je chybn辿.  "
-"Pou転鱈vate直sk辿 men叩 musia by泥 spr叩vna e-mailov叩 adresa."
+"Nepodarilo sa prida泥 priate直a %s preto転e pou転鱈vate直sk辿 meno je chybn辿.  "
+"Pou転鱈vate直sk辿 men叩 musia by泥 platn叩 e-mailov叩 adresa."
 
 msgid "Unable to Add"
 msgstr "Nepodarilo sa prida泥"
@@ -5432,9 +5457,8 @@
 msgid "Unknown error (%d)"
 msgstr "Nezn叩ma chyba (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Nebolo mo転n辿 prida泥 pou転鱈vate直a"
+msgstr "Nebolo mo転n辿 odstr叩ni泥 pou転鱈vate直a"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiln叩 spr叩va nebola odoslan叩, preto転e bola pr鱈li邸 dlh叩."
@@ -5670,28 +5694,82 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "Pou転鱈vate直 %s v叩s odstr叩nil zo svojho zoznamu priate直ov."
 
+#. 1
+msgid "Angry"
+msgstr "Nahnevan箪"
+
+#. 2
+msgid "Excited"
+msgstr "Vzru邸en箪"
+
+#. 3
+msgid "Grumpy"
+msgstr "Urazen箪"
+
+#. 4
+msgid "Happy"
+msgstr "�泥astn箪"
+
+#. 5
+msgid "In Love"
+msgstr "Za直炭ben箪"
+
+#. 6
+msgid "Invincible"
+msgstr "Neprekonate直n箪"
+
+#. 7
+msgid "Sad"
+msgstr "Smutn箪"
+
+#. 8
+msgid "Hot"
+msgstr "Hor炭�ava"
+
+#. 9
+msgid "Sick"
+msgstr "Chor箪"
+
+#. 10
+msgid "Sleepy"
+msgstr "Ospal箪"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Va邸a aktu叩lna n叩lada"
+msgstr "Aktu叩lna n叩lada"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "N叩lada pou転鱈vate直a"
-
-#, fuzzy
+msgstr "Nov叩 n叩lada"
+
 msgid "Change your Mood"
-msgstr "Zmeni泥 heslo"
-
-#, fuzzy
+msgstr "Zmeni泥 va邸u n叩ladu"
+
 msgid "How do you feel right now?"
-msgstr "Moment叩lne nie som pr鱈tomn箪"
+msgstr "Ako sa pr叩ve c鱈tite?"
+
+msgid "The PIN you entered is invalid."
+msgstr "Zadan箪 PIN je neplatn箪"
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Zadan箪 PIN m叩 chybn炭 d頂転ku [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN je neplatn箪. Mal by obsahova泥 iba �鱈slice [0-9]."
+
+msgid "The two PINs you entered do not match."
+msgstr "Dva PINy ktor辿 ste zadali sa nezhoduj炭."
+
+msgid "The name you entered is invalid."
+msgstr "Zadan辿 meno je neplatn辿"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "Narodeniny s炭 zadan辿 chybne. Spr叩vny form叩t m叩 by泥: 'RRRR-MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Chyba z叩pisu"
+msgstr "Chyba aktualiz叩cie profilu"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5699,354 +5777,300 @@
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "�daje z v叩邸ho profilu nie s炭 na�鱈tan辿. Pros鱈m, sk炭ste to znovu nesk担r."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Overi泥 PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Priezvisko"
+msgstr "Pou転鱈vate直sk辿 meno"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Skry泥 moje �鱈slo"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Telef坦nne �鱈slo na mobiln箪 telef坦n"
-
-#, fuzzy
+msgstr "�鱈slo na mobiln箪 telef坦n"
+
 msgid "Update your Profile"
-msgstr "Profil pou転鱈vate直a"
+msgstr "Aktualizova泥 v叩邸 profil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Tu m担転ete aktualizova泥 v叩邸 MXit profil"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Zobrazi泥 炭vod"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Nie je dostupn叩 転iadna 炭vodn叩 obrazovka"
+
 msgid "About"
-msgstr "O mne"
+msgstr "O module"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Zmeni泥 heslo..."
+msgstr "Zmeni泥 n叩ladu..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Zmeni泥 heslo..."
+msgstr "Zmeni泥 profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Zobrazi泥 z叩znam..."
+msgstr "Zobrazi泥 炭vod..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "O mne"
+msgstr "O module..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Spr叩va je pr鱈li邸 dlh叩."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
-
-#, fuzzy
+msgstr "S炭bor ktor箪 chcete posla泥 je pr鱈li邸 ve直k箪!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr ""
+"Nepodarilo sa pripoji泥 na MXit HTTP server. Skontrolujte, pros鱈m, va邸e "
+"nastavenie serveru."
+
 msgid "Logging In..."
-msgstr "Prihlasuje sa"
-
-#, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Nepodarilo sa pripoji泥 na server. Zadajte, pros鱈m, adresu servera, na ktor箪 "
-"sa chcete pripoji泥."
-
-#, fuzzy
+msgstr "Prihlasuje sa..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Nepodarilo sa pripoji泥 na MXit server. Skontrolujte, pros鱈m, va邸e nastavenie "
+"serveru."
+
 msgid "Connecting..."
-msgstr "Prip叩ja sa"
+msgstr "Prip叩ja sa..."
+
+msgid "The nick name you entered is invalid."
+msgstr "Zadan叩 prez箪vka je neplatn叩."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Zadan箪 PIN m叩 neplatn炭 d頂転ku [7-10]."
 
 #. mxit login name
 msgid "MXit Login Name"
-msgstr ""
+msgstr "MXit prihlasovacie meno"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Prez箪vka"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrova泥 nov箪 XMPP 炭�et"
-
-#, fuzzy
+msgstr "Registrova泥 nov箪 MXit 炭�et"
+
 msgid "Please fill in the following fields:"
-msgstr "Pros鱈m, vypl�te nasleduj炭ce pol鱈�ka"
+msgstr "Pros鱈m, vypl�te nasleduj炭ce pol鱈�ka:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Chyba kontaktovania MXit WAP str叩nky. Pros鱈m, sk炭ste to znovu nesk担r."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit moment叩lne nedok叩転e spracova泥 po転iadavku. Pros鱈m, sk炭ste to znovu "
+"nesk担r."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Zadan箪 nespr叩vny bezpe�nostn箪 k坦d. Pros鱈m, sk炭ste to znovu nesk担r."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Va邸e prihl叩senie vypr邸alo. Pros鱈m, sk炭ste to znovu nesk担r."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Vybran叩 chybn叩 krajina. Pros鱈m, sk炭ste to znovu nesk担r."
 
 msgid "Username is not registered. Please register first."
 msgstr ""
+"Pou転鱈vate直sk辿 meno nie je registrovan辿. Pros鱈m, najsk担r sa zaregistrujte."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "Pou転鱈vate直sk辿 meno u転 je registrovan辿. Pros鱈m, vyberte si in辿."
+
 msgid "Internal error. Please try again later."
-msgstr "Server je nedostupn箪; sk炭ste to nesk担r"
+msgstr "Vn炭torn叩 chyba. Pros鱈m, sk炭ste to znovu nesk担r."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "Nezadali ste bezpe�nostn箪 k坦d"
+
 msgid "Security Code"
-msgstr "Bezpe�nos泥 zapnut叩"
+msgstr "Bezpe�nostn箪 k坦d"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Zadajte k坦d"
-
-#, fuzzy
+msgstr "Zadajte bezpe�nostn箪 k坦d"
+
 msgid "Your Country"
-msgstr "Krajina"
-
-#, fuzzy
+msgstr "Va邸a krajina"
+
 msgid "Your Language"
-msgstr "Preferovan箪 jazyk"
+msgstr "V叩邸 jazyk"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Vy転adova泥 autoriz叩ciu"
+msgstr "MXit autoriz叩cia"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Overenie MXit 炭�tu"
+
 msgid "Retrieving User Information..."
-msgstr "Podrobnosti o serveri"
-
-#, fuzzy
+msgstr "Na�鱈tavaj炭 sa pou転鱈vate直sk辿 inform叩cie..."
+
+msgid "Loading menu..."
+msgstr "Na�鱈tava sa ponuka..."
+
 msgid "Status Message"
-msgstr "Odoslan辿 spr叩vy"
-
-#, fuzzy
+msgstr "Spr叩va statusu"
+
 msgid "Hidden Number"
-msgstr "Prostredn辿 meno"
-
-#, fuzzy
+msgstr "Skryt辿 �鱈slo"
+
 msgid "Your Mobile Number..."
-msgstr "Nastavi泥 �鱈slo mobiln辿ho telef坦nu..."
+msgstr "Va邸e mobiln辿 �鱈slo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
-
-#, fuzzy
+msgstr "WAP server"
+
 msgid "Connect via HTTP"
-msgstr "Pripoji泥 sa pomocou TCP"
+msgstr "Pripoji泥 sa cez HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Zapn炭泥 炭vodn炭 vyskakovaciu obrazovku"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "Stratili sme pripojenie na MXit. Pros鱈m, pripojte sa znovu."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Chyba spr叩vy XMPP"
-
-#, fuzzy
+msgstr "Chyba odoslania spr叩vy"
+
 msgid "Unable to process your request at this time"
-msgstr "Nepodarilo sa prelo転i泥 meno hostite直a"
+msgstr "Nepodarilo sa teraz spracova泥 va邸u po転iadavku"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Vypr邸al �as pri �akan鱈 na odpove� z MXit serveru."
+
 msgid "Successfully Logged In..."
-msgstr "Podarilo sa pripoji泥 do Qun"
-
-#, fuzzy
+msgstr "�spe邸ne prihl叩sen箪..."
+
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s v叩m poslal za邸ifrovan炭 spr叩vu ale tento klient to nepodporuje."
+
 msgid "Message Error"
-msgstr "Chyba spr叩vy XMPP"
+msgstr "Chyba spr叩vy"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Nebolo mo転n辿 vykona泥 presmerovanie pomocou zadan辿ho protokolu"
+
+msgid "An internal MXit server error occurred."
+msgstr "Vyskytla sa vn炭torn叩 chyba MXit serveru."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Chyba prihl叩senia: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Chyba odhl叩senia: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Chyba pripojenia"
-
-#, fuzzy
+msgstr "Chyba kontaktu"
+
 msgid "Message Sending Error"
-msgstr "Chyba spr叩vy XMPP"
-
-#, fuzzy
+msgstr "Chyba odoslania spr叩vy"
+
 msgid "Status Error"
-msgstr "Chyba pr炭du"
-
-#, fuzzy
+msgstr "Chyba stavu"
+
 msgid "Mood Error"
-msgstr "Chyba ikony"
-
-#, fuzzy
+msgstr "Chyba n叩lady"
+
 msgid "Invitation Error"
-msgstr "Chyba pri ru邸en鱈 registr叩cie"
-
-#, fuzzy
+msgstr "Chyba pozv叩nky"
+
 msgid "Contact Removal Error"
-msgstr "Chyba pripojenia"
-
-#, fuzzy
+msgstr "Chyba odstr叩nenia kontaktu"
+
 msgid "Subscription Error"
-msgstr "Prihl叩senie"
-
-#, fuzzy
+msgstr "Chyba zap鱈sania"
+
 msgid "Contact Update Error"
-msgstr "Chyba pripojenia"
-
-#, fuzzy
+msgstr "Chyba aktualiz叩cie kontaktu"
+
 msgid "File Transfer Error"
-msgstr "Prenos s炭borov"
-
-#, fuzzy
+msgstr "Chyba prenosu s炭boru"
+
 msgid "Cannot create MultiMx room"
-msgstr "Nebolo mo転n辿 vytvori泥 sledovanie"
-
-#, fuzzy
+msgstr "Nebolo mo転n辿 vytvori泥 MultiMx miestnos泥"
+
 msgid "MultiMx Invitation Error"
-msgstr "Chyba pri ru邸en鱈 registr叩cie"
-
-#, fuzzy
+msgstr "Chyba pozv叩nky MultiMx"
+
 msgid "Profile Error"
-msgstr "Chyba z叩pisu"
+msgstr "Chyba profilu"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Prijat箪 chybn箪 paket z MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (邸t叩dium �鱈tania 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (邸t叩dium �鱈tania 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (邸t叩dium �鱈tania 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (邸t叩dium �鱈tania 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (邸t叩dium �鱈tania 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
-
-msgid "Angry"
-msgstr "Nahnevan箪"
-
-msgid "Excited"
-msgstr "Vzru邸en箪"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Skupina"
-
-msgid "Happy"
-msgstr "�泥astn箪"
-
-msgid "In Love"
-msgstr "Za直炭ben箪"
-
-msgid "Invincible"
-msgstr "Neprekonate直n箪"
-
-msgid "Sad"
-msgstr "Smutn箪"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Hostite直:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Prez箪vka"
-
-msgid "Sleepy"
-msgstr "Ospal箪"
-
-#, fuzzy
+msgstr "Na MXit sa vyskytla chyba pripojenia. (邸t叩dium �鱈tania 0x06)"
+
 msgid "Pending"
-msgstr "Odosiela sa"
-
-#, fuzzy
+msgstr "�ak叩 sa"
+
 msgid "Invited"
-msgstr "Pozva泥"
-
-#, fuzzy
+msgstr "Pozvan箪"
+
 msgid "Rejected"
-msgstr "Odmietnu泥"
-
-#, fuzzy
+msgstr "Odmietnut箪"
+
 msgid "Deleted"
-msgstr "Odstr叩ni泥"
+msgstr "Odstr叩nen箪"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit reklama"
+
 msgid "More Information"
-msgstr "Pracovn辿 inform叩cie"
+msgstr "Viac inform叩ci鱈"
 
 #, c-format
 msgid "No such user: %s"
@@ -6660,7 +6684,10 @@
 msgid "Server port"
 msgstr "Port servera"
 
-#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Bola prijat叩 neo�ak叩van叩 odpove� od %s: %s"
+
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "Bola prijat叩 neo�ak叩van叩 odpove� od %s"
@@ -6678,6 +6705,13 @@
 msgid "Error requesting %s: %s"
 msgstr "Chyba pri po転adovan鱈 %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Server pre prihl叩senie vy転aduje, aby ste vyp鱈sali CAPTCHAg, ale tento klient "
+"nepodporuje CAPTCHA."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL neumo転�uje v叩邸mu pou転鱈vate直sk辿mu menu sa tu autentifikova泥"
 
@@ -6826,46 +6860,42 @@
 msgstr "Nie, pok箪m ste na AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Nie je mo転n辿 prija泥 spr叩vu kv担li rodi�ovsk箪m obmedzeniam"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "Nie je mo転n辿 posla泥 SMS bez ods炭hlasenia podmienok"
+
 msgid "Cannot send SMS"
-msgstr "Nepodarilo sa odosla泥 s炭bor"
+msgstr "Nepodarilo sa posla泥 SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Nie je mo転n辿 odosla泥 prie�inok."
+msgstr "Nie je mo転n辿 posla泥 SMS do tejto krajiny."
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Ned叩 sa odosla泥 SMS do nezn叩mej krajiny"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "��ty robotov nem担転u zaklada泥 rozhovory"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "��et robota nem担転e komunikova泥 s t箪mto pou転鱈vate直om"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "��et robota dosiahol limit komunik叩cie"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "��et robota dosiahol denn箪 limit komunik叩cie"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "��et robota dosiahol mesa�n箪 limit komunik叩cie"
+
 msgid "Unable to receive offline messages"
-msgstr "Nepodarilo sa odosla泥 spr叩vu."
-
-#, fuzzy
+msgstr "Nepodarilo sa prija泥 offline spr叩vy."
+
 msgid "Offline message store full"
-msgstr "Offline spr叩va"
+msgstr "�lo転isko offline spr叩v je pln辿"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7034,14 +7064,14 @@
 msgstr "Slu転ba AOL je do�asne nedostupn叩."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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 ""
-"Prip叩jali a odp叩jali ste sa pr鱈li邸 �asto. Po�kajte desa泥 min炭t a sk炭ste "
-"znova. Ak budete i na�alej sk炭邸a泥, budete musie泥 �aka泥 este dlh邸ie."
+"Va邸e prihlasovacie meno sa prip叩jalo a odp叩jalo pr鱈li邸 �asto. Po�kajte desa泥 "
+"min炭t a sk炭ste to znovu. Ak budete pokra�ova泥, budete musie泥 �aka泥 este "
+"dlh邸ie."
 
 #. client too old
 #, c-format
@@ -7051,14 +7081,13 @@
 "na %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Prip叩jali a odp叩jali ste sa pr鱈li邸 �asto. Po�kajte min炭tu a sk炭ste to znova. "
-"Ak budete pokra�ova泥, budete musie泥 �aka泥 este dlh邸ie."
+"Va邸a IP adresa sa prip叩jala a odp叩jala pr鱈li邸 �asto. Po�kajte min炭tu a "
+"sk炭ste to znovu. Ak budete pokra�ova泥, budete musie泥 �aka泥 este dlh邸ie."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Zadan箪 k直炭� SecurID je neplatn箪"
@@ -7206,21 +7235,21 @@
 msgstr[1] "Z nezn叩meho d担vodu ste pri邸li o %hu spr叩vu od pou転鱈vate直a %s."
 msgstr[2] "Z nezn叩meho d担vodu ste pri邸li o %hu spr叩vy od pou転鱈vate直a %s."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Nepodarilo sa odosla泥 spr叩vu (%s)."
+msgstr "Nepodarilo sa odosla泥 spr叩vu: %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Nem担転em odosla泥 spr叩vu: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nem担転em posla泥 spr叩vu k %s:"
-
-#, fuzzy, c-format
+msgstr "Nem担転em posla泥 spr叩vu k %s: %s (%s)"
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "Nem担転em posla泥 spr叩vu k %s:"
+msgstr "Nem担転em posla泥 spr叩vu k %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7249,14 +7278,6 @@
 "[Spr叩va od pou転鱈vate直a obsahovala nespr叩vne znaky, preto ju nebolo mo転n辿 "
 "zobrazi泥.]"
 
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Akciu nebolo mo転n辿 vykona泥, preto転e ste prekro�ili limit hodnotenia. Pros鱈m, "
-"po�kajte 10 sek炭nd a sk炭ste to znovu."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Boli ste odpojen鱈 z miestnosti %s."
@@ -10100,13 +10121,13 @@
 msgstr "Otvori泥 schr叩nku Doru�en辿"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Ned叩 sa posla泥 SMS. Nebolo mo転n辿 z鱈ska泥 mobiln辿ho oper叩tora."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Ned叩 sa posla泥 SMS. Nezn叩my mobiln箪 oper叩tor."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Zis泥uje sa oper叩tor na poslanie SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10654,6 +10675,7 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chat cez IM.  Podporuje AIM, Google Talk, Jabber/XMPP, MSN, Yahoo a �al邸ie"
 
 msgid "Internet Messenger"
 msgstr "Internetov箪 komunik叩tor"
@@ -11913,15 +11935,18 @@
 msgid "Lao"
 msgstr "lao邸tina"
 
-msgid "Lithuanian"
-msgstr "litov�ina"
-
 msgid "Macedonian"
 msgstr "maced坦n�ina"
 
 msgid "Mongolian"
 msgstr "mongol�ina"
 
+msgid "Marathi"
+msgstr "mar叩th�ina"
+
+msgid "Malay"
+msgstr "malaj�ina"
+
 msgid "Bokm奪l Norwegian"
 msgstr "n坦rsky bokm奪l"
 
@@ -11937,6 +11962,9 @@
 msgid "Occitan"
 msgstr "okcit叩n�ina"
 
+msgid "Oriya"
+msgstr "ur鱈j�ina"
+
 msgid "Punjabi"
 msgstr "pand転叩b�ina"
 
@@ -11991,6 +12019,9 @@
 msgid "Turkish"
 msgstr "ture�tina"
 
+msgid "Ukranian"
+msgstr "ukrajin�ina"
+
 msgid "Urdu"
 msgstr "urd�ina"
 
@@ -12012,6 +12043,9 @@
 msgid "Amharic"
 msgstr "amhar�ina"
 
+msgid "Lithuanian"
+msgstr "litov�ina"
+
 #, c-format
 msgid "About %s"
 msgstr "O programe %s"
@@ -12619,7 +12653,7 @@
 msgstr "Pou転itie: %s [VO捗BA]...\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "ADR"
 
 msgid "use DIR for config files"
 msgstr "pre konfigura�n辿 s炭bory pou転ije ADR"
@@ -12640,16 +12674,16 @@
 msgstr "neprihlasova泥 automaticky"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+msgstr "MENO"
+
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
 "                      specifies account(s) to use, separated by commas.\n"
 "                      Without this only the first account will be enabled)."
 msgstr ""
 "povoli泥 vybran辿 炭�ty (volite直n箪 argument MENO\n"
-"                      ur�uje 炭�ty, odde直ovan辿 �iarkami"
+"                      ur�uje 炭�ty, odde直ovan辿 �iarkami\n"
+"                      Bez toho bude povolen箪 iba prv箪 炭�et)."
 
 msgid "X display to use"
 msgstr "X obrazovka, ktor炭 pou転i泥"
@@ -12912,21 +12946,19 @@
 msgstr "Nezn叩me... Ozn叩mte to, pros鱈m!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(predvolen辿)"
+msgstr "(Vlastn辿)"
+
+msgid "Penguin Pimps"
+msgstr "Autori Pidginu"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "�tandardn叩 zvukov叩 t辿ma programu Pidgin"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Editor t辿my zoznamu priate直ov programu Pidgin"
+msgstr "�tandardn叩 t辿ma zoznamu priate直ov programu Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "�tandardn叩 t辿ma stavov箪ch ikon programu Pidgin"
 
 msgid "Theme failed to unpack."
 msgstr "Nepodarilo sa rozbali泥 t辿mu."
@@ -12937,19 +12969,30 @@
 msgid "Theme failed to copy."
 msgstr "Nepodarilo sa skop鱈rova泥 t辿mu."
 
-msgid "Install Theme"
-msgstr "In邸talova泥 t辿mu"
-
-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 ""
-"Z nasleduj炭ceho zoznamu vyberte t辿mu smajl鱈kov, ktor炭 chcete pou転鱈va泥. Nov辿 "
-"t辿my je mo転n辿 nain邸talova泥 pridan鱈m t辿my do tohto zoznamu met坦dou ��泥ahaj a "
-"pus泥��."
-
-msgid "Icon"
-msgstr "Ikona"
+msgid "Theme Selections"
+msgstr "V箪ber t辿my"
+
+#. Instructions
+msgid ""
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
+msgstr ""
+"Z nasleduj炭ceho zoznamu vyberte t辿mu smajl鱈kov, ktor炭 chcete pou転鱈va泥.\n"
+"Nov辿 t辿my je mo転n辿 nain邸talova泥 pridan鱈m t辿my do tohto zoznamu met坦dou "
+"��泥ahaj a pus泥��."
+
+msgid "Buddy List Theme:"
+msgstr "T辿ma zoznamu priate直ov:"
+
+msgid "Status Icon Theme:"
+msgstr "Ikony statusu:"
+
+msgid "Sound Theme:"
+msgstr "Zvukov叩 t辿ma:"
+
+msgid "Smiley Theme:"
+msgstr "T辿ma smajl鱈kov:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Kl叩vesov辿 skratky"
@@ -12957,10 +13000,6 @@
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Z_avrie泥 rozhovory kl叩vesom Esc"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "T辿ma zoznamu priate直ov"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona v oznamovacej oblasti"
@@ -13047,9 +13086,6 @@
 msgid "Font"
 msgstr "P鱈smo"
 
-msgid "Use document font from _theme"
-msgstr "Pou転i泥 p鱈smo dokumentov _t辿my"
-
 msgid "Use font from _theme"
 msgstr "Pou転i泥 p鱈smo _t辿my"
 
@@ -13072,15 +13108,13 @@
 msgid "Cannot start browser configuration program."
 msgstr "Nebolo mo転n辿 spusti泥 program na nastavenie prehliada�a."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Vypn炭泥"
+msgstr "Vypnut辿"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Pou転i泥 _automaticky zisten炭 IP adresu: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "ST_UN server:"
 
@@ -13096,78 +13130,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "Povoli泥 _automatick辿 presmerovanie portu routeru"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Ru�ne ur�i泥 rozsah portov, na ktor箪ch po�炭va泥"
-
-#, fuzzy
+msgstr "_Manu叩lne zada泥 rozsah portov, na ktor箪ch na�炭va泥:"
+
 msgid "_Start:"
-msgstr "_Status:"
-
-#, fuzzy
+msgstr "�_tart:"
+
 msgid "_End:"
-msgstr "_Rozbali泥"
+msgstr "_Koniec:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Relay Server (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN server:"
-
-#, fuzzy
+msgstr "_TURN server:"
+
 msgid "Use_rname:"
-msgstr "Pou転鱈vate直sk辿 meno:"
-
-#, fuzzy
+msgstr "_Pou転鱈vate直sk辿 meno:"
+
 msgid "Pass_word:"
-msgstr "Heslo:"
-
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy server a prehliada�"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Program na nastavenie proxy nebol n叩jden箪.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Program na nastavenie prehliada�a nebol n叩jden箪.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Predvo直by proxy a prehliada�a sa daj炭 nastavi泥\n"
-"v predvo直b叩ch prostredia GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Nastavi泥 _Proxy"
-
-msgid "Configure _Browser"
-msgstr "Nastavi泥 _Prehliada�"
-
-msgid "Proxy Server"
-msgstr "Proxy server"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Pou転i泥 vzdialen辿 DNS s proxy SOCKS 4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Typ proxy:"
-
-msgid "No proxy"
-msgstr "Bez proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Pou転鱈vate直sk辿 meno:"
+msgstr "_Heslo:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13208,6 +13191,15 @@
 msgid "Browser Selection"
 msgstr "V箪ber prehliada�a"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Predvo直by prehliada�a sa nastavuj炭 v predvo直b叩ch prostredia GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Program na nastavenie prehliada�a nebol n叩jden箪.</b>"
+
+msgid "Configure _Browser"
+msgstr "Nastavi泥 _Prehliada�"
+
 msgid "_Browser:"
 msgstr "_Prehliada�:"
 
@@ -13231,6 +13223,35 @@
 "_Ru�ne:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Predvo直by proxy sa nastavuj炭 v predvo直b叩ch prostredia GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Program na nastavenie proxy nebol n叩jden箪.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Nastavi泥 _Proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Pou転i泥 vzdialen辿 _DNS s proxy SOCKS 4"
+
+msgid "Proxy t_ype:"
+msgstr "T_yp proxy:"
+
+msgid "No proxy"
+msgstr "Bez proxy"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "Pou転鱈vate直sk辿 me_no:"
+
 msgid "Log _format:"
 msgstr "_Form叩t z叩znamu:"
 
@@ -13314,25 +13335,18 @@
 msgid "Based on keyboard or mouse use"
 msgstr "Pod直a vyu転itia kl叩vesnice alebo my邸i"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Po�et min炭t pred ne�innos泥ou:"
+
+msgid "Change to this status when _idle:"
+msgstr "Prepn炭泥 na tento status pri _ne�innosti:"
+
 msgid "_Auto-reply:"
 msgstr "_Automatick叩 odpove�:"
 
 msgid "When both away and idle"
 msgstr "Pri nepr鱈tomnosti a ne�innosti"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatick叩 nepr鱈tomnos泥"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Po�et min炭t pred ne�innos泥ou:"
-
-msgid "Change status when _idle"
-msgstr "Zmeni泥 status pri _ne�innosti"
-
-msgid "Change _status to:"
-msgstr "Zmeni泥 _status na:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Status pri spusten鱈"
@@ -13346,15 +13360,15 @@
 msgid "Interface"
 msgstr "Rozhranie"
 
-msgid "Smiley Themes"
-msgstr "T辿my smajl鱈kov"
-
 msgid "Browser"
 msgstr "Prehliada�"
 
 msgid "Status / Idle"
 msgstr "Status / ne�inn箪"
 
+msgid "Themes"
+msgstr "T辿my"
+
 msgid "Allow all users to contact me"
 msgstr "Povoli泥 v邸etk箪m pou転鱈vate直om kontaktova泥 ma"
 
@@ -13660,6 +13674,9 @@
 msgid "_Save File"
 msgstr "_Ulo転i泥 s炭bor"
 
+msgid "Do you really want to clear?"
+msgstr "Naozaj chcete vypr叩zdni泥?"
+
 msgid "Select color"
 msgstr "Vyberte farbu"
 
@@ -13698,9 +13715,6 @@
 msgid "Pidgin smileys"
 msgstr "Smajl鱈ci programu Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Autori Pidginu"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Vyberte t炭to mo転nos泥, ak nechcete grafick箪ch smajl鱈kov."
 
@@ -14335,6 +14349,9 @@
 msgid "Conversation Entry"
 msgstr "Polo転ka rozhovoru"
 
+msgid "Conversation History"
+msgstr "Hist坦ria rozhovoru"
+
 msgid "Request Dialog"
 msgstr "Dial坦g po転iadavku"
 
@@ -14799,9 +14816,8 @@
 msgid "_Start %s on Windows startup"
 msgstr "_Spusti泥 %s pri 邸tarte Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Umo転ni泥 viacero s炭be転n箪ch prihl叩sen鱈"
+msgstr "Umo転ni泥 viacero spusten鱈"
 
 msgid "_Dockable Buddy List"
 msgstr "_Ukotvite直n箪 zoznam priate直ov"
@@ -14863,6 +14879,42 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Tento modul je vhodn箪 pre ladenie XMPP serverov alebo klientov."
 
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Neboli n叩jden辿 in辿 met坦dy XMPP spojenia po tom �o zlyhalo priame spojenie."
+
+#, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Akciu nebolo mo転n辿 vykona泥, preto転e ste prekro�ili limit hodnotenia. "
+#~ "Pros鱈m, po�kajte 10 sek炭nd a sk炭ste to znovu."
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(predvolen辿)"
+
+#~ msgid "Install Theme"
+#~ msgstr "In邸talova泥 t辿mu"
+
+#~ msgid "Icon"
+#~ msgstr "Ikona"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Pou転i泥 p鱈smo dokumentov _t辿my"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy server a prehliada�"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatick叩 nepr鱈tomnos泥"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Zmeni泥 _status na:"
+
 #, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
@@ -16068,9 +16120,6 @@
 #~ "s炭bore 'COPYRIGHT'. Na tento program v叩m neposkytujeme 転iadnu z叩ruku."
 #~ "<BR><BR>"
 
-#~ msgid "Conversation History"
-#~ msgstr "Hist坦ria rozhovoru"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Zobrazova� z叩znamov"
 
--- a/po/zh_HK.po	Mon Feb 15 06:39:09 2010 +0000
+++ b/po/zh_HK.po	Tue Feb 16 15:16:28 2010 +0000
@@ -1,14 +1,14 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.22 2009/11/27 10:02:35 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.24 2010/02/15 23:14:17 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+# Copyright (C) 2002-2010, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2010, Ambrose C. Li <ambrose.li@gmail.com>
 #
 # PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.615 2009/11/29 00:48:50 acli Exp $
+# $InternalId: zh_TW.po,v 1.619 2010/02/15 23:14:17 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -60,10 +60,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.4\n"
+"Project-Id-Version: Pidgin 2.6.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-09-03 06:04-0400\n"
+"POT-Creation-Date: 2010-02-15 18:32-0800\n"
+"PO-Revision-Date: 2010-02-14 03:06-0400\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -1652,11 +1652,13 @@
 msgid "No Grouping"
 msgstr "筝���腟�"
 
+# XXX ��⑮ 20100215/acli
 msgid "Nested Subgroup"
-msgstr ""
-
+msgstr "綏∝��絖�臂g�"
+
+# XXX ��⑮ 20100215/acli
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "綏∝����腟�鐚�絲���у���緒�"
 
 #  *< name
 #  *< version
@@ -2037,6 +2039,9 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 筝�������罅�鐚���罩や���荀���絎���\n"
 
+msgid "File is not readable."
+msgstr "�≧�莅���罟�罅���"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s �活��� %s (%s) 腟��"
@@ -3902,6 +3907,13 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "篌堺������荀�膓��掩�����絲���筝我��画�����茯�茘�"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "篌堺������箴�篋��≧��������"
+
+msgid "Server does not use any supported authentication method"
+msgstr "篌堺����研筝���箴�篁私�筝�腮�←��吡��茯�茘��劫�"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3911,15 +3923,6 @@
 msgid "Plaintext Authentication"
 msgstr "����茯�茘�"
 
-msgid "SASL authentication failed"
-msgstr "SASL 茯�茘�紊掩��"
-
-msgid "Invalid response from server"
-msgstr "篌堺������箴�篋��≧��������"
-
-msgid "Server does not use any supported authentication method"
-msgstr "篌堺����研筝���箴�篁私�筝�腮�←��吡��茯�茘��劫�"
-
 msgid "You require encryption, but it is not available on this server."
 msgstr "篏�荀�羆���絲�鐚�篏���篌堺���������絲����純��"
 
@@ -3927,10 +3930,28 @@
 msgid "Invalid challenge from server"
 msgstr "篌堺������箴�篋��≧����薊�茘�����"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "篌堺������咲�茘�腮�綺鎴牙�絎����篏����句�筝�茯���"
+
+msgid "SASL authentication failed"
+msgstr "SASL 茯�茘�紊掩��"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL ���鐚�%s"
 
+msgid "Unable to canonicalize username"
+msgstr "�≧���絽活��莉���罩e��綵∽��"
+
+msgid "Unable to canonicalize password"
+msgstr "�≧���絲�腆取���罩e��綵∽��"
+
+msgid "Malicious challenge from server"
+msgstr "篌堺������箴�篋��≧���駙�茘�����"
+
+msgid "Unexpected response from server"
+msgstr "篌堺�����弱�坂�絅���������"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH �g�膊∞���>賢�隙�篏���綏ヤ������"
 
@@ -4037,13 +4058,17 @@
 msgid "Resource"
 msgstr ""
 
+# NOTE 絅遵���騌����篏������羣�茘��� 20100214
+msgid "Uptime"
+msgstr "綏ヤ�����"
+
+msgid "Logged Off"
+msgstr "綏牙�糸��"
+
 #, c-format
 msgid "%s ago"
 msgstr "%s��"
 
-msgid "Logged Off"
-msgstr "綏牙�糸��"
-
 # NOTE: 羈���緇傑����茘���膃��������鐚����㊥��茘����銀�����鐚��ユ���活⑮篋�篋�
 # NOTE: ��恐筝�綛冗���亥�eぇ絖後����掩���ュ����鐚��上����箙�莊����㊥��PO罟�������羈��後��
 msgid "Middle Name"
@@ -4246,11 +4271,6 @@
 msgid "Ping timed out"
 msgstr "Ping�丈��"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr "�≧��贋・�g�鐚�篏��≧��上�医�銀��� XMPP �g��号���"
-
 msgid "Invalid XMPP ID"
 msgstr "XMPP 絽活���≧��"
 
@@ -4881,6 +4901,9 @@
 msgid "(Code %s)"
 msgstr "(篁g⊆ %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "荐���賢����筝�����罟�罅�紊у�莇���������≧����榊�����梧;����"
+
 msgid "XML Parse error"
 msgstr "XML �������"
 
@@ -5305,6 +5328,10 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "篏����� MSN 膓峨��紊��激��"
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "荐㊤� %s ��膓峨����"
+
 msgid "Set your friendly name."
 msgstr "荐㊤�篏���膓峨����"
 
@@ -6914,7 +6941,11 @@
 msgstr "篌堺������荐���"
 
 # NOTE ��荀� http://pidgin.im/pipermail/translators/2009-July/000394.html
-#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s �弱�坂�絅���������鐚�%s"
+
+# NOTE ��荀� http://pidgin.im/pipermail/translators/2009-July/000394.html
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "%s �弱�坂�絅���������"
@@ -6933,6 +6964,11 @@
 msgid "Error requesting %s: %s"
 msgstr "荀�羆�莅��� %s ��筝㊦�主��篋����鐚�%s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr "篌堺����;腓榊�糸�ュ��綽���絎�������薊�茘�鐚�篏������句�絨�����吓����薊�茘���"
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL 筝���荐延���絽活������茖�嶃��"
 
@@ -7503,13 +7539,6 @@
 "characters.]"
 msgstr "鐚��≧�蕁�ず箴�������篏睡������荐�������阪�������≧��絖�膃���鐚�"
 
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"篏���菴�����筝�����篏��≧�絎���鐚����坂�綏牙����育������篏���������筝�����茫�膈�緇���腱�緇�"
-"��荅��罨<��\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "篏�綏牙��沿��紊�� %s ��罩∫�g���"
@@ -11147,7 +11176,7 @@
 msgstr "絮�����臂g�����腮�"
 
 msgid "The text information for when a group is expanded"
-msgstr "臂g�絮�����臂g���腮援��絖�蕭�����絖�蕁��"
+msgstr "靸g�絮�����臂g���腮援��絖�蕭���絖�蕭�蕁��"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
@@ -11163,7 +11192,7 @@
 msgstr "�嚷儀��臂g�����腮�"
 
 msgid "The text information for when a group is collapsed"
-msgstr "臂g��区儀��臂g���腮援��絖�蕭�����絖�蕁��"
+msgstr "靸g��区儀��臂g���腮援��絖�蕭���絖�蕭�蕁��"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
@@ -11184,7 +11213,7 @@
 # NOTE 鋎���contact絮�����鐚�����荀��亥�������contact����腮怨��������contact�х������buddy
 # NOTE �фィ��鐚���茗���text information for when a contact is expanded����荅我����contact����腮�
 msgid "The text information for when a contact is expanded"
-msgstr "絅遵�絮������雁�絅遵�����腮援��絖�蕭�����絖�蕁��"
+msgstr "鎁遵�絮������雁�絅遵�����腮援��絖�蕭���絖�蕭�蕁��"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
@@ -11192,7 +11221,7 @@
 msgstr "鋇�膩�絅遵�����腮�"
 
 msgid "The text information for when a buddy is online"
-msgstr "絅遵�筝�膩���絅遵���腮援��絖�蕭�����絖�蕁��"
+msgstr "鎁遵�筝�膩���絅遵���腮援��絖�蕭���絖�蕭�蕁��"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
@@ -11200,7 +11229,7 @@
 msgstr "����絅遵�����腮�"
 
 msgid "The text information for when a buddy is away"
-msgstr "絅遵��∫����絅遵���腮援��絖�蕭�����絖�蕁��"
+msgstr "鎁遵��∫����絅遵���腮援��絖�蕭���絖�蕭�蕁��"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
@@ -11208,7 +11237,7 @@
 msgstr "���絅遵�����腮�"
 
 msgid "The text information for when a buddy is offline"
-msgstr "絅遵��∝���絅遵���腮援��絖�蕭�����絖�蕁��"
+msgstr "鎁遵��∝���絅遵���腮援��絖�蕭���絖�蕭�蕁��"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -11216,7 +11245,7 @@
 msgstr "��靷�ソ������腮�"
 
 msgid "The text information for when a buddy is idle"
-msgstr "絅遵���臀���絅遵���腮援��絖�蕭�����絖�蕁��"
+msgstr "鎁遵���臀���絅遵���腮援��絖�蕭���絖�蕭�蕁��"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
@@ -11224,7 +11253,7 @@
 msgstr "���Ű�荐�����絅遵���腮�"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr "絅遵������荐�����絅遵���腮援��絖�蕭�����絖�蕁��"
+msgstr "鎁遵������荐�����絅遵���腮援��絖�蕭���絖�蕭�蕁��"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
@@ -11234,10 +11263,10 @@
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr "��鎀��筝㊥��篋堺��遺���膓峨����篏����荅画�������紊����腮援��絖�蕭�����絖�蕁��"
+msgstr "��鎀��筝㊥��篋堺��遺���膓峨����篏����荅画�������紊����腮援��絖�蕭���絖�蕭�蕁��"
 
 msgid "The text information for a buddy's status"
-msgstr "鎁遵�������絖�蕭�����絖�蕁��"
+msgstr "鎁遵�������絖�蕭���絖�蕭�蕁��"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -12293,9 +12322,6 @@
 msgid "Lao"
 msgstr "鎛�����"
 
-msgid "Lithuanian"
-msgstr "腴��九���"
-
 #  NOTE��薤��狗���������腮��掩�茯���鐚�莊�絽�����薤��狗��筝��♂��篆�
 msgid "Macedonian"
 msgstr "薤��狗����"
@@ -12303,6 +12329,10 @@
 msgid "Mongolian"
 msgstr "���ゆ��"
 
+#  NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4
+msgid "Marathi"
+msgstr "薤�������"
+
 msgid "Malay"
 msgstr "薤����"
 
@@ -12328,6 +12358,10 @@
 msgid "Occitan"
 msgstr "絅у����"
 
+# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=oriya&qrytype=en&x=33&y=10
+msgid "Oriya"
+msgstr "絅ч��篋���"
+
 msgid "Punjabi"
 msgstr "��������"
 
@@ -12419,6 +12453,9 @@
 msgid "Amharic"
 msgstr "�水�������"
 
+msgid "Lithuanian"
+msgstr "腴��九���"
+
 #, c-format
 msgid "About %s"
 msgstr "���� %s"
@@ -12848,7 +12885,7 @@
 msgstr "�御��絖���"
 
 msgid "Select Text Color"
-msgstr "荐㊤���絖�蕁��"
+msgstr "頥㊤�絖�蕭�蕁��"
 
 msgid "Select Background Color"
 msgstr "頥㊤��������"
@@ -14067,6 +14104,9 @@
 msgid "_Save File"
 msgstr "�峨�罟�罅�(_S)"
 
+msgid "Do you really want to clear?"
+msgstr "篏�腆阪�荀�羝��わ�"
+
 msgid "Select color"
 msgstr "�御��蕁��"
 
@@ -15319,6 +15359,18 @@
 msgstr "鎶����� XMPP 篌堺������絎∽�句��画��ら����"
 
 #~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr "�≧��贋・�g�鐚�篏��≧��上�医�銀��� XMPP �g��号���"
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "����菴�����筝�����篏��≧�絎���鐚����堺��群膓����育������篏���������筝�����茫�膈�緇���腱�"
+#~ "緇���荅��罨<��\n"
+
+#~ msgid ""
 #~ "The root certificate this one claims to be issued by is unknown to Pidgin."
 #~ msgstr "��綣究��茘��牙┗�延��� Pidgin 筝�茯�茘����号��茘�罘�罕�膂順�若��"
 
--- a/po/zh_TW.po	Mon Feb 15 06:39:09 2010 +0000
+++ b/po/zh_TW.po	Tue Feb 16 15:16:28 2010 +0000
@@ -1,12 +1,12 @@
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+# Copyright (C) 2002-2010, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2010, Ambrose C. Li <ambrose.li@gmail.com>
 #
 # PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.615 2009/11/29 00:48:50 acli Exp $
+# $InternalId: zh_TW.po,v 1.619 2010/02/15 23:14:17 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -58,10 +58,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.4\n"
+"Project-Id-Version: Pidgin 2.6.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-09-03 06:04-0400\n"
+"POT-Creation-Date: 2010-02-15 18:33-0800\n"
+"PO-Revision-Date: 2010-02-14 03:06-0400\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -1650,11 +1650,13 @@
 msgid "No Grouping"
 msgstr "筝���腟�"
 
+# XXX ��⑮ 20100215/acli
 msgid "Nested Subgroup"
-msgstr ""
-
+msgstr "綏∝��絖�臂ょ�"
+
+# XXX ��⑮ 20100215/acli
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "綏∝����腟�鐚�絲���у���緒�"
 
 #  *< name
 #  *< version
@@ -2035,6 +2037,9 @@
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 筝�������罅�鐚���罩や���荀���絎���\n"
 
+msgid "File is not readable."
+msgstr "�≧�莅���罟�罅���"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s �活��� %s (%s) 腟���"
@@ -3900,6 +3905,13 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "篌堺������荀�膓��掩�����絲���筝我��画�����茯�茘�"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "篌堺������箴�篋��≧��������"
+
+msgid "Server does not use any supported authentication method"
+msgstr "篌堺����研筝���箴�篁私�筝�腮�←��吡��茯�茘��劫�"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3909,15 +3921,6 @@
 msgid "Plaintext Authentication"
 msgstr "����茯�茘�"
 
-msgid "SASL authentication failed"
-msgstr "SASL 茯�茘�紊掩��"
-
-msgid "Invalid response from server"
-msgstr "篌堺������箴�篋��≧��������"
-
-msgid "Server does not use any supported authentication method"
-msgstr "篌堺����研筝���箴�篁私�筝�腮�←��吡��茯�茘��劫�"
-
 msgid "You require encryption, but it is not available on this server."
 msgstr "���羆���絲�鐚�篏���篌堺���������絲����純��"
 
@@ -3925,10 +3928,28 @@
 msgid "Invalid challenge from server"
 msgstr "篌堺������箴�篋��≧����薊�茘�����"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "篌堺������咲�茘�腮�綺鎴牙�絎����篏����句�筝�茯���"
+
+msgid "SASL authentication failed"
+msgstr "SASL 茯�茘�紊掩��"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL ���鐚�%s"
 
+msgid "Unable to canonicalize username"
+msgstr "�≧���絽活��莉���罩f�綵√�"
+
+msgid "Unable to canonicalize password"
+msgstr "�≧���絲�腆取���罩f�綵√�"
+
+msgid "Malicious challenge from server"
+msgstr "篌堺������箴�篋��≧���駙�茘�����"
+
+msgid "Unexpected response from server"
+msgstr "篌堺�����弱�坂�絅���������"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH �g�膊∞���>賢�隙�����綏ヤ������"
 
@@ -4035,13 +4056,17 @@
 msgid "Resource"
 msgstr ""
 
+# NOTE 絅遵���騌����篏������羣�茘��� 20100214
+msgid "Uptime"
+msgstr "綏ヤ�����"
+
+msgid "Logged Off"
+msgstr "綏牙�糸��"
+
 #, c-format
 msgid "%s ago"
 msgstr "%s��"
 
-msgid "Logged Off"
-msgstr "綏牙�糸��"
-
 # NOTE: 羈���緇傑����茘���膃��������鐚����㊥��茘����銀�����鐚��ユ���活⑮篋�篋�
 # NOTE: ��恐筝�綛冗���亥�eぇ絖後����掩���ュ����鐚��上����箙�莊����㊥��PO罟�������羈��後��
 msgid "Middle Name"
@@ -4244,11 +4269,6 @@
 msgid "Ping timed out"
 msgstr "Ping�丈��"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr "�≧��贋・�g�鐚�篏��≧��上�医�銀��� XMPP �g��号���"
-
 msgid "Invalid XMPP ID"
 msgstr "XMPP 絽活���≧��"
 
@@ -4879,6 +4899,9 @@
 msgid "(Code %s)"
 msgstr "(篁g⊆ %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "荐���賢����筝�����罟�罅�紊у�莇���������≧����榊�����茵�����"
+
 msgid "XML Parse error"
 msgstr "XML �������"
 
@@ -5303,6 +5326,10 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "������ MSN �援┗紊��激��"
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "荐㊤� %s ���援┗��"
+
 msgid "Set your friendly name."
 msgstr "荐㊤������援┗��"
 
@@ -6912,7 +6939,11 @@
 msgstr "篌堺������荐���"
 
 # NOTE ��荀� http://pidgin.im/pipermail/translators/2009-July/000394.html
-#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s �弱�坂�絅���������鐚�%s"
+
+# NOTE ��荀� http://pidgin.im/pipermail/translators/2009-July/000394.html
 #, c-format
 msgid "Received unexpected response from %s"
 msgstr "%s �弱�坂�絅���������"
@@ -6931,6 +6962,11 @@
 msgid "Error requesting %s: %s"
 msgstr "荀�羆�莅��� %s ��筝㊦�主��篋����鐚�%s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr "篌堺����;腓榊�糸�ュ��綽���絎�������薊�茘�鐚�篏������句�絨�����吓����薊�茘���"
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL 筝���荐掩����絽活������茖�嶃��"
 
@@ -7501,13 +7537,6 @@
 "characters.]"
 msgstr "鐚��≧�蕁�ず箴�������篏睡������荐�������阪�������≧��絖�����鐚�"
 
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"����菴�����筝�����篏��≧�絎���鐚����堺��群膓����育������篏���������筝�����茫�膈�緇���腱�緇�"
-"��荅��罨<��\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
@@ -12287,9 +12316,6 @@
 msgid "Lao"
 msgstr "絲�����"
 
-msgid "Lithuanian"
-msgstr "腴��九���"
-
 #  NOTE��薤��狗���������腮��掩�茯���鐚�莊�絽�����薤��狗��筝��♂��篆�
 msgid "Macedonian"
 msgstr "薤��狗����"
@@ -12297,6 +12323,10 @@
 msgid "Mongolian"
 msgstr "���ゆ��"
 
+#  NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4
+msgid "Marathi"
+msgstr "薤�������"
+
 msgid "Malay"
 msgstr "薤����"
 
@@ -12322,6 +12352,10 @@
 msgid "Occitan"
 msgstr "絅цタ����"
 
+# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=oriya&qrytype=en&x=33&y=10
+msgid "Oriya"
+msgstr "絅ч��篋���"
+
 msgid "Punjabi"
 msgstr "��������"
 
@@ -12413,6 +12447,9 @@
 msgid "Amharic"
 msgstr "�水�������"
 
+msgid "Lithuanian"
+msgstr "腴��九���"
+
 #, c-format
 msgid "About %s"
 msgstr "���� %s"
@@ -14061,6 +14098,9 @@
 msgid "_Save File"
 msgstr "�峨�罟�罅�(_S)"
 
+msgid "Do you really want to clear?"
+msgstr "��∈絎�荀�羝��わ�"
+
 msgid "Select color"
 msgstr "�御��蕁��"
 
@@ -15313,6 +15353,18 @@
 msgstr "鎶����� XMPP 篌堺������絎∽�句��画��ら����"
 
 #~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr "�≧��贋・�g�鐚�篏��≧��上�医�銀��� XMPP �g��号���"
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "����菴�����筝�����篏��≧�絎���鐚����堺��群膓����育������篏���������筝�����茫�膈�緇���腱�"
+#~ "緇���荅��罨<��\n"
+
+#~ msgid ""
 #~ "The root certificate this one claims to be issued by is unknown to Pidgin."
 #~ msgstr "��綣究��茘��牙┗�延��� Pidgin 筝�茯�茘����号��茘�罘�罕�膂順�若��"