changeset 31391:e946cb06faec

merge of '3d06a17dd5bf8095f142141e395986dda870cfe6' and 'f34878b425fc3e5501d82254e87d1d9271470428'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 22 Nov 2010 03:04:17 +0000 (2010-11-22)
parents b64b2b05bd3c (current diff) 11211e6427ae (diff)
children a328691c761a
files
diffstat 18 files changed, 1470 insertions(+), 1087 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Nov 22 03:01:14 2010 +0000
+++ b/ChangeLog	Mon Nov 22 03:04:17 2010 +0000
@@ -1,20 +1,48 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.6 (??/??/????):
+version 2.7.6 (11/21/2010):
+	General:
+	* Included Microsoft Internet Authority 2010 and Microsoft Secure Server
+	  Authority 2010 intermediate CA certificates to our bundle.  This fixes
+	  the "Unable to validate certificate" error for omega.contacts.msn.com.
+	  (#12906)
+
+	Pidgin:
+	* Avoid a use-after-free race condition in the media code (when
+	  there's an error reported by GStreamer). (#12806, Jakub Adam)
+
+	AIM and ICQ:
+	* SSL option has been changed to a tri-state menu with choices for
+	  "Don't Use Encryption", "Use Encryption if Available", and "Require
+	  Encryption".
+	* Fix some possible clientLogin URL issues introduced in version 2.7.5.
+	* Don't show a "<URL>: Ok" connection error when using clientLogin.
+	* Cleaned up some debug output for improved readability.
+
 	MSN:
 	* Added support for MSNP16, including Multiple Points of Presence (MPOP)
-	  which allows multiple simultaneous sign-ins.
+	  which allows multiple simultaneous sign-ins. (#8247)
 	* Added extended capabilities support (none implemented).
 	* Merged the work done on the Google SoC (major rewrite of SLP code)
 	* Reworked the data transfer architecture.
 	  (http://developer.pidgin.im/wiki/SlpArchitecture)
 	* Lots of little changes.
+	* Don't process zero-length DC messages. (#12660)
+	* Fixed a bunch of memory leaks.
+	* Prevent a use-after-free condition.
 
 	XMPP:
 	* Avoid a double-free in the Google Relay (V/V) code.
 	* Avoid double error message when failing a file transfer. (#12757)
 	* Password-related information is printed out for SASL authentication
 	  when the PURPLE_UNSAFE_DEBUG environment variable is set.
+	* Authentication mechanisms can now be added by UI's or other plugins
+	  with some work. This is outside the API/ABI rules! (#12715)
+	* Fixed a few printf("%s", NULL) crashes for broken OSes.
+
+	Windows-Specific Changes:
+	* Build the Pidgin Theme Editor plugin (finally).
+	* Untarring (for themes) now works for non-ASCII destination paths.
 
 version 2.7.5 (10/31/2010):
 	General:
--- a/ChangeLog.API	Mon Nov 22 03:01:14 2010 +0000
+++ b/ChangeLog.API	Mon Nov 22 03:04:17 2010 +0000
@@ -1,6 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.6 (??/??/????):
+version 2.7.6 (11/21/2010):
+	* No changes
 
 version 2.7.5 (10/31/2010):
 	* No changes
--- a/NEWS	Mon Nov 22 03:01:14 2010 +0000
+++ b/NEWS	Mon Nov 22 03:04:17 2010 +0000
@@ -2,7 +2,7 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
-2.7.6 (??/??/????):
+2.7.6 (11/21/2010):
 	Jorge: In this release I have merged two branches where I have spent
 	most of my time in the last months, the MSNP16 and SLP-rewrite.  I 
 	hope you all will enjoy the hability to be connected on multiple
@@ -11,6 +11,10 @@
 	happy with this rewrite because there was untoched code from almost
 	5 years ago. I hope you like this release!
 
+	John: In this release, we give you some new features and a bunch of
+	bug fixes.  This includes shipping intermediate certificates to fix
+	certificate validation for MSN's servers.  Upgrade and enjoy!
+
 2.7.5 (10/31/2010):
 	John: A bugfix release for all of you!  This time we fixed a bunch of
 	bugs ranging from annoying regressions to long-standing bugs we didn't
--- a/configure.ac	Mon Nov 22 03:01:14 2010 +0000
+++ b/configure.ac	Mon Nov 22 03:04:17 2010 +0000
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [7])
 m4_define([purple_micro_version], [6])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [8])
 m4_define([gnt_micro_version], [3])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/libpurple/protocols/oscar/visibility.c	Mon Nov 22 03:01:14 2010 +0000
+++ b/libpurple/protocols/oscar/visibility.c	Mon Nov 22 03:04:17 2010 +0000
@@ -20,10 +20,25 @@
 
 #include "visibility.h"
 
-/* 4 separate strings are needed in order to ease translators' job */
+/* Translators: This string is a menu option that, if selected, will cause
+   you to appear online to the chosen user even when your status is set to
+   Invisible. */
 #define APPEAR_ONLINE		N_("Appear Online")
+
+/* Translators: This string is a menu option that, if selected, will cause
+   you to appear offline to the chosen user when your status is set to
+   Invisible (this is the default). */
 #define DONT_APPEAR_ONLINE	N_("Don't Appear Online")
+
+/* Translators: This string is a menu option that, if selected, will cause
+   you to always appear offline to the chosen user (even when your status
+   isn't Invisible). */
 #define APPEAR_OFFLINE		N_("Appear Offline")
+
+/* Translators: This string is a menu option that, if selected, will cause
+   you to appear offline to the chosen user if you are invisible, and
+   appear online to the chosen user if you are not invisible (this is the
+   default). */
 #define DONT_APPEAR_OFFLINE	N_("Don't Appear Offline")
 
 static guint16
--- a/pidgin/gtkmedia.c	Mon Nov 22 03:01:14 2010 +0000
+++ b/pidgin/gtkmedia.c	Mon Nov 22 03:04:17 2010 +0000
@@ -399,6 +399,9 @@
 		gtkmedia->priv->ui = NULL;
 	}
 
+	if (gtkmedia->priv->timeout_id != 0)
+		g_source_remove(gtkmedia->priv->timeout_id);
+
 	G_OBJECT_CLASS(parent_class)->dispose(media);
 }
 
--- a/po/ChangeLog	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/ChangeLog	Mon Nov 22 03:04:17 2010 +0000
@@ -1,6 +1,21 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.6
+	* Albanian translation updated (Besnik Bleta)
+	* Bengali translation updated (Jamil Ahmed)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Czech translation updated (David Vachulka)
+	* Dutch translation updated (Gideon van Melle)
+	* German translation updated (Bj旦rn Voigt, Jochen Kemnade)
+	* Hebrew translation updated (Shalom Craimer)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Polish translation updated (Piotr Dr�g)
+	* Romanian translation updated (Mi�u Moldovan)
+	* Spanish translation updated (Javier Fern叩ndez-Sanguino Pe単a)
+	* Ukrainian translation updated (Oleksandr Kovalenko)
 
 version 2.7.5
 	* German translation updated (Bj旦rn Voigt, Jochen Kemnade)
--- a/po/bn.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/bn.po	Mon Nov 22 03:04:17 2010 +0000
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:11-0400\n"
-"PO-Revision-Date: 2010-08-17 13:37+0600\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-08 13:37+0600\n"
 "Last-Translator: israt <israt@ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
 "Language: bn\n"
@@ -810,9 +810,8 @@
 msgid "Waiting for transfer to begin"
 msgstr "爨伍�爨ム�爨��爨��爨むΠ 爨謹�爨萎� 爨�爨萎�爨� 爨�爨��爨� 爨�爨��爨�爭�爨劇� 爨�爨萎� 爨項�爭�爨�爭�"
 
-#, fuzzy
 msgid "Cancelled"
-msgstr "爨��爨む�爨� 爨�爨萎� 爨項Ο爨酌�爨�爭�"
+msgstr "爨��爨む�爨迦�爭�爨�"
 
 # mark6
 msgid "Failed"
@@ -1750,13 +1749,12 @@
 "爨伍�爨萎�爨�爨逗Λ爨逗�爭�爨�爨�爨� 爨踶�爨�� 爨�爨鉦Π爭�爨��爨� 爨��爛� 爨�爨�Θ爨鉦Π 爨�爨��爨��爨�爨�爨鉦Π爭�爨� 爨伍Ξ爭� 爨踶�� 爨む�爨萎�爨� 爨�爨逗� 爨�爨�爭� 爨�爨逗Θ爨� "
 "爨�Π爭�爨�爭�爨劇� 爨�爨萎�爨�イ"
 
-#, fuzzy
 msgid ""
 "The certificate has expired and should not be considered valid.  Check that "
 "your computer's date and time are accurate."
 msgstr ""
-"爨伍�爨萎�爨�爨逗Λ爨逗�爭�爨�爨�爨� 爨踶�爨�� 爨�爨鉦Π爭�爨��爨� 爨��爛� 爨�爨�Θ爨鉦Π 爨�爨��爨��爨�爨�爨鉦Π爭�爨� 爨伍Ξ爭� 爨踶�� 爨む�爨萎�爨� 爨�爨逗� 爨�爨�爭� 爨�爨逗Θ爨� "
-"爨�Π爭�爨�爭�爨劇� 爨�爨萎�爨�イ"
+"爨伍�爨萎�爨�爨逗Λ爨逗�爭�爨�爨�爨� 爨��爭�爨鉦Ζ爭�爨む�爨む�爨萎�爨� 爨踶�� 爨踶�爭� 爨�爨鉦Π爭�爨��爨� 爨оΠ爨� 爨項Μ爭� 爨��爛�  爨�爨�Θ爨鉦Π 爨�爨��爨��爨�爨�爨鉦Π爭�爨� 爨伍Ξ爭� "
+"爨踶�� 爨む�爨萎�爨� 爨�爨逗� 爨�爨�爭� 爨�爨逗Θ爨� 爨�Π爭�爨�爭�爨劇� 爨�爨萎�爨�イ"
 
 # Translated by sadia
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
@@ -4974,20 +4972,17 @@
 msgstr "爨÷�爨��爨�爨�"
 
 # tithi
-#, fuzzy
 msgid "Require encryption"
-msgstr "爨�爨��爨��爨�Θ 爨��爨萎�爭�爨�爨�"
-
-#, fuzzy
+msgstr "爨��爨萎�爭�爨�爨��爭� 爨踶��爭�爨萎�爨�Χ爨�"
+
 msgid "Use encryption if available"
-msgstr "爨��爨�Μ爨項�爨萎�爨鉦Π爭�爨� 爨むΕ爭�爨� 爨��爨�爭�爨� 爨��爨�爭�爨�爭� 爨��: %s"
+msgstr "爨�Ζ爨� 爨��爨�爭�爨� 爨��爭� 爨むΜ爭� 爨踶��爭�爨萎�爨�Χ爨� 爨��爨�Μ爨項�爨�"
 
 msgid "Use old-style SSL"
-msgstr ""
-
-#, fuzzy
+msgstr "爨��爨萎�爨むΘ 爨謹�爨迦�爨� SSL 爨��爨�Μ爨項�爨�"
+
 msgid "Connection security"
-msgstr "爨伍�爨��爨� 爨伍Ξ爭�爨�爨鉦Σ 爨�爨む�爨む�爨萎�爨�"
+msgstr "爨伍�爨��爨�爭�爨� 爨��爨萎�爨�Δ爭�爨む�"
 
 # tithi
 msgid "Allow plaintext auth over unencrypted streams"
@@ -5102,15 +5097,6 @@
 msgid "Unknown Error in presence"
 msgstr "爨�爨�Ω爭�爨ム�爨む�爨む� 爨�爨�爨鉦Θ爨� 爨む�爨萎�爨�爨�"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "爨�爨�-爨��爨��爨��爨� 爨��爨�爨�爨伍�爨�爭�爨萎�爨� 爨��爨��爨��爭� 爨む�爨萎�爨�爨� 爨項�爭�爨�爭�\n"
-
-msgid "Transfer was closed."
-msgstr "爨伍�爨ム�爨��爨��爨むΠ 爨�Θ爭�爨� 爨�爨萎� 爨��爭�爨� 爨項�爭�爨�爭�爛�"
-
-msgid "Failed to open in-band bytestream"
-msgstr "爨�爨�-爨��爨��爨��爨� 爨��爨�爨�爨伍�爨�爭�爨萎�爨� 爨�爭�爨迦Δ爭� 爨��爨�Π爭�爨�"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "%s 爨� 爨��爨�爨� 爨��爨�爨鉦Δ爭� 爨��爨�Π爭�爨�, 爨��爨�Μ爨項�爨�爨鉦Π爭� 爨��爨�爨� 爨伍�爨ム�爨��爨��爨むΠ 爨伍Ξ爨萎�爨ムΘ 爨�爨萎� 爨��"
@@ -5499,30 +5485,6 @@
 msgid "The username specified does not exist."
 msgstr "爨�爨迦�爨迦�爨�爨逗Δ 爨��爨�Μ爨項�爨萎�爨鉦Π爭�爨� 爨��爨��爨� 爨��爨��爨�Ξ爨鉦Θ 爨��爛�"
 
-# fix me tithi
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%1$s (%2$s) 爨� 爨�Θ爭�爨о� 爨む�爨迦�爨�爨鉦Π 爨�爨〝�爨��爨��爨萎Γ 爨�爨伍�爨��"
-
-# tithi
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%1$s 爨伍�爨ム�爨��爨�� 爨む�爨迦�爨�爨鉦� 爨踶�� \"%2$s\" 爨�Σ爭� 爨�爨��爨むΠ爭�爨〝�爨�爭�爨� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛� 爨�爨�Θ爨� "
-"爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爨� 爨��爨� 爨�爨萎Δ爭� 爨�爨鉦Θ?"
-
-# msgstr ""
-# "爨伍�爨ム�爨��爨�� 爨む�爨迦�爨�爨鉦Π %s 爨�爭�爨萎�爨� 爨� 爨�爨�爭�爨� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛む�爨�Θ爨� 爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爨逗�爭� 爨��爨� "
-# "爨�爨萎Δ爭� 爨�爨鉦Θ?"
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s 爨伍�爨ム�爨��爭� 爨む�爨迦�爨�爨鉦� 爨�爨�爭� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛� 爨�爨�Θ爨� 爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爭� 爨��爨� 爨�爨萎Δ爭� 爨�爨鉦Θ?"
-
 msgid "Unable to parse message"
 msgstr "爨��爨萎�爨む� 爨��爨萎�爨� 爨�爨萎� 爨伍Ξ爭�爨〝Μ 爨項Ο爨酌Θ爨�"
 
@@ -5719,6 +5681,30 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 爨む�爨萎�爨�爨�: %s\n"
 
+# fix me tithi
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "%1$s (%2$s) 爨� 爨�Θ爭�爨о� 爨む�爨迦�爨�爨鉦Π 爨�爨〝�爨��爨��爨萎Γ 爨�爨伍�爨��"
+
+# tithi
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%1$s 爨伍�爨ム�爨��爨�� 爨む�爨迦�爨�爨鉦� 爨踶�� \"%2$s\" 爨�Σ爭� 爨�爨��爨むΠ爭�爨〝�爨�爭�爨� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛� 爨�爨�Θ爨� "
+"爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爨� 爨��爨� 爨�爨萎Δ爭� 爨�爨鉦Θ?"
+
+# msgstr ""
+# "爨伍�爨ム�爨��爨�� 爨む�爨迦�爨�爨鉦Π %s 爨�爭�爨萎�爨� 爨� 爨�爨�爭�爨� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛む�爨�Θ爨� 爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爨逗�爭� 爨��爨� "
+# "爨�爨萎Δ爭� 爨�爨鉦Θ?"
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s 爨伍�爨ム�爨��爭� 爨む�爨迦�爨�爨鉦� 爨�爨�爭� 爨�爨逗Θ爭�爨む� 爨伍�爨萎�爨〝�爨� 爨む�爨迦�爨�爨鉦Ο爨� 爨��爨�爛� 爨�爨�Θ爨� 爨�爨� 爨踶� 爨�Θ爭�爨о�爨�爭� 爨��爨� 爨�爨萎Δ爭� 爨�爨鉦Θ?"
+
 msgid "Other Contacts"
 msgstr "爨�爨��爨��爨��爨� 爨�Π爨逗�爨逗Δ爨�"
 
@@ -5775,14 +5761,26 @@
 msgid "Set friendly name for %s."
 msgstr "%s 爨踶� 爨�爨��爨� 爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ 爨�爨萎�爨�イ"
 
-# tithi
-msgid "Set your friendly name."
-msgstr "爨�爨�Θ爨鉦Π 爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ爛�"
+msgid "Set Friendly Name"
+msgstr "爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ"
 
 # tithi
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "爨�爨��爨��爨��爨� MSN 爨�Θ爭�爨о�爨萎� 爨�爨�Θ爨鉦�爭� 爨踶� 爨��爨�� 爨��爨�爨��"
 
+msgid "This Location"
+msgstr "爨踶� 爨�爨�Ω爭�爨ム�爨�"
+
+# tithi
+msgid "This is the name that identifies this location"
+msgstr "爨�爨�Ω爭�爨ム�爨��爨� 爨��爨萎�爨��爨� 爨�爨萎� 爨踶�Θ 爨��爨�"
+
+msgid "Other Locations"
+msgstr "爨�爨��爨��爨��爨� 爨�爨�Ω爭�爨ム�爨�"
+
+msgid "You can sign out from other locations here"
+msgstr "爨�爨�Θ爨� 爨踶�爨鉦Θ爭� 爨�爨��爨��爨��爨� 爨�爨�Ω爭�爨ム�爨� 爨ム�爨�爭� 爨伍�爨�爨� 爨�爨�爨� 爨�爨萎Δ爭� 爨��爨萎�爨�"
+
 # tithi
 msgid "Set your home phone number."
 msgstr "爨�爨�Θ爨鉦Π 爨��爨伍�爨� 爨��爨� 爨��爨��爨��爨� 爨��爨�イ"
@@ -5878,6 +5876,9 @@
 msgid "Set Friendly Name..."
 msgstr "爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ..."
 
+msgid "View Locations..."
+msgstr "爨�爨�Ω爭�爨ム�爨� 爨��爨萎Ζ爨萎�爨謹Θ..."
+
 msgid "Set Home Phone Number..."
 msgstr "爨��爨伍�爨� 爨��爨� 爨�Ξ爭�爨�Π 爨��爨萎�爨о�爨萎Γ..."
 
@@ -7483,6 +7484,12 @@
 "爨�爨�Θ爨� 爨�爭�爨� 爨�爨��爨� 爨伍�爨��爨� 爨伍�爨ム�爨�Θ 爨踶�� 爨��爨�爭�爨�爨逗Θ爭�爨� 爨�爨萎�爭�爨�イ 爨�Χ 爨��爨��爨� 爨�爨��爨�爭�爨劇� 爨�爨萎� 爨��爨�Π爨鉦Ο爨� 爨�爭�爨劇�爨�爨� "
 "爨�爨萎�爨�イ 爨�爨�Θ爨� 爨�Ζ爨� 爨�爭�爨劇�爨�爨� 爨�爨��爨��爨項Δ 爨萎�爨�爨む� 爨�爨鉦Θ, 爨�爨�Θ爨鉦�爭� 爨�爨萎� 爨��爨謹� 爨�爨��爨�爭�爨劇� 爨�爨萎Δ爭� 爨項Μ爭�爛�"
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"爨�爨�Θ爨鉦Π 爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爨�爨逗� 爨� 爨踶��爭�爨萎�爨�Χ爨� 爨��爨萎�爭�爨�爨�, 爨�爨逗Θ爭�爨む� 爨踶�爨�爨� 爨伍�爨萎�爨〝�爨� 爨踶�爨� 爨伍Ξ爨萎�爨ムΘ 爨�爨萎� 爨��爛�"
+
 # Translated by sadia
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
@@ -7856,6 +7863,12 @@
 "爨項Σ爭�, 爨謹�爨о�爨��爨む�爨� 爨�Π爭�爨�, 爨伍�爨�爭�爨�� 爨踶�� 爨伍�爨��爨� 爨��爨��爨萎� 爨�爨�爨逗Δ 爨項Μ爭�, 爨�� 爨謹�爨о�爨��爨む�爨� 爨伍�爨�爭�爨�� 爨��爨��爨萎� 爨�爨�爨逗Δ "
 "爨項Μ爭�爛�"
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"爨�爨�Θ爨鉦Π 爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爨�爨逗� 爨� 爨踶��爭�爨萎�爨�Χ爨� 爨��爨萎�爭�爨�爨�, 爨�爨逗Θ爭�爨む� 爨�爨�Θ爨鉦Π 爨伍�爨伍�爨�爭�爨� 爨踶�爨� 爨伍Ξ爨萎�爨ムΘ 爨�爨萎� 爨��爛�"
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr "爨�爨�Θ爨� 爨伍�爨��爨逗�爨〝�爨�� 爨��爨�爭�爨�爨逗Θ爭�爨� 爨項Δ爭� 爨��爨萎�爨�イ 爨項�爨迦�爨��爨�爨鉦Ζ爭�爨� 爨�爨��爨� %s 爨�Π爭�爨�爭�爨劇� 爨�爨萎�爨�."
@@ -8430,13 +8443,11 @@
 msgid "Set Privacy Options..."
 msgstr "爨�爭�爨�Θ爭�爭�爨む�爨� 爨�爨�Χ爨� 爨��爨萎�爨о�爨萎Γ ..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "爨�Θ爭�爨о� 爨む�爨迦�爨�爨� 爨��爨萎Ζ爨萎�爨謹Θ (_L)"
-
-#, fuzzy
+msgstr "爨��爨謹�爨�Ξ爨鉦Θ爨��爨� 爨む�爨迦�爨�爨� 爨��爨萎Ζ爨萎�爨謹Θ"
+
 msgid "Show Invisible List"
-msgstr "爨�爨�Θ爭�爨む�爨萎Θ 爨む�爨迦�爨�爨�"
+msgstr "爨�爨��爨謹�爨�Ζ爭�爨� 爨む�爨迦�爨�爨� 爨��爨萎Ζ爨萎�爨謹Θ"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -8458,6 +8469,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "爨�爨��爨�爨� 爨�爨逗�爨鉦Θ爨鉦Π 爨��爨о�爨�Ξ爭� 爨�Θ爭�爨о� 爨�爨��爨伍Θ爭�爨о�爨�..."
 
+msgid "Don't use encryption"
+msgstr "爨踶��爭�爨萎�爨�Χ爨� 爨��爨�Μ爨項�爨� 爨�爨萎� 爨項Μ爭� 爨��"
+
 msgid "Use clientLogin"
 msgstr "clientLogin 爨��爨�Μ爨項�爨�"
 
@@ -8677,7 +8691,7 @@
 msgid "Buddy Comment"
 msgstr "爨�Θ爭�爨о�爨� 爨�Θ爭�爨むΜ爭�爨�"
 
-#, fuzzy, c-format
+#, c-format
 msgid "User information not available: %s"
 msgstr "爨��爨�Μ爨項�爨萎�爨鉦Π爭�爨� 爨むΕ爭�爨� 爨��爨�爭�爨� 爨��爨�爭�爨�爭� 爨��: %s"
 
@@ -8690,7 +8704,7 @@
 msgstr "爨��爨��爭�爨む�爨�爨� 爨�爨��爭�爨� 爨��爨�爨�"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "爨�爨む�爨萎�爨�爭�爨� 爨むΕ爭�爨�"
 
@@ -8724,50 +8738,55 @@
 msgstr "爨�爭�爨劇Ξ爨む�"
 
 # tithi
-#. 4 separate strings are needed in order to ease translators' job
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ"
 
 # tithi
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
-msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ"
-
+msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨�� 爨項Μ爭� 爨��"
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
 msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
-msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ"
+msgstr "爨�爨�Σ爨鉦�爨�� 爨��爨�爨鉦Θ爭� 爨項Μ爭� 爨��"
 
 # Kick =  爨む�爨萎Ω爭�爨�爨鉦Π
 # OR  爨�Ζ爨鉦�爨鉦Δ
-#, fuzzy
 msgid "you have no buddies on this list"
-msgstr "MultiMX 爨項Δ爭� 爨�爨�Θ爨鉦�爭� 爨む�爨萎Ω爭�爨�爨鉦Π 爨�爨萎� 爨項�爭�爨�爭�爛�"
-
-# tithi
-#, fuzzy, c-format
+msgstr "爨踶� 爨む�爨迦�爨�爨鉦� 爨�爨�Θ爨鉦Π 爨�爭�爨�� 爨�Θ爭�爨о� 爨��爨�"
+
+# tithi
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
-msgstr ""
-"爨�爨�Θ爨� 爨�Θ爭�爨о� 爨むΣ爨逗�爨鉦� 爨÷�爨� 爨�爭�爨迦�爨� 爨�爨萎� 爨踶���� \"爨�爨��爨��爨�Θ爭�爨� 爨�爨��爨� 爨��爨�Π爨鉦� 爨�爨��爨萎�爨�\" 爨��爨萎�爨��爨�爨� 爨�爨萎� "
-"爨む�爨��爨� 爨ム�爨�爭� 爨�爨��爨� 爨�爨��爨��爨�Θ 爨�爨鉦�爨む� 爨��爨萎�爨�イ"
-
-#, fuzzy
+msgstr "爨�爨�Θ爨� \"%s\" 爨��爨萎�爨��爨�爨� 爨�爨萎� 爨�� 爨÷�爨� 爨�爭�爨迦�爨� 爨�爨萎� 爨�Θ爭�爨о� 爨��爨� 爨�爨萎Δ爭� 爨��爨萎�爨�"
+
 msgid "Visible List"
-msgstr "爨��爨謹�爨�Ξ爨鉦Θ"
+msgstr "爨��爨謹�爨�Ξ爨鉦Θ 爨む�爨迦�爨�爨�"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
-msgstr ""
-
-#, fuzzy
+msgstr "爨�爨�Θ爨� \"爨�爨��爨謹�爨�\" 爨項Σ爭� 爨踶� 爨�Θ爭�爨о�爨萎� 爨�爨�Θ爨鉦Π 爨伍�爨�爭�爨��爨�爨鉦Ω 爨��爨�爨む� 爨��爨��爨�"
+
 msgid "Invisible List"
-msgstr "爨�爨�Θ爭�爨む�爨萎Θ 爨む�爨迦�爨�爨�"
+msgstr "爨�爨��爨謹�爨�Ζ爭�爨� 爨む�爨迦�爨�爨�"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "爨踶� 爨�Θ爭�爨о�爨萎� 爨�爨�Θ爨鉦�爭� 爨伍Μ爨伍Ξ爭� 爨�爨�Σ爨鉦�爨� 爨項�爨伍�爨�� 爨��爨�爨む� 爨��爨��爨�"
 
 # tithi
 msgid "Aquarius"
@@ -8967,9 +8986,9 @@
 msgstr "爨�爨�Θ爨鉦Π 爨�爨��爨萎�爨о�爨� 爨�爨��爨��爨�Θ 爨�爨萎� 爨��爭�爨��爛�"
 
 # tithi
-#, fuzzy, c-format
+#, c-format
 msgid "%u requires verification: %s"
-msgstr "%u 爨踶� 爨伍Δ爭�爨�Δ爨� 爨��爨�爨鉦� 爨�爨萎� 爨��爨萎�爭�爨�爨�"
+msgstr "%u 爨踶� 爨伍Δ爭�爨�Δ爨� 爨��爨�爨鉦� 爨�爨萎� 爨��爨萎�爭�爨�爨�: %s"
 
 msgid "Add buddy question"
 msgstr "爨�Θ爭�爨о�爨� 爨��爨萎Χ爭�爨� 爨��爨�"
@@ -12210,7 +12229,7 @@
 msgstr ""
 "<span size='larger' weight='bold'>%s 爨� 爨伍�爨��爨�爨むΞ!</span>\n"
 "\n"
-"爨�爨�Θ爨鉦Π 爨む�爭��爭�爨劇Θ爨逗� 爨��爨萎�爨む� 爨�爭�爨��爨�爨鉦�爨��爨� 爨�爨�Λ爨逗�爨鉦Π 爨�爨萎� 爨��爨�爛� %s 爨踶� 爨伍�爨ム� 爨伍�爨��爨� 爨��爨む�  <b>"
+"爨�爨�Θ爨鉦Π 爨む�爭��爭�爨劇Γ爨逗� 爨��爨萎�爨む� 爨�爭�爨��爨�爨鉦�爨��爨� 爨�爨�Λ爨逗�爨鉦Π 爨�爨萎� 爨��爨�爛� %s 爨踶� 爨伍�爨ム� 爨伍�爨��爨� 爨��爨む�  <b>"
 "\"爨��爨�...\"</b> 爨��爨む�爨� 爨�爨鉦Κ爭�爨� 爨踶�� 爨�爨�Θ爨鉦Π 爨��爨萎Ε爨� 爨�爭�爨��爨�爨鉦�爨��爨�爨�爨� 爨�爨�Λ爨逗�爨鉦Π 爨�爨萎�爨�イ 爨�Ζ爨� 爨�爨�Θ爨� %s "
 "爨踶� 爨��爨о�爨�Ξ爭� 爨踶�爨鉦Η爨逗� IM 爨�爭�爨��爨�爨鉦�爨��爨�爭� 爨伍�爨��爨�爭�爨� 爨項Δ爭� 爨�爨鉦Θ 爨むΜ爭� 爨伍�爨�爭�爨迦�爨�爭� 爨�爨�Λ爨逗�爨鉦Π 爨�爨萎Δ爭� 爨��爨�Π爨鉦� "
 "<b>\"爨��爨�...\"</b> 爨��爨む�爨� 爨�爨鉦Κ爭�爨�イ\n"
@@ -12491,7 +12510,7 @@
 msgstr "/爨�Θ爭�爨о�爨�爨� (_B)"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/爨�Θ爭�爨о�爨�爨�/爨�Δ爭�爨� 爨む�爭��爭�爨劇Θ爨逗� 爨��爨萎�爨む�... (_M)"
+msgstr "/爨�Θ爭�爨о�爨�爨�/爨�Δ爭�爨� 爨む�爭��爭�爨劇Γ爨逗� 爨��爨萎�爨む�... (_M)"
 
 msgid "/Buddies/Join a _Chat..."
 msgstr "/爨�Θ爭�爨о�爨�爨�/爨�爨÷�爨÷�爨�� 爨��爨�爨��爨�... (_C)"
@@ -12567,7 +12586,7 @@
 
 # snigdha
 msgid "/Tools/Set _Mood"
-msgstr "/爨�爭�爨�/爨��爨� 爨伍�爨� (_M)"
+msgstr "/爨�爭�爨�/爨��爨� 爨��爨萎�爨о�爨萎Γ (_M)"
 
 msgid "/Tools/_File Transfers"
 msgstr "/爨�爭�爨�/爨��爨�爨� 爨伍�爨ム�爨��爨��爨むΠ (_F)"
@@ -12590,7 +12609,7 @@
 
 # snigdha
 msgid "/Help/_Build Information"
-msgstr "/爨伍�爨鉦�爨� /爨むΕ爭�爨� 爨�爭�爭�爨� (_B)"
+msgstr "/爨伍�爨鉦�爨� /爨��爨迦�爨� 爨伍�爨�爭�爨萎�爨��爨� 爨むΕ爭�爨� (_B)"
 
 msgid "/Help/_Debug Window"
 msgstr "/爨伍�爨鉦Ο爨酌Δ爨�/爨÷�爨��爨� 爨�爨�爨��爨÷� (_D)"
@@ -12820,7 +12839,7 @@
 msgstr "爨�爨��爨�爭�爨萎� 爨�爨萎� 爨�� 爨�Σ爨�爨� 爨��爨�爭�爨� 爨�爨萎Δ爭� 爨項Μ爭� 爨む�爨� 爨��爨� 爨��爨�イ"
 
 msgid "Enable Account"
-msgstr "爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爭�爨萎�爨�� 爨�爨萎� 爨項Μ爭�"
+msgstr "爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爭�爨萎�爭�"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/爨�爭�爨��爨�爨鉦�爨��爨�/爨�爭�爨��爨�爨鉦�爨��爨� 爨伍�爭�爨萎�爨��爨�爨萎Γ"
@@ -13420,6 +13439,9 @@
 msgid "Lao"
 msgstr "爨迦�爨�"
 
+msgid "Maithili"
+msgstr "爨��爨ム�爨迦�"
+
 msgid "Macedonian"
 msgstr "爨��爨��爨伍�爨÷Θ爨逗Ο爨�"
 
@@ -14733,9 +14755,8 @@
 msgid "_TURN server:"
 msgstr "TURN 爨伍�爨萎�爨〝�爨�: (_T)"
 
-#, fuzzy
 msgid "_UDP Port:"
-msgstr "爨��爨萎�爨� (_P):"
+msgstr "UDP 爨��爨萎�爨� (_U):"
 
 # Translated by sadia
 msgid "Use_rname:"
@@ -14762,7 +14783,7 @@
 msgstr "爨�爨��爭�爨��爭�爨萎�爨�"
 
 msgid "Google Chrome"
-msgstr ""
+msgstr "爨�爭�爨�爨� 爨�爭�爨萎�爨�"
 
 #. Do not move the line below.  Code below expects gnome-open to be in
 #. * this list immediately after xdg-open!
@@ -14786,11 +14807,11 @@
 
 #. Translators: please do not translate "chromium-browser" here!
 msgid "Chromium (chromium-browser)"
-msgstr ""
+msgstr "爨�爭�爨萎�爨��爭�爨鉦Ξ (chromium-browser)"
 
 #. Translators: please do not translate "chrome" here!
 msgid "Chromium (chrome)"
-msgstr ""
+msgstr "爨�爭�爨萎�爨��爭�爨鉦Ξ (chrome)"
 
 msgid "Manual"
 msgstr "爨伍�爨鉦�爨逗�爨�"
@@ -15365,7 +15386,6 @@
 msgid "Small"
 msgstr "爨�爭�爨�"
 
-#, fuzzy
 msgid "Smaller versions of the default smileys"
 msgstr "爨÷�爨�Σ爭�爨� 爨伍�爨��爨�爨迦�爨�爭�爨迦�爨� 爨�爭�爨� 爨伍�爨伍�爨�爨萎Γ"
 
@@ -16453,9 +16473,8 @@
 msgstr "爨〝�爭�爨�/爨〝�爨÷�爨� 爨伍�爨�爨逗�爨伍Ξ爭�爨�  "
 
 # Translated by sadia
-#, fuzzy
 msgid "Voice and Video Settings"
-msgstr "爨〝�爭�爨�/爨〝�爨÷�爨� 爨伍�爨�爨逗�爨伍Ξ爭�爨�  "
+msgstr "爨〝�爭�爨� 爨踶�� 爨〝�爨÷�爨� 爨伍�爨�爨逗�"
 
 # Translated by sadia
 #. *< name
@@ -16756,6 +16775,15 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "爨�爨�Θ爨鉦Π 爨踶� 爨�爭�爨��爨��爨迦�爨�爭�爨謹Θ爨�爨� 爨�爨��爨��爨伍�爨� 爨�爨萎�爨� 爨�爨��爨�Δ爨� 爨��爨�爛�"
 
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr "爨�爨�-爨��爨��爨��爨� 爨��爨�爨�爨伍�爨�爭�爨萎�爨� 爨��爨��爨��爭� 爨む�爨萎�爨�爨� 爨項�爭�爨�爭�\n"
+
+#~ msgid "Transfer was closed."
+#~ msgstr "爨伍�爨ム�爨��爨��爨むΠ 爨�Θ爭�爨� 爨�爨萎� 爨��爭�爨� 爨項�爭�爨�爭�爛�"
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "爨�爨�-爨��爨��爨��爨� 爨��爨�爨�爨伍�爨�爭�爨萎�爨� 爨�爭�爨迦Δ爭� 爨��爨�Π爭�爨�"
+
 # Translated by sadia
 #~ msgid "The certificate has expired and should not be considered valid."
 #~ msgstr "爨伍�爨萎�爨�爨逗Λ爨逗�爭�爨�爨�爨� 爨��爭�爨鉦Ζ爨�爨む�爨む�爨萎�爨� 爨踶�� 爨��爨� 爨項�爨伍�爨�� 爨��爨��爨�爨�� 爨�爨萎� 爨�爨�爨逗Δ 爨��爛� "
@@ -16769,6 +16797,10 @@
 #~ msgstr "爨��爨萎�爨むΘ (爨��爨萎�爨� 5223) SSL 爨��爨萎�爭�爨� 爨��爨о�爨� 爨�爨萎� 爨項Μ爭�"
 
 # tithi
+#~ msgid "Set your friendly name."
+#~ msgstr "爨�爨�Θ爨鉦Π 爨�Θ爭�爨о�爨伍�爨迦Ν 爨��爨� 爨��爨萎�爨о�爨萎Γ爛�"
+
+# tithi
 #
 #
 # Translated by sadia
--- a/po/cs.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/cs.po	Mon Nov 22 03:04:17 2010 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:11-0400\n"
-"PO-Revision-Date: 2010-10-15 17:26+0100\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-21 11:47+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "Language: cs\n"
@@ -251,7 +251,7 @@
 msgstr "Chyba p�i p�id叩v叩n鱈 skupiny"
 
 msgid "You must give a name for the group to add."
-msgstr "Mus鱈te zadat n叩zev skupiny, kterou p�idat."
+msgstr "Mus鱈te zadat n叩zev skupiny, kterou chcete p�idat."
 
 msgid "Add Group"
 msgstr "P�idat skupinu"
@@ -639,7 +639,7 @@
 msgstr "Povolit zvuky"
 
 msgid "You are not connected."
-msgstr "Nejsi p�ipojen."
+msgstr "Nejste p�ipojen."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-ODPOV��> "
@@ -904,7 +904,7 @@
 msgstr "%s se pokou邸鱈 spustit multimedi叩ln鱈 sezen鱈 s nepodporovan箪m typem."
 
 msgid "You have rejected the call."
-msgstr "Odm鱈tnul jste vol叩n鱈."
+msgstr "Odm鱈tli jste vol叩n鱈."
 
 msgid "call: Make an audio call."
 msgstr "call: Vytvo�it audio hovor."
@@ -1254,7 +1254,7 @@
 msgstr "Osoba opust鱈 chat"
 
 msgid "You talk in chat"
-msgstr "Vy mluv鱈te v chatu"
+msgstr "Mluv鱈te v chatu"
 
 msgid "Others talk in chat"
 msgstr "Jin鱈 mluv鱈 v chatu"
@@ -1694,7 +1694,7 @@
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
-msgstr "Nem叩te datab叩zi certifik叩t哲, tak転e certifik叩ty nemohou ov��eny."
+msgstr "Nem叩te datab叩zi certifik叩t哲, tak転e certifik叩ty nemohou b箪t ov��eny."
 
 msgid "The certificate chain presented is invalid."
 msgstr "Certifika�n鱈 �et�z je neplatn箪."
@@ -4805,15 +4805,6 @@
 msgid "Unknown Error in presence"
 msgstr "Nezn叩m叩 chyba v p�鱈tomnosti"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Chyba p�i in-band bytestream p�enosu\n"
-
-msgid "Transfer was closed."
-msgstr "P�enos byl ukon�en."
-
-msgid "Failed to open in-band bytestream"
-msgstr "Selhalo otev�en鱈 in-band bytestreamu"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Nemohu odeslat soubor %s, u転ivatel nepodporuje p�enosy soubor哲"
@@ -5127,26 +5118,6 @@
 msgid "The username specified does not exist."
 msgstr "Zadan辿 jm辿no u転ivatele neexistuje."
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Probl辿m se synchronizac鱈 seznamu kamar叩d哲 v %s (%s)"
-
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s na m鱈stn鱈m seznamu je ve skupin� \"%s\", ale ne v seznamu na serveru. "
-"Chcete p�idat tohoto kamar叩da?"
-
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s je na m鱈stn鱈m seznamu, ale ne v seznamu na serveru. Chcete p�idat tohoto "
-"kamar叩da?"
-
 msgid "Unable to parse message"
 msgstr "Nemohu zpracovat zpr叩vu"
 
@@ -5317,6 +5288,26 @@
 msgid "MSN Error: %s\n"
 msgstr "Chyba MSN: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Probl辿m se synchronizac鱈 seznamu kamar叩d哲 v %s (%s)"
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s na m鱈stn鱈m seznamu je ve skupin� \"%s\", ale ne v seznamu na serveru. "
+"Chcete p�idat tohoto kamar叩da?"
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s je na m鱈stn鱈m seznamu, ale ne v seznamu na serveru. Chcete p�idat tohoto "
+"kamar叩da?"
+
 msgid "Other Contacts"
 msgstr "Jin辿 kontakty"
 
@@ -5341,7 +5332,7 @@
 
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s v叩m poslal pozv叩nku k hlasov辿mu chatu, kter箪 nen鱈 podporov叩no."
+msgstr "%s v叩m poslal pozv叩nku k hlasov辿mu chatu, kter箪 nen鱈 podporov叩n."
 
 msgid "Nudge"
 msgstr "�泥ouchnut鱈"
@@ -5364,12 +5355,24 @@
 msgid "Set friendly name for %s."
 msgstr "Nastavit p�叩telsk辿 jm辿no pro %s."
 
-msgid "Set your friendly name."
-msgstr "Nastavit va邸e p�叩telsk辿 jm辿no"
+msgid "Set Friendly Name"
+msgstr "Nastavit p�叩telsk辿 jm辿no"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Toto je jm辿no, pod kter箪m v叩s budou vid�t ostatn鱈 kamar叩di MSN."
 
+msgid "This Location"
+msgstr "Toto um鱈st�n鱈"
+
+msgid "This is the name that identifies this location"
+msgstr "Toto je jm辿no, kter辿 identifikuje toto um鱈st�n鱈"
+
+msgid "Other Locations"
+msgstr "Dal邸鱈 um鱈st�n鱈"
+
+msgid "You can sign out from other locations here"
+msgstr "M哲転ete se p�ihl叩sit z jin辿ho um鱈st�n鱈"
+
 msgid "Set your home phone number."
 msgstr "Nastavte sv辿 dom叩c鱈 telefonn鱈 �鱈slo."
 
@@ -5455,6 +5458,9 @@
 msgid "Set Friendly Name..."
 msgstr "Nastavit p�叩telsk辿 jm辿no..."
 
+msgid "View Locations..."
+msgstr "Zobrazit um鱈st�n鱈..."
+
 msgid "Set Home Phone Number..."
 msgstr "Nastavit dom叩c鱈 telefonn鱈 �鱈slo..."
 
@@ -5890,7 +5896,7 @@
 msgstr "PINy nesouhlas鱈."
 
 msgid "The Display Name you entered is invalid."
-msgstr "Zadan箪 jm辿no pro zobrazen鱈 nen鱈 platn辿"
+msgstr "Zadan辿 jm辿no pro zobrazen鱈 nen鱈 platn辿"
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -5909,7 +5915,7 @@
 msgstr "Informace z profilu nebyly z鱈sk叩ny, zkuste to pros鱈m pozd�ji."
 
 msgid "Your UID"
-msgstr "Tvoje UID"
+msgstr "Va邸e UID"
 
 #. pin
 #. pin (required)
@@ -6059,7 +6065,7 @@
 msgstr "Skryt辿 �鱈slo"
 
 msgid "Your MXit ID..."
-msgstr "Tvoje MXit ID..."
+msgstr "Va邸e MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6840,6 +6846,13 @@
 "P�ipojovali a odpojovali jste se p�鱈li邸 �asto. Po�kejte deset minut a zkuste "
 "to znovu. Pokud to budete d叩le zkou邸e, budete muset �ekat je邸t� d辿le."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"Vy転adujete 邸ifrov叩n鱈 v nastaven鱈 炭�t哲, ale jeden ze server哲 邸ifrov叩n鱈 "
+"nepodporuje."
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -7149,6 +7162,12 @@
 "u転ivatele mus鱈 b箪t platn叩 emailov叩 adresa nebo za�鱈nat p鱈smenem a obsahovat "
 "jen �鱈slice, p鱈smena a mezery, nebo obsahovat jen �鱈slice."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"Vy転adujete 邸ifrov叩n鱈 v nastaven鱈 炭�t哲, ale v叩邸 syst辿m 邸ifrov叩n鱈 nepodporuje."
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -7276,7 +7295,7 @@
 msgstr "U転ivatel ICQ %u v叩m poslal kamar叩da: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Chcete p�idat tohoto kamar叩da do sv辿ho seznamu kamar叩d哲?"
+msgstr "Chcete p�idat tohoto kamar叩da do va邸eho seznamu kamar叩d哲?"
 
 msgid "_Add"
 msgstr "_P�idat"
@@ -7671,13 +7690,11 @@
 msgid "Set Privacy Options..."
 msgstr "Nastavit mo転nosti soukrom鱈..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "Zobrazit seznam _kamar叩d哲"
-
-#, fuzzy
+msgstr "Zobrazit seznam viditeln箪ch kamar叩d哲"
+
 msgid "Show Invisible List"
-msgstr "Seznam pozvan箪ch"
+msgstr "Zobrazit seznam neviditeln箪ch kamar叩d哲"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -7695,6 +7712,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "Hledat kamar叩da podle emailov辿 adresy..."
 
+msgid "Don't use encryption"
+msgstr "Nepou転鱈vat 邸ifrov叩n鱈"
+
 msgid "Use clientLogin"
 msgstr "Pou転鱈t clientLogin"
 
@@ -7893,7 +7913,7 @@
 msgstr "Osobn鱈 WWW str叩nka"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "P�鱈davn辿 informace"
 
@@ -7921,46 +7941,51 @@
 msgid "Capabilities"
 msgstr "Schopnosti"
 
-#. 4 separate strings are needed in order to ease translators' job
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "Vypadat p�ipojen"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
-msgstr "Vypadat p�ipojen"
-
+msgstr "Nevypadat p�ipojen"
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
 msgstr "Vypadat odpojen"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
-msgstr "Vypadat odpojen"
-
-#, fuzzy
+msgstr "Nevypadat odpojen"
+
 msgid "you have no buddies on this list"
-msgstr "Byl jste vykopnut z MultiMX."
-
-#, fuzzy, c-format
+msgstr "nem叩te kamar叩dy v tomto seznamu"
+
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
-msgstr ""
-"M哲転ete znovu po転叩dat o autorizaci od t�chto kamar叩d哲 kliknut鱈m na n� prav箪m "
-"tla�鱈tkem a zvolen鱈m \"Znovu po転叩dat o autorizaci.\""
-
-#, fuzzy
+msgstr "M哲転ete p�idat kamar叩da prav箪m kliknut鱈m a vybr叩n鱈m \"%s\""
+
 msgid "Visible List"
-msgstr "Viditeln箪"
+msgstr "Seznam viditeln箪ch"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
-msgstr ""
-
-#, fuzzy
+msgstr "Tyto kamar叩di uvid鱈 v叩邸 stav p�i p�epnut鱈 na \"Neviditeln箪\""
+
 msgid "Invisible List"
-msgstr "Seznam pozvan箪ch"
+msgstr "Seznam neviditeln箪ch"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "Tyto kamar叩di v叩s v転dy uvid鱈 jako odpojen辿ho"
 
 msgid "Aquarius"
 msgstr "Vodn叩�"
@@ -8123,7 +8148,7 @@
 msgstr "Pozn叩mka kamar叩da"
 
 msgid "Change his/her memo as you like"
-msgstr "Zm��te jeho/jej鱈 pozn叩mku podle sebe"
+msgstr "Zm��te jeho/jej鱈 pozn叩mku podle v叩s"
 
 msgid "_Modify"
 msgstr "_Zm�nit"
@@ -8227,7 +8252,7 @@
 msgstr "Zadejte pros鱈m Qun �鱈slo"
 
 msgid "You can only search for permanent Qun\n"
-msgstr "You can only search for permanent Qun\n"
+msgstr "M哲転ete vyhled叩vat jen permanentn鱈 Qun\n"
 
 msgid "(Invalid UTF-8 string)"
 msgstr "(Neplatn箪 UTF-8 �et�zec)"
@@ -9415,7 +9440,7 @@
 
 #, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "Byli jste zabiti v %s: (%s)"
+msgstr "Byli jste zabiti %s (%s)"
 
 #, c-format
 msgid "Killed by %s (%s)"
@@ -10179,7 +10204,7 @@
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s v叩m poslal pozv叩nku k WWW kame�e, co転 je邸t� nen鱈 podporov叩no."
+msgstr "%s v叩m poslal pozv叩nku k webov辿 kame�e, co転 je邸t� nen鱈 podporov叩no."
 
 msgid "Your SMS was not delivered"
 msgstr "Va邸e SMS nebyla doru�ena"
@@ -10268,7 +10293,7 @@
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"��et uzam�en pro p�鱈li邸 mnoho pokus哲 o p�ihl叩邸en鱈. P�ihl叩邸te se na str叩nku "
+"��et uzam�en pro p�鱈li邸 mnoho pokus哲 o p�ihl叩邸en鱈. P�ihlaste se na str叩nku "
 "Yahoo!."
 
 #, c-format
@@ -10393,7 +10418,7 @@
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s zkou邸鱈 v叩m poslat %d soubor哲.\n"
+msgstr "%s v叩m zkou邸鱈 poslat %d soubor哲.\n"
 
 msgid "Write Error"
 msgstr "Chyba p�i z叩pisu"
@@ -10462,7 +10487,7 @@
 msgstr ""
 "Nemohu z鱈skat profil u転ivatele. To pravd�podobn� znamen叩, 転e u転ivatel "
 "neexistuje; n�kdy ale Yahoo! opravdu nem哲転e naj鱈t profil u転ivatele. Pokud "
-"v鱈ce, 転e u転ivatel existuje, zkuste to pros鱈m znovu pozd�ji."
+"v鱈te, 転e u転ivatel existuje, zkuste to pros鱈m znovu pozd�ji."
 
 msgid "The user's profile is empty."
 msgstr "Profil u転ivatele je pr叩zdn箪."
@@ -11057,7 +11082,7 @@
 
 #, c-format
 msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
-msgstr "%s%s%s%s chce t� (%s) p�idat do sv辿ho seznamu kamar叩d哲%s%s"
+msgstr "%s%s%s%s chce v叩s (%s) p�idat do sv辿ho seznamu kamar叩d哲%s%s"
 
 #. Buddy List
 msgid "Background Color"
@@ -11170,7 +11195,7 @@
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr "Text informace, kdy転 je v chatu zpr叩va s tvoj鱈 p�ezd鱈vkou"
+msgstr "Text informace, kdy転 je v chatu zpr叩va s va邸鱈 p�ezd鱈vkou"
 
 msgid "The text information for a buddy's status"
 msgstr "Text informace pro stav kamar叩da"
@@ -12220,6 +12245,9 @@
 msgid "Lao"
 msgstr "Laon邸tina"
 
+msgid "Maithili"
+msgstr "Maithili"
+
 msgid "Macedonian"
 msgstr "Makedon邸tina"
 
@@ -12884,16 +12912,14 @@
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Opravdu 転e chcete natrvalo odstranit z叩znam konverzace s %s, kter箪 za�al v "
-"%s?"
+"Opravdu chcete natrvalo odstranit z叩znam konverzace s %s, kter箪 za�al v %s?"
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in "
 "%s which started at %s?"
 msgstr ""
-"Opravdu 転e chcete natrvalo odstranit z叩znam konverzace v %s, kter箪 za�al v "
-"%s?"
+"Opravdu chcete natrvalo odstranit z叩znam konverzace v %s, kter箪 za�al v %s?"
 
 #, c-format
 msgid ""
@@ -13010,11 +13036,11 @@
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr "%s chce za�鱈t audio/video rozhovor s tebou."
+msgstr "%s chce za�鱈t audio/video rozhovor s v叩mi."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr "%s chce za�鱈t video rozhovor s tebou."
+msgstr "%s chce za�鱈t video rozhovor s v叩mi."
 
 msgid "Incoming Call"
 msgstr "P�鱈choz鱈 hovor"
@@ -13756,7 +13782,7 @@
 msgstr "_P�idat chat"
 
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Opravdu 転e chcete odstranit zvolen辿 ulo転en辿 stavy?"
+msgstr "Opravdu chcete odstranit zvolen辿 ulo転en辿 stavy?"
 
 #. Use button
 msgid "_Use"
@@ -15299,6 +15325,18 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Nem叩te opr叩vn�n鱈 k odinstalaci t辿to aplikace."
 
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr "Chyba p�i in-band bytestream p�enosu\n"
+
+#~ msgid "Transfer was closed."
+#~ msgstr "P�enos byl ukon�en."
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "Selhalo otev�en鱈 in-band bytestreamu"
+
+#~ msgid "Set your friendly name."
+#~ msgstr "Nastavit va邸e p�叩telsk辿 jm辿no"
+
 #~ msgid "The certificate has expired and should not be considered valid."
 #~ msgstr "Certifik叩t vypr邸el a nem�l by b箪t pova転ov叩n za platn箪."
 
@@ -15759,9 +15797,6 @@
 #~ msgid "In-Band Registration"
 #~ msgstr "In-Band registrace"
 
-#~ msgid "User Location"
-#~ msgstr "Um鱈st�n鱈 u転ivatele"
-
 #~ msgid "User Avatar"
 #~ msgstr "Avatar u転ivatele"
 
--- a/po/es.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/es.po	Mon Nov 22 03:04:17 2010 +0000
@@ -53,8 +53,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:11-0400\n"
-"PO-Revision-Date: 2010-08-02 23:10+0200\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-17 03:10+0100\n"
 "Last-Translator: Javier Fern叩ndez-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "Language: \n"
@@ -1808,13 +1808,12 @@
 "El certificado no es v叩lido a炭n. Compruebe que la fecha y hora de su "
 "ordenador son correctas."
 
-#, fuzzy
 msgid ""
 "The certificate has expired and should not be considered valid.  Check that "
 "your computer's date and time are accurate."
 msgstr ""
-"El certificado no es v叩lido a炭n. Compruebe que la fecha y hora de su "
-"ordenador son correctas."
+"El certificado ha expirado y no se considera ya v叩lido. Compruebe que la "
+"fecha y hora de su ordenador son correctas."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4870,20 +4869,17 @@
 msgid "Domain"
 msgstr "Dominio"
 
-#, fuzzy
 msgid "Require encryption"
-msgstr "Solicitar autorizaci坦n"
-
-#, fuzzy
+msgstr "Solicitar cifrado"
+
 msgid "Use encryption if available"
-msgstr "Informaci坦n de usuario de no disponible: %s"
+msgstr "Utilizar cifrado si es posible"
 
 msgid "Use old-style SSL"
-msgstr ""
-
-#, fuzzy
+msgstr "Utilizar SSL antiguo"
+
 msgid "Connection security"
-msgstr "Expir坦 la conexi坦n"
+msgstr "Seguridad de la conexi坦n"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticaci坦n en claro sobre canales no cifrados"
@@ -4989,15 +4985,6 @@
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Se produjo un error en la transferencia de flujos de bytes en banda\n"
-
-msgid "Transfer was closed."
-msgstr "Se cerr坦 la transferencia."
-
-msgid "Failed to open in-band bytestream"
-msgstr "Fallo al abrir un flujo de bytes en banda"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -5317,26 +5304,6 @@
 msgid "The username specified does not exist."
 msgstr "El nombre de usuario especificado no existe."
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Problema de sincronizaci坦n de la lista de amigos en %s (%s)"
-
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s est叩 en la lista local dentro del grupo 束%s損 pero no est叩 en la lista del "
-"servidor. 多Desea a単adir a este amigo?"
-
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s est叩 en la lista local pero no est叩 en la lista del servidor. 多Desea "
-"a単adir a este amigo?"
-
 msgid "Unable to parse message"
 msgstr "No se pudo interpretar el mensaje"
 
@@ -5511,6 +5478,26 @@
 msgid "MSN Error: %s\n"
 msgstr "Error MSN: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Problema de sincronizaci坦n de la lista de amigos en %s (%s)"
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s est叩 en la lista local dentro del grupo 束%s損 pero no est叩 en la lista del "
+"servidor. 多Desea a単adir a este amigo?"
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s est叩 en la lista local pero no est叩 en la lista del servidor. 多Desea "
+"a単adir a este amigo?"
+
 msgid "Other Contacts"
 msgstr "Otros contactos"
 
@@ -5564,12 +5551,24 @@
 msgid "Set friendly name for %s."
 msgstr "Establecer  nombre de amigo para %s."
 
-msgid "Set your friendly name."
-msgstr "Establecer su nombre de amigo."
+msgid "Set Friendly Name"
+msgstr "Establecer nombre de amigo"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�ste es el nombre bajo el que otros amigos MSN le ver叩n."
 
+msgid "This Location"
+msgstr "Esta ubicaci坦n"
+
+msgid "This is the name that identifies this location"
+msgstr "�ste es el nombre que identifica a esta ubicaci坦n"
+
+msgid "Other Locations"
+msgstr "Otras ubicaciones"
+
+msgid "You can sign out from other locations here"
+msgstr "Puede desconectarse de otras ubicaciones aqu鱈"
+
 msgid "Set your home phone number."
 msgstr "Establezca el n炭mero de tel辿fono de su domicilio."
 
@@ -5657,6 +5656,9 @@
 msgid "Set Friendly Name..."
 msgstr "Establecer su nombre de amigo..."
 
+msgid "View Locations..."
+msgstr "Ver ubicaciones..."
+
 msgid "Set Home Phone Number..."
 msgstr "Establecer el n炭mero de tel辿fono de su domicilio..."
 
@@ -7073,6 +7075,13 @@
 "int辿ntelo de nuevo. Si sigue intent叩ndolo, necesitar叩 esperar incluso m叩s "
 "tiempo."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"En su configuraci坦n de cuenta indic坦 que era necesario utilizar cifrado, "
+"pero ninguno de los servidores lo soporta."
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -7387,6 +7396,13 @@
 "una letra y s坦lo pueden contener letras, n炭meros y espacios, o contener s坦lo "
 "n炭meros."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"Solicit坦 cifrado en su configuraci坦n de cuenta, pero su sistema no soporta "
+"el uso de cifrado."
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -7862,9 +7878,8 @@
 msgid "Change Address To:"
 msgstr "Cambiar direcci坦n a:"
 
-#, fuzzy
 msgid "you are not waiting for authorization"
-msgstr "<i>usted no est叩 esperando autorizaci坦n</i>"
+msgstr "usted no est叩 esperando autorizaci坦n"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorizaci坦n de los siguientes amigos"
@@ -7903,13 +7918,11 @@
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "Mostrar la _lista de amigos"
-
-#, fuzzy
+msgstr "Mostrar lista visible"
+
 msgid "Show Invisible List"
-msgstr "Lista de invitados"
+msgstr "Mostrar lista invisible"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -7927,6 +7940,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "Buscar un amigo por correo electr坦nico..."
 
+msgid "Don't use encryption"
+msgstr "No utilizar cifrado"
+
 msgid "Use clientLogin"
 msgstr "Utilizar 束clientLogin損"
 
@@ -8126,7 +8142,7 @@
 msgstr "P叩gina web personal"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "Informaci坦n adicional"
 
@@ -8154,46 +8170,53 @@
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#. 4 separate strings are needed in order to ease translators' job
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
-msgstr "Parecer conectado"
-
+msgstr "No aparecer conectado"
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
-msgstr "Parecer desconectado"
-
-#, fuzzy
+msgstr "No aparecer desconectado"
+
 msgid "you have no buddies on this list"
-msgstr "Ha sido expulsado de este MultiMX."
-
-#, fuzzy, c-format
+msgstr "no tiene amigos en esta lista"
+
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
 msgstr ""
-"Puede volver a pedir autorizaci坦n a estos amigos apretando el bot坦n derecho "
-"del rat坦n sobre ellos y escogiendo 束Solicitar autorizaci坦n otra vez.損"
-
-#, fuzzy
+"Puede a単adir a un amigo a esta lista pulsando con el bot坦n derecho del rat坦n "
+"sobre 辿l y escogiendo 束%s損"
+
 msgid "Visible List"
-msgstr "Visible"
+msgstr "Lista visible"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
-msgstr ""
-
-#, fuzzy
+msgstr "Estos amigos ver叩n su estado cuando pase a estado 束Invisible損"
+
 msgid "Invisible List"
-msgstr "Lista de invitados"
+msgstr "Lista invisible"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "Estos amigos siempre le ver叩n como desconectado"
 
 msgid "Aquarius"
 msgstr "Acuario"
@@ -8373,9 +8396,9 @@
 msgid "Your request was rejected."
 msgstr "Su solicitud fu辿 rechazada."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requires verification: %s"
-msgstr "%u solicita verificaci坦n"
+msgstr "%u solicita verificaci坦n: %s"
 
 msgid "Add buddy question"
 msgstr "A単adir una pregunta para el amigo"
@@ -11320,9 +11343,9 @@
 "Puede volver a esta ventana para a単adir, editar o eliminar cuentas desde la "
 "ventana de lista de amigos seleccionando <b>Cuentas->Gestionar Cuentas</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
-msgstr "%s%s%s%s quiere a単adir a %s a su lista de amigos%s%s."
+msgstr "%s%s%s%s quiere a単adirle (%s) a su lista de amigos%s%s."
 
 #. Buddy List
 msgid "Background Color"
@@ -12486,6 +12509,9 @@
 msgid "Lao"
 msgstr "Laosiano"
 
+msgid "Maithili"
+msgstr "Maithili"
+
 msgid "Macedonian"
 msgstr "Macedonio"
 
@@ -13708,9 +13734,8 @@
 msgid "_TURN server:"
 msgstr "Servidor _TURN:"
 
-#, fuzzy
 msgid "_UDP Port:"
-msgstr "_Puerto:"
+msgstr "Puerto _UDP:"
 
 msgid "Use_rname:"
 msgstr "Nombre de usua_rio:"
@@ -13734,7 +13759,7 @@
 msgstr "Konqueror"
 
 msgid "Google Chrome"
-msgstr ""
+msgstr "Google Chrome"
 
 #. Do not move the line below.  Code below expects gnome-open to be in
 #. * this list immediately after xdg-open!
@@ -13758,11 +13783,11 @@
 
 #. Translators: please do not translate "chromium-browser" here!
 msgid "Chromium (chromium-browser)"
-msgstr ""
+msgstr "Chromium (chromium-browser)"
 
 #. Translators: please do not translate "chrome" here!
 msgid "Chromium (chrome)"
-msgstr ""
+msgstr "Chromium (chrome)"
 
 msgid "Manual"
 msgstr "Manual"
@@ -14304,7 +14329,6 @@
 msgid "Small"
 msgstr "Peque単a"
 
-#, fuzzy
 msgid "Smaller versions of the default smileys"
 msgstr "Versiones m叩s peque単as de los emoticonos por omisi坦n"
 
@@ -15354,9 +15378,8 @@
 msgid "Voice/Video Settings"
 msgstr "Configuraci坦n de voz/v鱈deo"
 
-#, fuzzy
 msgid "Voice and Video Settings"
-msgstr "Configuraci坦n de voz/v鱈deo"
+msgstr "Configuraci坦n de voz y v鱈deo"
 
 #. *< name
 #. *< version
@@ -15635,6 +15658,19 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "No tiene permisos para desinstalar esta aplicaci坦n."
 
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr ""
+#~ "Se produjo un error en la transferencia de flujos de bytes en banda\n"
+
+#~ msgid "Transfer was closed."
+#~ msgstr "Se cerr坦 la transferencia."
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "Fallo al abrir un flujo de bytes en banda"
+
+#~ msgid "Set your friendly name."
+#~ msgstr "Establecer su nombre de amigo."
+
 #~ msgid "The certificate has expired and should not be considered valid."
 #~ msgstr "El certificado ha expirado y no ser鱈a considerado v叩lido."
 
--- a/po/nl.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/nl.po	Mon Nov 22 03:04:17 2010 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:12-0400\n"
-"PO-Revision-Date: 2010-10-10 10:55+0100\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-18 17:03+0100\n"
 "Last-Translator: Gideon van Melle <translations@gvmelle.com>\n"
 "Language-Team: Dutch <translations@gvmelle.com>\n"
 "Language: nl\n"
@@ -1777,7 +1777,7 @@
 msgstr "SSL certificaatfout"
 
 msgid "Unable to validate certificate"
-msgstr "Kan certificaat valideren"
+msgstr "Kan certificaat niet valideren"
 
 #, c-format
 msgid ""
@@ -4887,15 +4887,6 @@
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in aanwezigheid"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Er is een fout op de in-band bytestream overdracht\n"
-
-msgid "Transfer was closed."
-msgstr "Bestandsoverdracht gesloten."
-
-msgid "Failed to open in-band bytestream"
-msgstr "Kan geen in-band bytestream openen"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -5214,25 +5205,6 @@
 msgid "The username specified does not exist."
 msgstr "Ingevoerde gebruikersnaam bestaat niet."
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Synchronisatieprobleem in vriendenlijst van %s (%s)"
-
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s is op de lokale lijst in de groep \"%s\", maar niet op de serverlijst. "
-"Wilt u deze toevoegen?"
-
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?"
-
 msgid "Unable to parse message"
 msgstr "Kan het bericht niet ontleden"
 
@@ -5403,6 +5375,25 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-fout: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Synchronisatieprobleem in vriendenlijst van %s (%s)"
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s is op de lokale lijst in de groep \"%s\", maar niet op de serverlijst. "
+"Wilt u deze toevoegen?"
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?"
+
 msgid "Other Contacts"
 msgstr "Andere Contactpersonen"
 
@@ -5454,12 +5445,24 @@
 msgid "Set friendly name for %s."
 msgstr "Geef een bijnaam voor %s."
 
-msgid "Set your friendly name."
-msgstr "Bijnaam instellen."
+msgid "Set Friendly Name"
+msgstr "Geef Bijnaam"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Dit is de naam die andere MSN vrienden van u zullen zien."
 
+msgid "This Location"
+msgstr "Deze Locatie"
+
+msgid "This is the name that identifies this location"
+msgstr "Dit is de naam die deze locatie indentificeert."
+
+msgid "Other Locations"
+msgstr "andere Locaties"
+
+msgid "You can sign out from other locations here"
+msgstr "U kunt u hier bij andere locaties afmelden."
+
 msgid "Set your home phone number."
 msgstr "Telefoonnummer voor thuis instellen."
 
@@ -5546,6 +5549,9 @@
 msgid "Set Friendly Name..."
 msgstr "Bijnaam instellen..."
 
+msgid "View Locations..."
+msgstr "Bekijk Locaties..."
+
 msgid "Set Home Phone Number..."
 msgstr "Telefoon thuis instellen..."
 
@@ -6953,6 +6959,13 @@
 "U heeft u te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
 "keer. Als u verder gaat moet u nog langer wachten."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"U heeft encryptie nodig volgens uw account instellingen, maar 辿辿n van de "
+"servers ondersteunt dit niet."
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -7266,6 +7279,13 @@
 "met een letter en slechts cijfers, letters en spaties bevatten, of slechts "
 "nummers bevatten."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"U heeft encryptie nodig volgens uw account instellingen, maar encryptie "
+"wordt niet door uw systeem ondersteund."
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -7783,13 +7803,11 @@
 msgid "Set Privacy Options..."
 msgstr "Privacy-opties instellen..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "Vriendenlijst _weergeven"
-
-#, fuzzy
+msgstr "Toon Zichtbaren Lijst"
+
 msgid "Show Invisible List"
-msgstr "Uitnodigingslijst"
+msgstr "Toon Onzichtbaren Lijst"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -7807,6 +7825,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "Vriend zoeken door middel van e-mail..."
 
+msgid "Don't use encryption"
+msgstr "Gebruik geen encryptie"
+
 msgid "Use clientLogin"
 msgstr "Gebruik clientLogin"
 
@@ -7999,9 +8020,9 @@
 msgid "Buddy Comment"
 msgstr "Opmerking bij Vriend"
 
-#, fuzzy, c-format
+#, c-format
 msgid "User information not available: %s"
-msgstr "Gebruik encryptie indien aanwezig"
+msgstr "Gebruikersinformatie niet beschikbaar: %s"
 
 msgid "Mobile Phone"
 msgstr "Mobiel nummer"
@@ -8010,7 +8031,7 @@
 msgstr "Persoonlijke webpagina"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "Extra informatie"
 
@@ -8038,46 +8059,54 @@
 msgid "Capabilities"
 msgstr "Mogelijkheden"
 
-#. 4 separate strings are needed in order to ease translators' job
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "Online weergeven"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
-msgstr "Online weergeven"
-
+msgstr "Niet Online weergeven"
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
 msgstr "offline weergeven"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
-msgstr "offline weergeven"
-
-#, fuzzy
+msgstr "Niet Offline weergeven"
+
 msgid "you have no buddies on this list"
-msgstr "U bent uit deze MultiMX gegooid."
-
-#, fuzzy, c-format
+msgstr "U heeft geen vrienden op deze lijst"
+
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
 msgstr ""
-"U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de "
-"vrienden te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
-
-#, fuzzy
+"U kunt een vriend toevoegen aan deze lijst door rechts op een van hern te "
+"klikken en dan \"%s\" te selecteren"
+
 msgid "Visible List"
-msgstr "Beschikbaar"
+msgstr "Zichtbaren Lijst"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
 msgstr ""
-
-#, fuzzy
+"Deze vrienden kunnen uw status zien als u overschakelt naar \"Onzichtbaar\""
+
 msgid "Invisible List"
-msgstr "Uitnodigingslijst"
+msgstr "Onzichtbaren Lijst"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "Deze vrienden zullen u altijd als Offline zien"
 
 msgid "Aquarius"
 msgstr "Waterman"
@@ -12382,6 +12411,9 @@
 msgid "Lao"
 msgstr "Laotiaans"
 
+msgid "Maithili"
+msgstr "Maithili"
+
 msgid "Macedonian"
 msgstr "Macedonisch"
 
@@ -15525,6 +15557,18 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "U mag dit programma niet verwijderen."
 
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr "Er is een fout op de in-band bytestream overdracht\n"
+
+#~ msgid "Transfer was closed."
+#~ msgstr "Bestandsoverdracht gesloten."
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "Kan geen in-band bytestream openen"
+
+#~ msgid "Set your friendly name."
+#~ msgstr "Bijnaam instellen."
+
 #~ msgid "The certificate has expired and should not be considered valid."
 #~ msgstr ""
 #~ "Het certificaat is verlopen en moet niet als geldig worden beschouwd."
--- a/po/nn.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/nn.po	Mon Nov 22 03:04:17 2010 +0000
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: gtranslator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:12-0400\n"
-"PO-Revision-Date: 2010-10-11 01:26+0100\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-15 21:27+0100\n"
 "Last-Translator: Yngve Spjeld Landro <l10n@landro.net>\n"
 "Language-Team: Norwegian Nynorsk <l10n@landro.net>\n"
 "Language: nn\n"
@@ -3841,7 +3841,7 @@
 msgstr "Autentisering i klartekst"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr "Du krev kryptering som ikkje er tilgjengeleg p奪 denne tenaren."
+msgstr "Du krev kryptering, men han finst ikkje p奪 denne tenaren."
 
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring fr奪 tenaren"
@@ -4843,15 +4843,6 @@
 msgid "Unknown Error in presence"
 msgstr "Ukjend feil til stades"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Overf淡ringa av samtidsdatastraumen feila\n"
-
-msgid "Transfer was closed."
-msgstr "Overf淡ringa blei lukka."
-
-msgid "Failed to open in-band bytestream"
-msgstr "Klarte ikkje 奪 opna samtidsdatastraum"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -5169,26 +5160,6 @@
 msgid "The username specified does not exist."
 msgstr "Brukarnamnet finst ikkje"
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Problem med synkroniseringa av vennelista i %s (%s)"
-
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s p奪 den lokale lista er med i gruppa \"%s\", men ikkje p奪 tenarlista. "
-"�nskjer du 奪 leggja ho/han til?"
-
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s er i den lokale lista, men ikkje p奪 tenarlista. �nskjer du 奪 leggja ho/"
-"han til?"
-
 msgid "Unable to parse message"
 msgstr "Klarte ikkje 奪 tyda meldinga"
 
@@ -5359,6 +5330,26 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-feil: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Problem med synkroniseringa av vennelista i %s (%s)"
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s p奪 den lokale lista er med i gruppa \"%s\", men ikkje p奪 tenarlista. "
+"�nskjer du 奪 leggja ho/han til?"
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s er i den lokale lista, men ikkje p奪 tenarlista. �nskjer du 奪 leggja ho/"
+"han til?"
+
 msgid "Other Contacts"
 msgstr "Andre kontaktar"
 
@@ -5411,12 +5402,24 @@
 msgid "Set friendly name for %s."
 msgstr "Vel visingsnamnet til %s."
 
-msgid "Set your friendly name."
-msgstr "Vel visingsnamn."
+msgid "Set Friendly Name"
+msgstr "Vel visingsnamn"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Dette er namnet som vil synast hos andre MSN-venner."
 
+msgid "This Location"
+msgstr "Denne staden"
+
+msgid "This is the name that identifies this location"
+msgstr "Dette er namnet som identifiserer denne staden"
+
+msgid "Other Locations"
+msgstr "Andre stader"
+
+msgid "You can sign out from other locations here"
+msgstr "Du kan logga ut fr奪 andre stader her"
+
 msgid "Set your home phone number."
 msgstr "Skriv inn heimetelefonnummeret ditt."
 
@@ -5502,6 +5505,9 @@
 msgid "Set Friendly Name..."
 msgstr "Vel visingsnamn��"
 
+msgid "View Locations..."
+msgstr "Vel stader��"
+
 msgid "Set Home Phone Number..."
 msgstr "Skriv inn heimetelefonnummer��"
 
@@ -5862,17 +5868,16 @@
 msgid "Retrieving buddy list"
 msgstr "Hentar vennelista"
 
-# d奪rleg formulering?
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
-"%s sp淡r om 奪 f奪 sj奪 nettkameraet ditt. Denne funksjonen er enno ikkje st淡tta."
-
-# d奪rleg formulering?
+"%s sp淡r om l淡yve til 奪 sj奪 nettkameraet ditt, men f淡respurnaden er enno "
+"ikkje st淡tta."
+
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"%s har invitert deg til 奪 f奪 sj奪 nettkameraet hans/hennar, men funksjonen er "
+"%s har gjeve deg l淡yve til 奪 sj奪 nettkameraet sitt, men denne funksjonen er "
 "enno ikkje st淡tta."
 
 msgid "Away From Computer"
@@ -6889,6 +6894,13 @@
 "Du har kopla til og blitt fr奪kopla for ofte. Vent i ti minutt og pr淡v igjen. "
 "Held du fram med 奪 pr淡va, vil du m奪tta venta end奪 lenger."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"Du krev kryptering i kontoinnstillingane dine, men ein av tenarane kan ikkje "
+"gje deg det."
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -7200,6 +7212,13 @@
 "vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre "
 "innehalda bokstavar, tal og mellomrom, eller berre innehalda tal."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"Du krev kryptering i kontoinnstillingane dine, men systemet ditt kan ikkje "
+"gje deg det."
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -7704,13 +7723,11 @@
 msgid "Set Privacy Options..."
 msgstr "Personvernval��"
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "Vis venne_liste"
-
-#, fuzzy
+msgstr "Vis synleg liste"
+
 msgid "Show Invisible List"
-msgstr "Invitasjonsliste"
+msgstr "Vis usynleg liste"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -7728,6 +7745,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "Finn venn utfr奪 e-postadressa��"
 
+msgid "Don't use encryption"
+msgstr "Bruk ikkje kryptering"
+
 msgid "Use clientLogin"
 msgstr "Bruk klientp奪logging"
 
@@ -7916,9 +7936,9 @@
 msgstr "Vennenotat"
 
 # 20101010 ylan meiner "mogleg" er betre enn "tilgjengeleg"
-#, fuzzy, c-format
+#, c-format
 msgid "User information not available: %s"
-msgstr "Bruk kryptering om mogleg"
+msgstr "Brukaropplysningar er ikkje tilgengelege: %s"
 
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
@@ -7927,7 +7947,7 @@
 msgstr "Personelg nettside"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
@@ -7955,46 +7975,53 @@
 msgid "Capabilities"
 msgstr "Evner"
 
-#. 4 separate strings are needed in order to ease translators' job
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "Framst奪 som tilkopla"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
-msgstr "Framst奪 som tilkopla"
-
+msgstr "Framst奪 som fr奪kopla"
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
-msgstr "Verkar vera fr奪kopla"
-
-#, fuzzy
+msgstr "Framst奪 som fr奪kopla"
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
-msgstr "Verkar vera fr奪kopla"
-
-#, fuzzy
+msgstr "Framst奪 som tilkopla"
+
 msgid "you have no buddies on this list"
-msgstr "Du er blitt sparka ut fr奪 denne MultiMX-en."
-
-#, fuzzy, c-format
+msgstr "du har ingen venner p奪 denne lista"
+
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
 msgstr ""
-"Du kan be om godkjenning fr奪 desse vennene igjen ved 奪 h淡greklikka dei og "
-"velja \"Sp淡r om ny godkjenning.\""
-
-#, fuzzy
+"Du kan leggja til ein venn i denne lista ved 奪 h淡greklikka han og velja \"%s"
+"\""
+
 msgid "Visible List"
-msgstr "Synleg"
+msgstr "Synleg liste"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
-msgstr ""
-
-#, fuzzy
+msgstr "Desse vennene vil sj奪 statusen din om du byter til \"Usynleg\" "
+
 msgid "Invisible List"
-msgstr "Invitasjonsliste"
+msgstr "Usynleg liste"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "Desse vennene vil alltid sj奪 deg som fr奪kopla"
 
 msgid "Aquarius"
 msgstr "Vassmannen"
@@ -12280,6 +12307,9 @@
 msgid "Lao"
 msgstr "Lao"
 
+msgid "Maithili"
+msgstr "Maithili"
+
 msgid "Macedonian"
 msgstr "Makedonsk"
 
@@ -15386,84 +15416,14 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har ikkje rettar til 奪 avinstallera dette programmet."
 
-#~ msgid "The certificate has expired and should not be considered valid."
-#~ msgstr "Sertifikatet har g奪tt ut og kan ikkje reknast for 奪 vera gyldig."
-
-#~ msgid "Require SSL/TLS"
-#~ msgstr "Krev SSL/TLS"
-
-#~ msgid "Force old (port 5223) SSL"
-#~ msgstr "Overstyr med gammal SSL (port 5223)"
-
-#~ msgid ""
-#~ "[Unable to display a message from this user because it contained invalid "
-#~ "characters.]"
-#~ msgstr ""
-#~ "Klarer ikkje visa ei melding fr奪 denne brukaren: ho inneheldt ulovlege "
-#~ "teikn.]"
-
-#~ msgid "Search for Buddy by Information"
-#~ msgstr "S淡k etter venn utfr奪 opplysningar"
-
-#~ msgid "The nick name you entered is invalid."
-#~ msgstr "Kallenamnet du skreiv er ugyldig."
-
-#~ msgid "MXit Login Name"
-#~ msgstr "P奪loggingsnamn MXit"
-
-#~ msgid "Nick Name"
-#~ msgstr "Kallenamn"
-
-#~ msgid "Your Mobile Number..."
-#~ msgstr "Mobiltelefonnummeret ditt��"
-
-#~ msgid "/Media/_Hangup"
-#~ msgstr "/Media/_Legg p奪"
-
-#~ msgid "The certificate is not valid yet."
-#~ msgstr "Sertifikatet er ikkje gyldig enno."
-
-#~ msgid "Rate to host"
-#~ msgstr "Fart mot vert"
-
-#~ msgid "Rate to client"
-#~ msgstr "Fart mot klient"
-
-#~ msgid "Unknown reason."
-#~ msgstr "Ukjend 奪rsak."
-
-#~ msgid "Current Mood"
-#~ msgstr "Sinnsstemninga no"
-
-#~ msgid "New Mood"
-#~ msgstr "Ny sinnsstemning"
-
-#~ msgid "Change your Mood"
-#~ msgstr "Endra sinnsstemninga di"
-
-#~ msgid "How do you feel right now?"
-#~ msgstr "Korleis kjenner du deg nett no?"
-
-#~ msgid "Change Mood..."
-#~ msgstr "Endra sinnsstemninga��"
-
-#~ msgid "Orientation"
-#~ msgstr "Orientering"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "Panelorienteringa."
-
-#~ msgid "Artist"
-#~ msgstr "Kunstnar"
-
-#~ msgid "Album"
-#~ msgstr "Album"
-
-#~ msgid "Pager server"
-#~ msgstr "S淡kjetenestetenar"
-
-#~ msgid "Yahoo Chat server"
-#~ msgstr "Yahoo pratetenar"
-
-#~ msgid "Yahoo Chat port"
-#~ msgstr "Yahoo prateport"
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr "Overf淡ringa av samtidsdatastraumen feila\n"
+
+#~ msgid "Transfer was closed."
+#~ msgstr "Overf淡ringa blei lukka."
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "Klarte ikkje 奪 opna samtidsdatastraum"
+
+#~ msgid "Set your friendly name."
+#~ msgstr "Vel visingsnamn."
--- a/po/pl.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/pl.po	Mon Nov 22 03:04:17 2010 +0000
@@ -13,8 +13,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin Polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:12-0400\n"
-"PO-Revision-Date: 2010-10-20 12:58+0200\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-16 22:28+0100\n"
 "Last-Translator: Piotr Dr�g <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "Language: pl\n"
@@ -4883,15 +4883,6 @@
 msgid "Unknown Error in presence"
 msgstr "Nieznany b��d obecno�ci"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Wyst�pi� b��d przesy�ania strumienia bit坦w w pa�mie\n"
-
-msgid "Transfer was closed."
-msgstr "Przesy�anie zosta�o zamkni�te."
-
-msgid "Failed to open in-band bytestream"
-msgstr "Otwarcie strumienia bit坦w w pa�mie si� nie powiod�o"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -5209,26 +5200,6 @@
 msgid "The username specified does not exist."
 msgstr "Podana nazwa u甜ytkownika nie istnieje."
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Problem synchronizacji listy znajomych w %s (%s)"
-
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"U甜ytkownik %s na lokalnej li�cie jest w grupie \"%s\", ale nie ma go na "
-"serwerze. Doda� tego znajomego?"
-
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"U甜ytkownik %s znajduje si� na lokalnej li�cie, ale nie ma go na serwerze. "
-"Doda� tego u甜ytkownika?"
-
 msgid "Unable to parse message"
 msgstr "Nie mo甜na przetworzy� wiadomo�ci"
 
@@ -5399,6 +5370,26 @@
 msgid "MSN Error: %s\n"
 msgstr "B��d MSN: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Problem synchronizacji listy znajomych w %s (%s)"
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"U甜ytkownik %s na lokalnej li�cie jest w grupie \"%s\", ale nie ma go na "
+"serwerze. Doda� tego znajomego?"
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"U甜ytkownik %s znajduje si� na lokalnej li�cie, ale nie ma go na serwerze. "
+"Doda� tego u甜ytkownika?"
+
 msgid "Other Contacts"
 msgstr "Inne kontakty"
 
@@ -5452,12 +5443,24 @@
 msgid "Set friendly name for %s."
 msgstr "Ustawienie pseudonimu dla %s."
 
-msgid "Set your friendly name."
-msgstr "Ustawienie pseudonimu."
+msgid "Set Friendly Name"
+msgstr "Ustaw pseudonim"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Ta nazwa b�dzie widoczna dla innych znajomych MSN."
 
+msgid "This Location"
+msgstr "To po�o甜enie"
+
+msgid "This is the name that identifies this location"
+msgstr "Ta nazwa identyfikuje to po�o甜enie."
+
+msgid "Other Locations"
+msgstr "Inne po�o甜enia"
+
+msgid "You can sign out from other locations here"
+msgstr "Tutaj mo甜na wylogowa� si� z innych po�o甜e�"
+
 msgid "Set your home phone number."
 msgstr "Ustawienie numeru telefonu domowego."
 
@@ -5543,6 +5546,9 @@
 msgid "Set Friendly Name..."
 msgstr "Ustaw pseudonim..."
 
+msgid "View Locations..."
+msgstr "Wy�wietl po�o甜enia..."
+
 msgid "Set Home Phone Number..."
 msgstr "Ustaw domowy numer telefonu..."
 
@@ -6953,6 +6959,13 @@
 "spr坦bowa� ponownie. Je�li pr坦ba zostanie podj�ta teraz, czas oczekiwania "
 "jeszcze si� wyd�u甜y."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"Szyfrowanie jest wymagane w ustawieniach konta, ale jeden z serwer坦w go nie "
+"obs�uguje."
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -7263,6 +7276,13 @@
 "Nazwy u甜ytkownik坦w musz� by� prawid�owymi adresami e-mail lub zaczyna� si� "
 "od litery i zawiera� tylko litery, liczby i spacje lub zawiera� tylko liczby."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"Wymagane jest szyfrowanie w ustawieniach konta, ale nie jest ono obs�ugiwane "
+"przez system."
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -7802,13 +7822,11 @@
 msgid "Set Privacy Options..."
 msgstr "Ustaw opcje prywatno�ci..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "Lista widocznych"
-
-#, fuzzy
+msgstr "Wy�wietl lista widocznych"
+
 msgid "Show Invisible List"
-msgstr "Lista niewidocznych"
+msgstr "Wy�wietl list� niewidocznych"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -7826,6 +7844,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "Wyszukaj znajomych wed�ug adresu e-mail..."
 
+msgid "Don't use encryption"
+msgstr "Bez u甜ycia szyfrowania"
+
 msgid "Use clientLogin"
 msgstr "U甜ycie logowania klienta"
 
@@ -8026,7 +8047,7 @@
 msgstr "Osobista strona WWW"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "Dodatkowe informacje"
 
@@ -8054,16 +8075,28 @@
 msgid "Capabilities"
 msgstr "Mo甜liwo�ci"
 
-#. 4 separate strings are needed in order to ease translators' job
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "Wygl�da na tryb online"
 
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
 msgstr "Nie wygl�da na tryb online"
 
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
 msgstr "Wygl�da na tryb offline"
 
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
 msgstr "Nie wygl�da na tryb offline"
 
@@ -12376,6 +12409,9 @@
 msgid "Lao"
 msgstr "laota�ski"
 
+msgid "Maithili"
+msgstr "maithili"
+
 msgid "Macedonian"
 msgstr "macedo�ski"
 
--- a/po/ro.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/ro.po	Mon Nov 22 03:04:17 2010 +0000
@@ -5,11 +5,11 @@
 # Contributions: 2007, Alexandru Szasz <alexxed@gmail.com>
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.7.4\n"
+"Project-Id-Version: pidgin-2.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:12-0400\n"
-"PO-Revision-Date: 2010-10-20 23:11+0300\n"
-"Last-Translator: Mi�u Moldovan <dumol@gnome.org>\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-20 18:36+0200\n"
+"Last-Translator: Mi�u Moldovan <dumol@l10n.ro>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
@@ -4861,15 +4861,6 @@
 msgid "Unknown Error in presence"
 msgstr "Eroare necunoscut� 樽n starea de prezen��"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "A ap�rut o eroare la transferul de octe�i 樽n-band�\n"
-
-msgid "Transfer was closed."
-msgstr "Transferul a fost 樽nchis"
-
-msgid "Failed to open in-band bytestream"
-msgstr "Nu s-a putut deschide fluxul de octe�i 樽n-band�"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -5186,26 +5177,6 @@
 msgid "The username specified does not exist."
 msgstr "Numele de utilizator specificat nu exist�."
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Probleme de sincronizare a liste de contacte 樽n %s (%s)"
-
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s din grupul ��%s�� e 樽n lista contactelor, dar nu este 樽n lista de pe "
-"server. Dori�i s� ad�uga�i acest contact?"
-
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s este 樽n lista contactelor, dar nu �i 樽n lista de pe server. Dori�i s� "
-"ad�uga�i acest contact?"
-
 msgid "Unable to parse message"
 msgstr "Nu se poate prelucra mesajul"
 
@@ -5376,6 +5347,26 @@
 msgid "MSN Error: %s\n"
 msgstr "Eroare MSN: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Probleme de sincronizare a liste de contacte 樽n %s (%s)"
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s din grupul ��%s�� e 樽n lista contactelor, dar nu este 樽n lista de pe "
+"server. Dori�i s� ad�uga�i acest contact?"
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s este 樽n lista contactelor, dar nu �i 樽n lista de pe server. Dori�i s� "
+"ad�uga�i acest contact?"
+
 msgid "Other Contacts"
 msgstr "Alte contacte"
 
@@ -5428,12 +5419,24 @@
 msgid "Set friendly name for %s."
 msgstr "Alege�i un pseudonim pentru %s."
 
-msgid "Set your friendly name."
-msgstr "Alege�i-v� un pseudonim propriu."
+msgid "Set Friendly Name"
+msgstr "Introducere pseudonim"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Acesta este numele sub care ve�i fi cunoscu�i de contactele MSN."
 
+msgid "This Location"
+msgstr "Acest loc"
+
+msgid "This is the name that identifies this location"
+msgstr "Aceasta este denumirea pentru acest loc"
+
+msgid "Other Locations"
+msgstr "Alte locuri"
+
+msgid "You can sign out from other locations here"
+msgstr "Aici pute�i s� anula�i alte autentific�ri curente"
+
 msgid "Set your home phone number."
 msgstr "Introduce�i num�rul telefonului de acas�."
 
@@ -5520,6 +5523,9 @@
 msgid "Set Friendly Name..."
 msgstr "Introducere pseudonim..."
 
+msgid "View Locations..."
+msgstr "Vizualizare locuri..."
+
 msgid "Set Home Phone Number..."
 msgstr "Introducere num�r telefon acas�..."
 
@@ -6926,6 +6932,12 @@
 "V-a�i conectat �i deconectat prea des. A�tepta�i zece minute �i 樽ncerca�i "
 "din nou. Dac� continua�i s� 樽ncerca�i, va trebui s� a�tepta�i mai mult."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"Se cere criptare 樽n op�iunile contului, dar unul dintre servere nu o suport�."
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -7238,6 +7250,13 @@
 "cu o liter� �i s� con�in� doar litere, numere �i spa�ii sau s� con�in� doar "
 "numere."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"Se cere criptare 樽n op�iunile contului, dar acest sistem de operare nu o "
+"suport�."
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -7769,13 +7788,11 @@
 msgid "Set Privacy Options..."
 msgstr "Op�iuni de securitate..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "List� de vizibilitate"
-
-#, fuzzy
+msgstr "Lista celor ce v� v�d"
+
 msgid "Show Invisible List"
-msgstr "List� de invizibilitate"
+msgstr "Lista celor ce nu v� v�d"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -7793,6 +7810,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "C�utare contact dup� adresa de mail..."
 
+msgid "Don't use encryption"
+msgstr "Nu utiliza criptare"
+
 msgid "Use clientLogin"
 msgstr "Utiliza�i clientLogin"
 
@@ -7992,7 +8012,7 @@
 msgstr "Pagin� personal�"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "Alte informa�ii"
 
@@ -8020,16 +8040,28 @@
 msgid "Capabilities"
 msgstr "Facilit��i"
 
-#. 4 separate strings are needed in order to ease translators' job
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "Apar online"
 
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
 msgstr "Nu apar online"
 
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
 msgstr "Apar offline"
 
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
 msgstr "Nu apar offline"
 
@@ -12354,6 +12386,9 @@
 msgid "Lao"
 msgstr "Lao"
 
+msgid "Maithili"
+msgstr "Maithili"
+
 msgid "Macedonian"
 msgstr "Macedonean�"
 
@@ -15458,3 +15493,15 @@
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Nu ave釘i drepturile de acces necesare dezinstal�rii acestei aplica釘ii."
+
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr "A ap�rut o eroare la transferul de octe�i 樽n-band�\n"
+
+#~ msgid "Transfer was closed."
+#~ msgstr "Transferul a fost 樽nchis"
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "Nu s-a putut deschide fluxul de octe�i 樽n-band�"
+
+#~ msgid "Set your friendly name."
+#~ msgstr "Alege�i-v� un pseudonim propriu."
--- a/po/sq.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/sq.po	Mon Nov 22 03:04:17 2010 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:12-0400\n"
-"PO-Revision-Date: 2010-05-03 11:41+0200\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-16 20:58+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <besnik@programeshqip.org>\n"
 "Language: sq\n"
@@ -65,9 +65,8 @@
 msgid "Error"
 msgstr "Gabim"
 
-#, fuzzy
 msgid "Account was not modified"
-msgstr "Nuk u shtua llogaria"
+msgstr "Llogaria nuk u ndryshua"
 
 msgid "Account was not added"
 msgstr "Nuk u shtua llogaria"
@@ -78,10 +77,14 @@
 msgid ""
 "The account's protocol cannot be changed while it is connected to the server."
 msgstr ""
+"Protokolli i llogaris谷 nuk mund t谷 ndryshohet kur 谷sht谷 i lidhur te "
+"sh谷rbyesi."
 
 msgid ""
 "The account's username cannot be changed while it is connected to the server."
 msgstr ""
+"Emri i p谷rdoruesit p谷r llogarin谷 nuk mund t谷 ndryshohet kur 谷sht谷 i lidhur "
+"te sh谷rbyesi."
 
 msgid "New mail notifications"
 msgstr "Njoftime poste t谷 re"
@@ -814,7 +817,7 @@
 msgstr "Po pritet t谷 filloj谷 shp谷rngulja"
 
 msgid "Cancelled"
-msgstr "Anuluar"
+msgstr "U anulua"
 
 msgid "Failed"
 msgstr "D谷shtova"
@@ -1299,7 +1302,7 @@
 msgstr "Dikush thot谷 emrin tuaj n谷 fjalosje"
 
 msgid "Attention received"
-msgstr ""
+msgstr "U mor v谷mendje"
 
 msgid "GStreamer Failure"
 msgstr "D谷shtim i GStreamer-it"
@@ -1726,12 +1729,15 @@
 "The certificate is not valid yet.  Check that your computer's date and time "
 "are accurate."
 msgstr ""
-
-#, fuzzy
+"D谷shmia nuk 谷sht谷 ende e vlefshme.  Kontrolloni q谷 data dhe koha e "
+"kompjuterit tuaj jan谷 t谷 sakta."
+
 msgid ""
 "The certificate has expired and should not be considered valid.  Check that "
 "your computer's date and time are accurate."
-msgstr "D谷shmia ka skaduar dhe nuk duhet marr谷 si e vlefshme."
+msgstr ""
+"D谷shmia ka skaduar dhe nuk duhet marr谷 si e vlefshme. Kontrolloni n谷 jan谷 t谷 "
+"sakta data dhe ora e kompjuterit."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
 msgid "The certificate presented is not issued to this domain."
@@ -4073,19 +4079,18 @@
 "Sh谷rbyesi mendon se mir谷fillt谷simi 谷sht谷 i plot谷, por klienti nuk mendon "
 "k谷shtu."
 
-#, fuzzy
 msgid "Server may require plaintext authentication over an unencrypted stream"
 msgstr ""
-"karshi nj谷 rrjedhe t谷 pakoduar sh谷rbyesi lyp mir谷fillt谷sim me baz谷 tekst t谷 "
-"thjesht谷"
-
-#, fuzzy, c-format
+"Sh谷rbyesi mund t谷 k谷rkoj谷 mir谷fillt谷sim n谷 trajt谷 teksti t谷 thjesht谷 p谷rmes "
+"nj谷 lidhjeje t谷 pakoduar."
+
+#, c-format
 msgid ""
 "%s may require plaintext authentication over an unencrypted connection.  "
 "Allow this and continue authentication?"
 msgstr ""
-"%s lyp mir谷fillt谷sim n谷 trajt谷 teksti t谷 thjesht谷 p谷rmes nj谷 lidhjeje t谷 "
-"pakoduar. Ta lejoj谷 k谷t谷 dhe t谷 vazhdoj谷 me mir谷fillt谷simin? "
+"%s mund t谷 k谷rkoj谷 mir谷fillt谷sim n谷 trajt谷 teksti t谷 thjesht谷 p谷rmes nj谷 "
+"lidhjeje t谷 pakoduar. T谷 lejohet kjo dhe t谷 vazhdohet me mir谷fillt谷simin? "
 
 msgid "SASL authentication failed"
 msgstr "Mir谷fillt谷simi SASL d谷shtoi"
@@ -4984,20 +4989,17 @@
 msgid "Domain"
 msgstr "P谷rkat谷si"
 
-#, fuzzy
 msgid "Require encryption"
-msgstr "K谷rko autorizim"
-
-#, fuzzy
+msgstr "Lyp kodim"
+
 msgid "Use encryption if available"
-msgstr "T谷 dh谷na p谷rdoruesi jo t谷 mundshme: %s"
+msgstr "P谷rdor kodim n谷 qoft谷 e mundur"
 
 msgid "Use old-style SSL"
-msgstr ""
-
-#, fuzzy
+msgstr "P谷rdor SSL t谷 vjet谷r"
+
 msgid "Connection security"
-msgstr "Rivendosje lidhjeje"
+msgstr "Siguri Lidhjeje"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Lejo autorizim n谷 form谷 teksti t谷 thjesht谷 n谷 rrjedha t谷 pakoduara"
@@ -5104,15 +5106,6 @@
 msgid "Unknown Error in presence"
 msgstr "Gabim i Panjohur te prania"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Ndodhi nj谷 gabim n谷 shp谷rnguljen \"in-band bytestream\"\n"
-
-msgid "Transfer was closed."
-msgstr "Shp谷rngulja u mbyll."
-
-msgid "Failed to open in-band bytestream"
-msgstr "D谷shtoi n谷 hapjen e \"in-band bytestream\""
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -5436,26 +5429,6 @@
 msgid "The username specified does not exist."
 msgstr "Emri i dh谷n谷 i p谷rdoruesit nuk ekziston."
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Problem nj谷koh谷simi liste shok谷sh n谷 %s (%s)"
-
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s i list谷s vendore 谷sht谷 brenda grupit \"%s\" por jo n谷 list谷n e "
-"sh谷rbyesit. Doni t谷 shtohet ky shok?"
-
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s 谷sht谷 n谷 list谷n vendore por jo n谷 list谷n e sh谷rbyesit. Doni t谷 shtohet ky "
-"shok?"
-
 msgid "Unable to parse message"
 msgstr "I pazoti t谷 p谷rtyp谷 mesazh"
 
@@ -5626,6 +5599,26 @@
 msgid "MSN Error: %s\n"
 msgstr "Gabim MSN: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "Problem nj谷koh谷simi liste shok谷sh n谷 %s (%s)"
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s i list谷s vendore 谷sht谷 brenda grupit \"%s\" por jo n谷 list谷n e "
+"sh谷rbyesit. Doni t谷 shtohet ky shok?"
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s 谷sht谷 n谷 list谷n vendore por jo n谷 list谷n e sh谷rbyesit. Doni t谷 shtohet ky "
+"shok?"
+
 msgid "Other Contacts"
 msgstr "Kontakte t谷 Tjera"
 
@@ -5678,12 +5671,24 @@
 msgid "Set friendly name for %s."
 msgstr "Caktoni em谷r miq谷sor p谷r %s."
 
-msgid "Set your friendly name."
-msgstr "Caktoni ermin tuaj miq谷sor."
+msgid "Set Friendly Name"
+msgstr "Caktoni Em谷r Miq谷sor"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Ky 谷sht谷 emri me t谷 cilin do t'ju shohin shok谷 t谷 tjer谷 MSN-s谷."
 
+msgid "This Location"
+msgstr "K谷t谷 Vend"
+
+msgid "This is the name that identifies this location"
+msgstr "Ky 谷sht谷 emri q谷 identifikon k谷t谷 vend"
+
+msgid "Other Locations"
+msgstr "Vende t谷 Tjera"
+
+msgid "You can sign out from other locations here"
+msgstr "K谷tu mund t谷 dilni prej vendesh t谷 tjera"
+
 msgid "Set your home phone number."
 msgstr "Vini numrin tuaj t谷 telefonit."
 
@@ -5770,6 +5775,9 @@
 msgid "Set Friendly Name..."
 msgstr "Caktoni Em谷r Miq谷sor..."
 
+msgid "View Locations..."
+msgstr "Shihni Vendet..."
+
 msgid "Set Home Phone Number..."
 msgstr "Vini Num谷r Telefoni t谷 Sht谷pis谷..."
 
@@ -6019,9 +6027,8 @@
 msgid "Show custom smileys"
 msgstr "Shfaq emotikone vetjake"
 
-#, fuzzy
 msgid "Allow direct connections"
-msgstr "I pazoti t谷 krijoj谷 lidhje"
+msgstr "Lejo lidhje t谷 drejtp谷rdrejta"
 
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: preke nj谷 p谷rdorues me b谷rryl p谷r t'i t谷rhequr v谷mendjen"
@@ -6226,9 +6233,8 @@
 msgid "The two PINs you entered do not match."
 msgstr "Dy PIN-et q谷 dhat谷 nuk p谷rputhen."
 
-#, fuzzy
 msgid "The Display Name you entered is invalid."
-msgstr "Emri q谷 dhat谷 谷sht谷 i pavlefsh谷m."
+msgstr "Emri p谷r n谷 Ekran q谷 dhat谷 谷sht谷 e mang谷t."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
@@ -6249,7 +6255,7 @@
 "T谷 dh谷nat e profilit tuaj nuk jan谷 marr谷 ende. Ju lutem,, riprovoni m谷 von谷."
 
 msgid "Your UID"
-msgstr ""
+msgstr "UID-ja juaj"
 
 #. pin
 #. pin (required)
@@ -6333,7 +6339,7 @@
 
 #. mxit login name
 msgid "MXit ID"
-msgstr ""
+msgstr "ID MXit"
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6363,17 +6369,15 @@
 msgid "Invalid country selected. Please try again."
 msgstr "U p谷rzgjodh vend i pavlefsh谷m. Ju lutem,, riprovoni."
 
-#, fuzzy
 msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
-"Emri i p谷rdoruesit nuk 谷sht谷 i regjistruar. Ju lutem,, s谷 pari  "
+"ID-ja MXit q谷 dhat谷 nuk 谷sht谷 e regjistruar. Ju lutem, s谷 pari  "
 "regjistrohuni."
 
-#, fuzzy
 msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
-"Ky em谷r p谷rdoruesi 谷sht谷 i regjistruar tashm谷. Ju lutem,, zgjidhni nj谷 em谷r "
-"tjet谷r p谷rdoruesi."
+"ID-ja MXit q谷 dhat谷 谷sht谷 tashm谷 e regjistruar. Ju lutem, zgjidhni nj谷 "
+"tjet谷r."
 
 msgid "Internal error. Please try again later."
 msgstr "Gabim i brendsh谷m. Ju lutem,, riprovoni m谷 von谷."
@@ -6412,17 +6416,15 @@
 msgid "Status Message"
 msgstr "Mesazh Gjendjeje"
 
-#, fuzzy
 msgid "Rejection Message"
-msgstr "Mesazhe t谷 Marr谷"
+msgstr "Mesazh Mospranimi"
 
 #. hidden number
 msgid "Hidden Number"
 msgstr "Num谷r i Fshehur"
 
-#, fuzzy
 msgid "Your MXit ID..."
-msgstr "ID Yahoo..."
+msgstr "ID-ja Juaj MXit..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6437,26 +6439,21 @@
 msgstr "Aktivizo fllusk谷n e sigl谷s"
 
 #. you were kicked
-#, fuzzy
 msgid "You have been kicked from this MultiMX."
-msgstr "Jeni p谷rz谷n谷: (%s)"
-
-#, fuzzy
+msgstr "Jepni p谷rz谷n谷 nga ky MultiMX."
+
 msgid "was kicked"
-msgstr "Bilet谷 e pavlefshme"
-
-#, fuzzy
+msgstr "u p谷rzu"
+
 msgid "_Room Name:"
-msgstr "_Dhom谷:"
+msgstr "_Em谷r Dhome:"
 
 #. Display system message in chat window
-#, fuzzy
 msgid "You have invited"
-msgstr "Ju ka ardhur post谷!"
-
-#, fuzzy
+msgstr "Keni ftuar"
+
 msgid "Last Online"
-msgstr "I lidhur"
+msgstr "S谷 fundi Online"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -7234,6 +7231,13 @@
 "Jeni lidhur e shk谷putur shum谷 shpesh. Prisni dhjet谷 minuta dhe riprovoni. "
 "n谷se vazhdoni t谷 provoni, do t'ju duhet t谷 prisni edhe m谷."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"Te rregullimet tuaja p谷r llogarin谷 k谷rkuat kodim, por nj谷 nga sh谷rbyesat nuk "
+"e mbulon at谷. "
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -7528,7 +7532,7 @@
 msgstr "I paduksh谷m"
 
 msgid "Evil"
-msgstr ""
+msgstr "Goxha i keq"
 
 msgid "Depression"
 msgstr "Depresion"
@@ -7571,6 +7575,13 @@
 "t谷 fillojn谷 me nj谷 g谷rm谷 dhe t谷 p谷rmbajn谷 vet谷m g谷rma, numra dhe hap谷sira, "
 "ose t谷 p谷rmbajn谷 vet谷m numra."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"Te rregullimet tuaja p谷r llogarin谷 k谷rkuat kodim, por kodimi nuk mbulohet "
+"nga sistemi juaj. "
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
@@ -8053,9 +8064,8 @@
 msgid "Change Address To:"
 msgstr "Ndrysho Vendndodhje Si:"
 
-#, fuzzy
 msgid "you are not waiting for authorization"
-msgstr "<i>nuk po prisni p谷r autorizim</i>"
+msgstr "nuk po prisni p谷r autorizim"
 
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Po prisni autorizim prej shok谷ve vijues"
@@ -8093,13 +8103,11 @@
 msgid "Set Privacy Options..."
 msgstr "Caktoni Mund谷si Vet谷sie..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "Shfaq _List谷 Shok谷sh"
-
-#, fuzzy
+msgstr "Shfaq List谷 t谷 Dukshme"
+
 msgid "Show Invisible List"
-msgstr "List谷 Ftesash"
+msgstr "Shfaq List谷 t谷 Padukshme"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -8117,6 +8125,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "K谷rkoni nj谷 Shok p谷rmes Vendndodhjes Email..."
 
+msgid "Don't use encryption"
+msgstr "Mos p谷rdor kodim"
+
 msgid "Use clientLogin"
 msgstr "P谷rdor \"clientLogin\""
 
@@ -8315,7 +8326,7 @@
 msgstr "Faqe Web Personale"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "T谷 dh谷na Shtes谷"
 
@@ -8343,46 +8354,53 @@
 msgid "Capabilities"
 msgstr "Aft谷si"
 
-#. 4 separate strings are needed in order to ease translators' job
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "Shfaqu I lidhur"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
-msgstr "Shfaqu I lidhur"
-
+msgstr "Mos u Shfaq Online"
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
 msgstr "Shfaqet Jo i lidhur"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
-msgstr "Shfaqet Jo i lidhur"
-
-#, fuzzy
+msgstr "Mos Shfaq Offline"
+
 msgid "you have no buddies on this list"
-msgstr "Jeni p谷rz谷n谷: (%s)"
-
-#, fuzzy, c-format
+msgstr "nuk keni shok谷 n谷 k谷t谷 list谷"
+
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
 msgstr ""
-"Mund t谷 rik谷rkoni autorizim prej k谷tyre shok谷ve duke djathtas klikuar mbi ta "
-"dhe p谷rzgjedhur \"Rik谷rko Autorizim.\""
-
-#, fuzzy
+"Nj谷 shok mund ta shtoni n谷 k谷t谷 list谷 duke djathtasklikuar mbi t谷 dhe "
+"p谷rzgjedhur \"%s\""
+
 msgid "Visible List"
-msgstr "I duksh谷m"
+msgstr "List谷 e Dukshme"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
-msgstr ""
-
-#, fuzzy
+msgstr "K谷ta shok谷 do ta shohin gjendjen tuaj kur kaloni si \"I paduksh谷m\""
+
 msgid "Invisible List"
-msgstr "List谷 Ftesash"
+msgstr "List谷 e Padukshme"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "K谷ta shok谷 do t'ju shohin p谷rher谷 si offline"
 
 msgid "Aquarius"
 msgstr "Ujori"
@@ -8567,9 +8585,9 @@
 msgid "Your request was rejected."
 msgstr "K谷rkesa juaj u hodh posht谷."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requires verification: %s"
-msgstr "%u lyp verifikim"
+msgstr "%u lyp verifikim: %s"
 
 msgid "Add buddy question"
 msgstr "Pyetje shtimi shoku"
@@ -10002,7 +10020,7 @@
 msgstr "Nuk mundi t谷 asgj谷soj谷 p谷rdorues"
 
 msgid "WATCH"
-msgstr ""
+msgstr "MBIKQYRE"
 
 msgid "Cannot watch user"
 msgstr "S'ndjek dot p谷rdoruesin"
@@ -10653,9 +10671,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Shp谷rfill ftesa konferencash dhe dhomash fjalosjeje"
 
-#, fuzzy
 msgid "Use account proxy for HTTP and HTTPS connections"
-msgstr "P谷rdor nd谷rmjet谷s llogarie p谷r lidhje SSL"
+msgstr "P谷r lidhjet HTTP dhe HTTPS p谷rdor nd谷rmjet谷s llogarie "
 
 msgid "Chat room list URL"
 msgstr "Url liste dhome fjalosjeje"
@@ -11597,9 +11614,9 @@
 "Mund t'i riktheheni k谷saj dritareje p谷r shtim, p谷rpunim apo heqje llogarish "
 "nga <b>Llogari->Administroni Llogarira</b> te dritarja e Listave t谷 Shok谷ve"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"
-msgstr "%s%s%s%s don t谷 shtoj谷 %s te list谷 e tij ose e saj shok谷sh%s%s"
+msgstr "%s%s%s%s don t'ju shtoj谷 (%s) te lista e tij e shok谷ve %s%s"
 
 #. Buddy List
 msgid "Background Color"
@@ -12653,9 +12670,8 @@
 msgid "Arabic"
 msgstr "Arabe"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "I turp谷ruar"
+msgstr "Asameze"
 
 msgid "Belarusian Latin"
 msgstr "Bjelloruse Latine"
@@ -12780,12 +12796,14 @@
 msgid "Lao"
 msgstr "Lao"
 
+msgid "Maithili"
+msgstr "Maithili"
+
 msgid "Macedonian"
 msgstr "Maqedone"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Malaje"
+msgstr "Malajalame"
 
 msgid "Mongolian"
 msgstr "Mongole"
@@ -13508,7 +13526,7 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
 msgstr "p谷r kartela form谷simi p谷rdor DIR"
@@ -13530,7 +13548,7 @@
 msgstr "mos hyr vetvetiu"
 
 msgid "NAME"
-msgstr ""
+msgstr "EM�R"
 
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
@@ -13578,9 +13596,8 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Po dilet, ngaq谷 ka nj谷 tjet谷r klient libpurple n谷 xhirim e sip谷r.\n"
 
-#, fuzzy
 msgid "_Media"
-msgstr "/_Media"
+msgstr "_Media"
 
 msgid "_Hangup"
 msgstr ""
@@ -14007,9 +14024,8 @@
 msgid "_TURN server:"
 msgstr "Sh谷rbyes _TURN:"
 
-#, fuzzy
 msgid "_UDP Port:"
-msgstr "_Port谷:"
+msgstr "Port谷 _UDP:"
 
 msgid "Use_rname:"
 msgstr "_Em谷r p谷rdoruesi:"
@@ -14033,7 +14049,7 @@
 msgstr "Konqueror"
 
 msgid "Google Chrome"
-msgstr ""
+msgstr "Google Chrome"
 
 #. Do not move the line below.  Code below expects gnome-open to be in
 #. * this list immediately after xdg-open!
@@ -14057,11 +14073,11 @@
 
 #. Translators: please do not translate "chromium-browser" here!
 msgid "Chromium (chromium-browser)"
-msgstr ""
+msgstr "Chromium (chromium-browser)"
 
 #. Translators: please do not translate "chrome" here!
 msgid "Chromium (chrome)"
-msgstr ""
+msgstr "Chromium (chrome)"
 
 msgid "Manual"
 msgstr "Dorazi"
@@ -14605,7 +14621,6 @@
 msgid "Small"
 msgstr "E vog谷l"
 
-#, fuzzy
 msgid "Smaller versions of the default smileys"
 msgstr "Versione m谷 t谷 vegj谷l t谷 emotikoneve parazgjedhje"
 
@@ -15798,9 +15813,8 @@
 msgid "Voice/Video Settings"
 msgstr "Rregullime Z谷/Figur谷"
 
-#, fuzzy
 msgid "Voice and Video Settings"
-msgstr "Rregullime Z谷/Figur谷"
+msgstr "Rregullime p谷r Z谷 dhe Video"
 
 #. *< name
 #. *< version
@@ -15950,35 +15964,39 @@
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
 msgstr ""
+"$(^Name) qarkullon n谷n lejen GNU General Public License (GPL). Leja k谷tu "
+"jepet vet谷m p谷r q谷llime informimi. $_CLICK"
 
 #. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr "Nj谷 grup mjetesh shum谷platform谷sh p谷r GUI, p谷rdorur nga Pidgin-i"
+msgstr "Nj谷 grupmjetesh nd谷rplatform谷sh GUI, i p谷rdorur nga Pidgin"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
 msgstr ""
+"Ka nj谷 instanc谷 t谷 Pidgin-it n谷 xhirim e sip谷r.  Ju lutem, dilni prej Pidgin-"
+"it dhe riprovoni."
 
 #. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
-msgstr "Kartela dhe dll baz谷 t谷 Pidgin-it"
+msgstr "Kartelat dhe dll-t谷 baz谷 t谷 Pidgin-it"
 
 #. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr ""
+msgstr "Krijo nj谷 z谷 Menuje Nisjeje p谷r Pidgin-n"
 
 #. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr ""
+msgstr "Krijo n谷 Desktop nj谷 shkurtire p谷r Pidgin-in"
 
 #. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
+msgstr "Simbole Diagnostikimi (p谷r raportim vithisjesh)"
 
 #. Installer Subsection Text
 msgid "Desktop"
-msgstr ""
+msgstr "Desktop"
 
 #. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
@@ -15986,12 +16004,18 @@
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
+"Gabim n谷 shkarkimin e GTK+ Runtime ($R2).$\\rE domosdoshme q谷 t谷 funksionoj谷 "
+"Pidgin-i; n谷se riprovoni dhe prap谷 d谷shton, mund t'ju duhet t谷 p谷rdorni "
+"'Instaluesin Offline' prej http://pidgin.im/download/windows/ ."
 
 #. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
+"Gabim gjat谷 Instalimit t谷 Simboleve t谷 Diagnostikimit ($R2).$\\rN谷se "
+"riprovoni dhe prap谷 d谷shton, mund t'ju duhet t谷 p谷rdorni 'Instaluesin "
+"Offline' prej http://pidgin.im/download/windows/ ."
 
 #. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
@@ -16000,74 +16024,78 @@
 "installation instructions are at: http://developer.pidgin.im/wiki/Installing"
 "%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
+"Gabim gjat谷 Instalimit t谷 Kontrollit t谷 Drejtshkrimit ($R3).$\\rN谷se "
+"riprovoni dhe prap谷 d谷shton, udh谷zimet p谷r instalimin dorazi gjenden te: "
+"http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "GTK+ Runtime (required if not present)"
-msgstr "GTK+ Runtime Environment (i nevojsh谷m)"
+msgstr "GTK+ Runtime (i domosdosh谷m, n谷se nuk 谷sht谷 i pranish谷m)"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "Vendndodhje"
+msgstr "P谷rkthime"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
-msgstr "M谷 tej >"
+msgstr "Pasuesi >"
 
 #. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr "Klient Shk谷mbimi Mesazhesh t谷 Atyp谷ratysh谷m Pidgin (i nevojsh谷m)"
+msgstr "Klienti Pidgin p谷r ShK谷mbim Mesazhesh t谷 Atyp谷ratysh谷m (i domosdosh谷m)"
 
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
+"Pidgin-i lyp nj谷 GTK+ Runtime (q谷 nuk duket se e keni).$\\rJeni i sigurt q谷 "
+"d谷shironi t谷 anashkaloni instalimin e GTK+ Runtime?"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Shortcuts"
 msgstr "Shkurtore"
 
 #. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
+msgstr "Shkurtore p谷r nisjen e Pidgin-it"
 
 #. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
+msgstr "Mbulim Kontrolli Drejtshkrimi"
 
 #  Autostart
 #. Installer Subsection Text
-#, fuzzy
 msgid "Start Menu"
-msgstr "Nisje"
+msgstr "Menu Nisjeje"
 
 #. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
+"Mbulim i Kontrollit t谷 Drejtshkrimit. (Lyp lidhje n谷 Internet p谷r instalimin)"
 
 msgid "The installer is already running."
-msgstr ""
+msgstr "Instaluesi 谷sht谷 n谷 xhirim e sip谷r."
 
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
-"�instaluesi nuk gjeti dot z谷ra regjistri p谷r Pidgin-in.$\\rKa mund谷si q谷 "
-"k谷t谷 zbatim ta ket谷 instaluar nj谷 tjet谷r p谷rdorues."
+"instaluesi nuk gjeti dot z谷rat e regjistrit p谷r Pidgin-in.$\\rKa gjasa q谷 "
+"k谷t谷 zbatim ta ket谷 instaluar nj谷 p谷rdorues tjet谷r."
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "URI Handlers"
-msgstr "Trajtues URL-je myim"
+msgstr "Trajtuesa URI"
 
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
+"I pazoti t谷 巽instaloj versionin e tanish谷m t谷 Pidgin-it. Versioni i ri do t谷 "
+"instalohet pa hequr versionin e tanish谷m."
 
 #. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
@@ -16076,28 +16104,42 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Nuk keni leje t谷 巽instaloni k谷t谷 zbatim."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "D谷shmia nuk 谷sht谷 ende e vlefshme."
+
 #~ msgid "Require SSL/TLS"
 #~ msgstr "Lyp SSL/TLS"
 
 #~ msgid "Force old (port 5223) SSL"
 #~ msgstr "Detyro SSL t谷 vjet谷r (porta 5223)"
 
-#~ msgid "The name you entered is invalid."
-#~ msgstr "Emri q谷 dhat谷 谷sht谷 i pavlefsh谷m."
-
-#  The conversion failed!
-#~ msgid ""
-#~ "[Unable to display a message from this user because it contained invalid "
-#~ "characters.]"
-#~ msgstr ""
-#~ "[I pazoti t谷 shfaq谷 mesazh prej k谷tij p谷rdoruesi sepse p谷rmbante shenja "
-#~ "t谷 pavlefshme.]"
-
-#~ msgid "Search for Buddy by Information"
-#~ msgstr "K谷rko p谷r Shok谷 sipas T谷 dh谷nash"
-
-#~ msgid "The certificate is not valid yet."
-#~ msgstr "D谷shmia nuk 谷sht谷 ende e vlefshme."
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr "Ndodhi nj谷 gabim n谷 shp谷rnguljen \"in-band bytestream\"\n"
+
+#~ msgid "Transfer was closed."
+#~ msgstr "Shp谷rngulja u mbyll."
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "D谷shtoi n谷 hapjen e \"in-band bytestream\""
+
+#~ msgid "Set your friendly name."
+#~ msgstr "Caktoni ermin tuaj miq谷sor."
+
+#~ msgid "Current Mood"
+#~ msgstr "Humori i �astit"
+
+#~ msgid "New Mood"
+#~ msgstr "Humori i Ri"
+
+#  if (js->protocol_options & CHANGE_PASSWORD) {
+#~ msgid "Change your Mood"
+#~ msgstr "Ndryshoni Humorin tuaj"
+
+#~ msgid "How do you feel right now?"
+#~ msgstr "Si ndjeheni tani?"
+
+#~ msgid "Change Mood..."
+#~ msgstr "Ndryshoni Humor..."
 
 #~ msgid "The nick name you entered is invalid."
 #~ msgstr "Nofka q谷 dhat谷 谷sht谷 e mang谷t."
@@ -16120,21 +16162,16 @@
 #~ msgid "Unknown reason."
 #~ msgstr "Arsye e panjohur."
 
-#~ msgid "Current Mood"
-#~ msgstr "Humori i �astit"
-
-#~ msgid "New Mood"
-#~ msgstr "Humori i Ri"
-
-#  if (js->protocol_options & CHANGE_PASSWORD) {
-#~ msgid "Change your Mood"
-#~ msgstr "Ndryshoni Humorin tuaj"
-
-#~ msgid "How do you feel right now?"
-#~ msgstr "Si ndjeheni tani?"
-
-#~ msgid "Change Mood..."
-#~ msgstr "Ndryshoni Humor..."
+#  The conversion failed!
+#~ msgid ""
+#~ "[Unable to display a message from this user because it contained invalid "
+#~ "characters.]"
+#~ msgstr ""
+#~ "[I pazoti t谷 shfaq谷 mesazh prej k谷tij p谷rdoruesi sepse p谷rmbante shenja "
+#~ "t谷 pavlefshme.]"
+
+#~ msgid "Search for Buddy by Information"
+#~ msgstr "K谷rko p谷r Shok谷 sipas T谷 dh谷nash"
 
 #~ msgid "Error creating conference."
 #~ msgstr "Gabim n谷 krijimin e konferenc谷s."
@@ -16440,9 +16477,6 @@
 #~ msgid "XHTML-IM"
 #~ msgstr "XHTML-IM"
 
-#~ msgid "User Location"
-#~ msgstr "Vendndodhje P谷rdoruesi"
-
 #~ msgid "User Avatar"
 #~ msgstr "Avatar P谷rdoruesi"
 
--- a/po/uk.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/uk.po	Mon Nov 22 03:04:17 2010 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:12-0400\n"
-"PO-Revision-Date: 2010-10-10 21:42+0300\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-17 22:25+0300\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "Language: uk\n"
@@ -4852,17 +4852,6 @@
 msgid "Unknown Error in presence"
 msgstr "�亠于�亟仂仄舒 仗仂仄亳仍从舒 ��舒仆� 仗�亳���仆仂���"
 
-# http://xmpp.org/extensions/xep-0047.html
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "弌�舒仍舒�� 仗仂仄亳仍从舒 仗亠�亠亟舒于舒仆仆� 于仆�����仆�仂亞仂 仗仂�仂从� 亟舒仆亳� (IBB)\n"
-
-msgid "Transfer was closed."
-msgstr "�亠�亠亟舒于舒仆仆� 弍�仍仂 亰舒从�亳�仂."
-
-# http://xmpp.org/extensions/xep-0047.html
-msgid "Failed to open in-band bytestream"
-msgstr "�仂仄亳仍从舒 于�亟从�亳于舒仆仆� 于仆�����仆�仂亞仂 仗仂�仂从� 亟舒仆亳� (IBB)"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
@@ -5178,26 +5167,6 @@
 msgid "The username specified does not exist."
 msgstr "�亳亰仆舒�亠仆亠 �仄'� 从仂�亳���于舒�舒 仆亠 ��仆��."
 
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "��仂弍仍亠仄舒 �亳仆��仂仆�亰舒��� 仗亠�亠仍�从� 从仂仆�舒从��于 � %s (%s)"
-
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s � � 仍仂从舒仍�仆仂仄� 仗亠�亠仍�从� � 亞��仗� \"%s\", 舒仍亠 于�亟���仆�亶 � 仗亠�亠仍�从� �亠�于亠�舒. "
-"丱仂�亠�亠 亟仂亟舒�亳 �亠亶 从仂仆�舒从�?"
-
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s � � 仍仂从舒仍�仆仂仄� 仗亠�亠仍�从�, 舒仍亠 于�亟���仆�亶 � 仗亠�亠仍�从� �亠�于亠�舒. 丱仂�亠�亠 亟仂亟舒�亳 "
-"�亠亶 从仂仆�舒从�?"
-
 msgid "Unable to parse message"
 msgstr "�亠 于亟舒����� �仂亰�弍�舒�亳 仗仂于�亟仂仄仍亠仆仆�"
 
@@ -5368,6 +5337,26 @@
 msgid "MSN Error: %s\n"
 msgstr "�仂仄亳仍从舒 MSN: %s\n"
 
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "��仂弍仍亠仄舒 �亳仆��仂仆�亰舒��� 仗亠�亠仍�从� 从仂仆�舒从��于 � %s (%s)"
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s � � 仍仂从舒仍�仆仂仄� 仗亠�亠仍�从� � 亞��仗� \"%s\", 舒仍亠 于�亟���仆�亶 � 仗亠�亠仍�从� �亠�于亠�舒. "
+"丱仂�亠�亠 亟仂亟舒�亳 �亠亶 从仂仆�舒从�?"
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s � � 仍仂从舒仍�仆仂仄� 仗亠�亠仍�从�, 舒仍亠 于�亟���仆�亶 � 仗亠�亠仍�从� �亠�于亠�舒. 丱仂�亠�亠 亟仂亟舒�亳 "
+"�亠亶 从仂仆�舒从�?"
+
 msgid "Other Contacts"
 msgstr "�仆�� 从仂仆�舒从�亳"
 
@@ -5420,12 +5409,24 @@
 msgid "Set friendly name for %s."
 msgstr "���舒仆仂于亳�亳 亟��亢仆� �仄'� 亟仍� %s."
 
-msgid "Set your friendly name."
-msgstr "�于亠亟��� 于舒�亠 亟��亢仆� �仄'�."
+msgid "Set Friendly Name"
+msgstr "���舒仆仂于亳�亳 亟��亢仆� �仄'�"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�仄'�, 仗�亟 �从亳仄 于舒� 弍�亟��� 弍舒�亳�亳 �仆�� 从仂�亳���于舒�� MSN."
 
+msgid "This Location"
+msgstr "丶亠 仄���亠亰仆舒�仂亟亢亠仆仆�"
+
+msgid "This is the name that identifies this location"
+msgstr "丶� 仆舒亰于舒 于亳亰仆舒�舒� 仄���亠亰仆舒�仂亟亢亠仆仆�"
+
+msgid "Other Locations"
+msgstr "�仆�亠 仄���亠亰仆舒�仂亟亢亠仆仆�"
+
+msgid "You can sign out from other locations here"
+msgstr "丐�� 于亳 仄仂亢亠�亠 于亳亶�亳 亰 �仆�仂亞仂 仄���亠亰仆舒�仂亟亢亠仆仆�"
+
 msgid "Set your home phone number."
 msgstr "�于亠亟��� 仆仂仄亠� 于舒�仂亞仂 亟仂仄舒�仆�仂亞仂 �亠仍亠�仂仆�."
 
@@ -5512,6 +5513,9 @@
 msgid "Set Friendly Name..."
 msgstr "���舒仆仂于亳�亳 亟��亢仆� �仄'�..."
 
+msgid "View Locations..."
+msgstr "�亠�亠亞仍�仆��亳 仄���亠亰仆舒�仂亟亢亠仆仆�..."
+
 msgid "Set Home Phone Number..."
 msgstr "���舒仆仂于亳�亳 仆仂仄亠� 亟仂仄舒�仆�仂亞仂 �亠仍亠�仂仆�..."
 
@@ -6898,13 +6902,13 @@
 
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
+"��亟� 仍舒�从舒, 舒于�仂�亳亰�亶�亠 仄亠仆亠 � � 亰仄仂亢� 亟仂亟舒�亳 �舒� 亟仂 仄仂亞仂 仗亠�亠仍�从� 从仂仆�舒从��于."
 
 msgid "No reason given."
 msgstr "��亳�亳仆舒 仆亠 于从舒亰舒仆舒."
 
-#, fuzzy
 msgid "Authorization Denied Message:"
-msgstr "�仂于�亟仂仄仍亠仆仆� 于�亟仄仂于亳 � 舒于�仂�亳亰舒���:"
+msgstr "�仂于�亟仂仄仍亠仆仆� 于�亟仄仂于亳 于 舒于�仂�亳亰舒���:"
 
 #, c-format
 msgid "Received unexpected response from %s: %s"
@@ -6921,6 +6925,13 @@
 "�亳 亰舒仆舒亟�仂 �舒��仂 亰'�亟仆���亠�� �舒 于�亟'�亟仆���亠��. �舒�亠从舒亶�亠 10 �于亳仍亳仆 �舒 "
 "�仗�仂弍�亶�亠 亰仆仂于�. 亊从�仂 于亳 仗�仂亟仂于亢亳�亠 �仗�仂弍亳, 于舒仄 亟仂于亠亟亠���� �亠从舒�亳 �亠 亟仂于�亠."
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr ""
+"�亳 �于�仄从仆�仍亳 仆亠仂弍��亟仆���� �亳���于舒仆仆� 于 仆舒仍舒���于舒仆仆�� 仂弍仍�从仂于仂亞仂 亰舒仗亳��, 舒仍亠 "
+"仂亟亳仆 亰 �亠�于亠��于 仆亠 仗�亟��亳仄�� 亶仂亞仂."
+
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
 #, c-format
@@ -6947,12 +6958,18 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
+"(弌�舒仍舒�� 仗仂仄亳仍从舒 仂��亳仄舒仆仆� ��仂亞仂 仗仂于�亟仂仄仍亠仆仆�. �仂仆�舒从�, 亰 �从亳仄 于亳 "
+"�仗�仍从���亠��, 仄仂亢仍亳于仂 于亳从仂�亳��仂于�� �仆�亠 从仂亟�于舒仆仆�, 仆�亢 仂��从������. 亊从�仂 于亳 "
+"亰仆舒��亠, �从亠 从仂亟�于舒仆仆� 于�仆 于亳从仂�亳��仂于��, 于亳 仄仂亢亠�亠 于亳亰仆舒�亳�亳 亶仂亞仂 于 "
+"�仂亰�亳�亠仆亳� 仆舒仍舒���于舒仆仆�� 仂弍仍�从仂于仂亞仂 亰舒仗亳�� AIM/ICQ.) "
 
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
+"(弌�舒仍舒�� 仗仂仄亳仍从舒 仂��亳仄舒仆仆� ��仂亞仂 仗仂于�亟仂仄仍亠仆仆�. �弍仂 于亳 �舒 %s 仂弍�舒仍亳 ��亰仆� "
+"从仂亟�于舒仆仆�, 舒弍仂 %s 从仂�亳�������� 从仍��仆�仂仄 亰 仗仂仄亳仍从舒仄亳.)"
 
 msgid "Could not join chat room"
 msgstr "�亠 于亟舒仍仂�� 仗�亳�亟仆舒�亳�� 亟仂 从�仄仆舒�亳 弍舒仍舒�从亳"
@@ -7230,6 +7247,13 @@
 "从仂�亳���于舒��于 仄舒��� 弍��亳 仗�舒于亳仍�仆亳仄亳 舒亟�亠�舒仄亳 亠仍. 仗仂��亳 舒弍仂 仗仂�亳仆舒�亳�� 亰 "
 "仍��亠�亳 �舒 仄���亳�亳 ��仍�从亳 仍��亠�亳, �亳��亳 �舒 仗�仂弍�仍亳, 舒弍仂 ��仍�从亳 �亳��亳."
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr ""
+"�亳 �于�仄从仆�仍亳 仆亠仂弍��亟仆���� �亳���于舒仆仆� 于 仆舒仍舒���于舒仆仆�� 仂弍仍�从仂于仂亞仂 亰舒仗亳��, 舒仍亠 "
+"�亳���于舒仆仆� 仆亠 仗�亟��亳仄������ 于舒�仂� �亳��亠仄仂�."
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr "�亠亰舒弍舒�仂仄 于舒� 仄仂亢��� 于�亟'�亟仆舒�亳. 亊从�仂 �舒从, 仗亠�亠于���亠 %s 仆舒 仂仆仂于仍亠仆仆�."
@@ -7758,13 +7782,11 @@
 msgid "Set Privacy Options..."
 msgstr "���舒仆仂于亳�亳 仂仗��� 仗�亳于舒�仆仂���..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "�仂从舒亰舒�亳 _仗亠�亠仍�从 从仂仆�舒从��于"
-
-#, fuzzy
+msgstr "�仂从舒亰舒�亳 仗亠�亠仍�从 于亳亟亳仄亳�"
+
 msgid "Show Invisible List"
-msgstr "�亠�亠仍�从 亰舒仗�仂�亠仆�"
+msgstr "�仂从舒亰舒�亳 仗亠�亠仍�从 仆亠于亳亟亳仄亳�"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -7782,6 +7804,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "丿�从舒�亳 从仂�亳���于舒�舒 亰舒 舒亟�亠�仂� 亠仍.仗仂��亳..."
 
+msgid "Don't use encryption"
+msgstr "�亠 于亳从仂�亳��仂于�于舒�亳 �亳���于舒仆仆�"
+
 msgid "Use clientLogin"
 msgstr "�亳从仂�亳��仂于�于舒�亳 clientLogin"
 
@@ -7897,177 +7922,164 @@
 msgid "Voice"
 msgstr "�仂仍仂�"
 
-#, fuzzy
 msgid "AIM Direct IM"
-msgstr "���仄亠 仄亳���于亠 仗仂于�亟仂仄仍亠仆仆�"
-
-#, fuzzy
+msgstr "AIM Direct IM"
+
 msgid "Get File"
-msgstr "�舒亟�亳仍舒仆仆� �舒亶仍�"
-
-#, fuzzy
+msgstr "���亳仄舒�亳 �舒亶仍"
+
 msgid "Games"
-msgstr "��舒仄��从舒"
+msgstr "�亞�亳"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
-msgstr ""
-
-#, fuzzy
+msgstr "�仂亟舒�从亳"
+
 msgid "Send Buddy List"
-msgstr "�亠�亠仍�从 从仂仆�舒从��于"
-
-#, fuzzy
+msgstr "�舒亟��仍舒�亳 仗亠�亠仍�从 从仂仆�舒从��于"
+
 msgid "ICQ Direct Connect"
-msgstr "�仂亰于仂仍亳�亳 仗��仄� 亰'�亟仆舒仆仆�"
-
-#, fuzzy
+msgstr "���仄亠 亰'�亟仆舒仆仆� ICQ"
+
 msgid "AP User"
-msgstr "�仂�亳���于舒�"
+msgstr "�仂�亳���于舒� AP"
 
 msgid "ICQ RTF"
-msgstr ""
+msgstr "ICQ RTF"
 
 msgid "Nihilist"
-msgstr ""
-
-#, fuzzy
+msgstr "��亞�仍���"
+
 msgid "ICQ Server Relay"
-msgstr "弌亠�于亠� 从舒亢亠:"
+msgstr "丐�舒仆亰亳�仆亳亶 �亠�于亠� ICQ"
 
 msgid "Old ICQ UTF8"
-msgstr ""
+msgstr "弌�舒�亳亶 ICQ UTF8"
 
 msgid "Trillian Encryption"
-msgstr ""
+msgstr "丿亳���于舒仆仆� Trillian"
 
 msgid "ICQ UTF8"
-msgstr ""
+msgstr "ICQ UTF8"
 
 msgid "Hiptop"
-msgstr ""
-
-#, fuzzy
+msgstr "丱�仗-�仂仗"
+
 msgid "Security Enabled"
-msgstr "�仂亟 弍亠亰仗亠从亳"
-
-#, fuzzy
+msgstr "�亠亰仗亠从舒 �于�仄从仆亠仆舒"
+
 msgid "Video Chat"
-msgstr "_��亟亠仂于亳从仍亳从"
-
-#, fuzzy
+msgstr "��亟亠仂弍舒仍舒�从舒"
+
 msgid "iChat AV"
-msgstr "�舒仍舒�从舒"
-
-#, fuzzy
+msgstr "iChat AV"
+
 msgid "Live Video"
-msgstr " ��亟亠仂"
-
-#, fuzzy
+msgstr "��亟亠仂 仆舒亢亳于仂"
+
 msgid "Camera"
-msgstr "��亟亠仂从舒仄亠�舒"
+msgstr "�舒仄亠�舒"
 
 msgid "Screen Sharing"
-msgstr ""
+msgstr "弌仗�仍�仆亳亶 亠从�舒仆"
 
 msgid "IP Address"
 msgstr "IP �亟�亠�舒"
 
-#, fuzzy
 msgid "Warning Level"
-msgstr "�舒��亠�亠亢亠仆仆�"
-
-#, fuzzy
+msgstr "��于亠仆� 亰舒��亠�亠亢亠仆仆�"
+
 msgid "Buddy Comment"
-msgstr "�仂仄亠仆�舒� 从仂�亳���于舒�舒:"
-
-#, fuzzy, c-format
+msgstr "�仂仄亠仆�舒� 从仂�亳���于舒�舒"
+
+#, c-format
 msgid "User information not available: %s"
-msgstr "�亳从仂�亳��仂于�于舒�亳 �亳���于舒仆仆�, 从仂仍亳 �亠 仄仂亢仍亳于仂"
+msgstr "��亟仂仄仂��� 仗�仂 从仂�亳���于舒�舒 仆亠亟仂���仗仆�: %s"
 
 msgid "Mobile Phone"
 msgstr "�仂弍�仍�仆亳亶 �亠仍亠�仂仆"
 
-#, fuzzy
 msgid "Personal Web Page"
-msgstr "��仂弍亳��亳亶 仄仂弍�仍�仆亳亶"
+msgstr "��仂弍亳��舒 ��仂��仆从舒 �亠仆亠�"
 
 #. aim_userinfo_t
-#. strip_html_tags
-#, fuzzy
+#. use_html_status
 msgid "Additional Information"
-msgstr "�亠仂弍仂于'�亰从仂于� 于�亟仂仄仂���:"
+msgstr "�仂亟舒�从仂于� 于�亟仂仄仂���"
 
 msgid "Zip Code"
-msgstr ""
-
-#, fuzzy
+msgstr "�仂��仂于亳亶 从仂亟"
+
 msgid "Work Information"
-msgstr "��仍��亠 于�亟仂仄仂��亠亶"
+msgstr "��亟仂仄仂��� 仗�仂 �仂弍仂��"
 
 msgid "Division"
-msgstr ""
-
-#, fuzzy
+msgstr "��亟亟�仍"
+
 msgid "Position"
-msgstr "�仗亳�"
-
-#, fuzzy
+msgstr "�仂�舒亟舒"
+
 msgid "Web Page"
-msgstr "�仂仄舒�仆� ��仂��仆从舒"
-
-#, fuzzy
+msgstr "弌�仂��仆从舒 �亠仆亠�"
+
 msgid "Online Since"
-msgstr "丕 仄亠�亠亢� 亰"
+msgstr "� 仄亠�亠亢� 亰"
 
 msgid "Member Since"
 msgstr "丼仍亠仆 亰"
 
 msgid "Capabilities"
-msgstr ""
-
-#. 4 separate strings are needed in order to ease translators' job
+msgstr "�仂亢仍亳于仂���"
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "�'�于亳于�� 于 仄亠�亠亢�"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
-msgstr "�'�于亳于�� 于 仄亠�亠亢�"
-
+msgstr "�亠 亰'�于仍�于�� 于 仄亠�亠亢�"
+
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
 msgstr "�'�于亳于�� 仗仂亰舒 仄亠�亠亢亠�"
 
-#, fuzzy
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
-msgstr "�'�于亳于�� 仗仂亰舒 仄亠�亠亢亠�"
-
-#, fuzzy
+msgstr "�亠 亰'�于仍�于�� 仗仂亰舒 仄亠�亠亢亠�"
+
 msgid "you have no buddies on this list"
-msgstr "�舒� 于亳从亳仆�仍亳 亰 ��仂亞仂 MultiMX."
-
-#, fuzzy, c-format
+msgstr "仆亠仄舒� 从仂仆�舒从��于 于 ��仂仄� 仗亠�亠仍�从�"
+
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
 msgstr ""
-"�亳 仄仂亢亠�亠 仗仂于�仂�仆仂 亰舒仗亳�舒�亳 舒于�仂�亳亰舒��� 于�亟 �亳� 从仂�亳���于舒��于, 从仍舒�仆�于�亳 仆舒 "
-"仆亳� 仗�舒于仂� 从仆仂仗从仂� 仄亳�� �舒 于亳弍�舒于�亳 \"�仂于�仂�仆亳亶 亰舒仗亳� 舒于�仂�亳亰舒���\"."
-
-#, fuzzy
+"�亳 仄仂亢亠�亠 亟仂亟舒�亳 从仂仆�舒从� 亟仂 ��仂亞仂 仗亠�亠仍�从� 仆舒�亳�仆�于�亳 仆舒 仆�仂仄� 仗�舒于仂� "
+"从仆仂仗从仂� 仄亳�� 仆舒 于亳弍�舒于�亳 \"%s"
+
 msgid "Visible List"
-msgstr "�亳亟亳仄亳亶"
+msgstr "�亠�亠仍�从 于亳亟亳仄亳�"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
-msgstr ""
-
-#, fuzzy
+msgstr "丶� 从仂仆�舒从�亳 弍舒�亳�亳仄��� 于舒� ��舒仆, 从仂仍亳 于亳 仗亠�亠仄从仆亠�亠�� 仆舒 \"�亠于亳亟亳仄亳亶\""
+
 msgid "Invisible List"
-msgstr "�亠�亠仍�从 亰舒仗�仂�亠仆�"
+msgstr "�亠�亠仍�从 仆亠于亳亟亳仄亳�"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "丶� 从仂仆�舒从�亳 亰舒于亢亟亳 弍�亟��� 弍舒�亳�亳, �仂 于亳 仗仂亰舒 仄亠�亠亢亠�"
 
 msgid "Aquarius"
 msgstr "�仂亟仂仍�亶"
@@ -12365,6 +12377,9 @@
 msgid "Lao"
 msgstr "�舒仂"
 
+msgid "Maithili"
+msgstr "�舒亶���仍�"
+
 msgid "Macedonian"
 msgstr "�舒从亠亟仂仆��从舒"
 
@@ -15461,21 +15476,3 @@
 
 msgid "You do not have permission to uninstall this application."
 msgstr "�亳 仆亠 仄舒��亠 仗�舒于舒 仆舒 于亳亟舒仍亠仆仆� ���� 仗�仂亞�舒仄亳."
-
-#~ msgid "The certificate has expired and should not be considered valid."
-#~ msgstr "丐亠�仄�仆 亟�� �亠��亳��从舒�� 亰舒从�仆�亳于�� � 亶仂亞仂 仆亠 �仍�亟 于于舒亢舒�亳 亟�亶�仆亳仄."
-
-#~ msgid "_UDP:"
-#~ msgstr "_UDP:"
-
-#~ msgid "_TCP:"
-#~ msgstr "_TCP:"
-
-#~ msgid "_TLS:"
-#~ msgstr "_TLS:"
-
-#~ msgid "Require SSL/TLS"
-#~ msgstr "�仂��亠弍�� SSL/TLS"
-
-#~ msgid "Force old (port 5223) SSL"
-#~ msgstr "��亳仄��仂于仂 ��舒�亳亶 (仗仂�� 5223) SSL"
--- a/po/zh_HK.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/zh_HK.po	Mon Nov 22 03:04:17 2010 +0000
@@ -8,7 +8,7 @@
 # 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.650 2010/10/17 14:56:33 acli Exp $
+# $InternalId: zh_TW.po,v 1.655 2010/11/18 06:05:50 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -60,11 +60,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.7.4\n"
+"Project-Id-Version: Pidgin 2.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:12-0400\n"
-"PO-Revision-Date: 2010-10-17 10:55-0400\n"
-"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-15 16:24-0500\n"
+"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: zh_HK\n"
 "MIME-Version: 1.0\n"
@@ -5036,16 +5036,6 @@
 msgid "Unknown Error in presence"
 msgstr "筝���������莖�荐����"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "絽九�т���腟�羌��活叱��筝㊦�主�����\n"
-
-# XXX �����頑⑮��茴�������鐚� 20090305 acli
-msgid "Transfer was closed."
-msgstr "�活叱綏画←筝㊥②��"
-
-msgid "Failed to open in-band bytestream"
-msgstr "�≧�����絽九�т���腟�羌�"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "�≧��渇��罟�罅��� %s鐚����阪��剛���吚�罅��活叱"
@@ -5465,28 +5455,6 @@
 msgid "The username specified does not exist."
 msgstr "篏���莠後�ョ��絽活��筝��絖�����"
 
-# XXX ��⑮
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "�� %s (%s) ��絅遵�羝����画���罩ュ����筝㊤�榊憜�馹�"
-
-# XXX ��⑮
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s �����亥���絅遵�羝�������%s��臂g�茖���私���失�����鐚�篏�荀��医�����絅遵��割失����"
-"��絅遵�羝������"
-
-# XXX ��⑮
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s �����亥���絅遵�羝�����や���失�����鐚�篏�荀��医�����絅遵��割失������絅遵�羝������"
-
 msgid "Unable to parse message"
 msgstr "�≧�茹f��荐���"
 
@@ -5665,6 +5633,28 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN ���鐚�%s\n"
 
+# XXX ��⑮
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "�� %s (%s) ��絅遵�羝����画���罩ュ����筝㊤�榊憜�馹�"
+
+# XXX ��⑮
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s �����亥���絅遵�羝�������%s��臂g�茖���私���失�����鐚�篏�荀��医�����絅遵��割失����"
+"��絅遵�羝������"
+
+# XXX ��⑮
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s �����亥���絅遵�羝�����や���失�����鐚�篏�荀��医�����絅遵��割失������絅遵�羝������"
+
 # XXX ��⑮鐚���緇��拷�� - 20090226 acli
 # NOTE: (09��14��13腱� EST) wing: what does "Other Contacts" (msn/group.h:36) actually mean? ..
 # NOTE: (09��24��18腱� EST) khc: I'd probably just translate to �銀�篋�, hehe
@@ -5720,8 +5710,8 @@
 msgid "Set friendly name for %s."
 msgstr "荐㊤� %s ��膓峨����"
 
-msgid "Set your friendly name."
-msgstr "荐㊤�篏���膓峨����"
+msgid "Set Friendly Name"
+msgstr "荐㊤�膓峨��"
 
 # NOTE MSN���援┗筝���Yahoo鐚�篏睡������札莠後�ヤ算篏����井�援┗鐚�
 # NOTE �割戎��篏睡������絽活��罸��♂��篆�鐚�篌寂�箙���������
@@ -5729,6 +5719,18 @@
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�ヤ査�� MSN �ラ�延�����篋肴�����蕁�ず����膓峨����"
 
+msgid "This Location"
+msgstr "���������臀�"
+
+msgid "This is the name that identifies this location"
+msgstr "�����������臀��篁ラ������腮延撮茵�"
+
+msgid "Other Locations"
+msgstr "�銀������臀�"
+
+msgid "You can sign out from other locations here"
+msgstr "篏�������茖�嶃�阪�銀������臀�"
+
 msgid "Set your home phone number."
 msgstr "荐㊤�篏���絎句���肢���腆若��"
 
@@ -5815,6 +5817,9 @@
 msgid "Set Friendly Name..."
 msgstr "荐㊤�膓峨��..."
 
+msgid "View Locations..."
+msgstr "罟∵������臀�..."
+
 msgid "Set Home Phone Number..."
 msgstr "荐㊤�絎句���肢���腆�..."
 
@@ -7195,7 +7200,7 @@
 msgstr "篌堺������荐���"
 
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨������ユ����絅遵�羝���賢��"
+msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨�篏����ユ����絅遵�羝���賢��"
 
 msgid "No reason given."
 msgstr "羃���腟��������"
@@ -7220,6 +7225,11 @@
 "篏����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋���篏�箴��句梗膾���荅��g�鐚�"
 "�i瑳篏���膈�緇�����絨����翫����綮狗�激��"
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr "篏���験��荐㊤�筝㊥��絎�篋�篏睡����絲�鐚�篏��銀賢筝���篌堺�������吓��絲����純��"
+
 # NOTE �����荀�羆� %s��絅遵���鋋��� - acli 20090902
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
@@ -7246,8 +7256,8 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-"鐚��ユ�狗����荐������主��篋������罩e�����困茫���絅遵�緇����遵��戎�������喝�鋇�箙���絖���"
-"膩�⊆鐚�絋������ラ���f���藝主隈腆種�茫������� AIM/ICQ 絽活�������臥��┃絎���筝㊦����膩�⊆��"
+"鐚��ユ�狗����荐������主��篋������罩e���篏�篋よ���絅遵�緇����遵��戎����篏��喝�鋇�箙���絖�膃�"
+"膩�⊆鐚�絋���篏��ラ���f���藝主隈腆種�茫������ AIM/ICQ 絽活�������臥��┃絎���筝㊦����膩�⊆��"
 "罨�篏���絎���鐚�"
 
 #, c-format
@@ -7255,7 +7265,7 @@
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"鐚��ユ�狗����荐������主��篋���������醇���� %s �悟���筝�����膩�⊆鐚�箙������醇�� %s ��戎"
+"鐚��ユ�狗����荐������主��篋���������巡��� %s �悟���筝�����膩�⊆鐚�箙������醇�� %s ��戎"
 "�����馹������句�腮�綣����"
 
 msgid "Could not join chat room"
@@ -7538,6 +7548,11 @@
 "�≧�篁� %s 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽����堺�����脂�球�医��鐚�����篁ヨ�掩��"
 "絖�罸�莎桁�鐚�筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����"
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr "篏���験��荐㊤�筝㊥��絎�篋�篏睡����絲�鐚�篏�篏���膤紫輝筝���吓��絲����純��"
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr "篏����醇�����㊥�����т賢�潔�g���絋���絮��鐚�茫��� %s ������羃����贋�違��"
@@ -8027,13 +8042,11 @@
 msgid "Set Privacy Options..."
 msgstr "荐㊤�腱��演�檎��..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "����"
-
-#, fuzzy
+msgstr "蕁�ず���援┗筝�膩���羝���"
+
 msgid "Show Invisible List"
-msgstr "��茫�羝���"
+msgstr "蕁�ず���援┗�∝���羝���"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -8051,6 +8064,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "篏睡���糸��灸散�医����絨�絅遵�..."
 
+msgid "Don't use encryption"
+msgstr "筝�篏睡����絲�"
+
 msgid "Use clientLogin"
 msgstr "篏睡�� clientLogin"
 
@@ -8247,7 +8263,7 @@
 msgstr "iChat 荀����鎀�"
 
 msgid "Live Video"
-msgstr "����荀�荐�"
+msgstr "����荀���"
 
 #  NOTE AIM_CAPS_CAMERA鐚��恰���藝弱��(^^;)
 msgid "Camera"
@@ -8266,10 +8282,9 @@
 msgid "Buddy Comment"
 msgstr "絅遵���荐�"
 
-#  NOTE Connection security �檎��鐚�����失������吡����羈�筝�篏睡�� TLS, 絋�篌堺�������� TLS ��鋌ヤ���絲����劫�膵主��画��g�
-#, fuzzy, c-format
+#, c-format
 msgid "User information not available: %s"
-msgstr "�銀失������吚��鐚�篏睡����絲�����"
+msgstr "�鞘��遺戎����莖�荐�鐚�%s"
 
 msgid "Mobile Phone"
 msgstr "羌����肢�"
@@ -8278,12 +8293,12 @@
 msgstr "��篋榊恐��"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "�銀�莖�荐�"
 
 msgid "Zip Code"
-msgstr "�級������"
+msgstr "�級��膩���"
 
 msgid "Work Information"
 msgstr "綏ヤ�莖�荐�"
@@ -8305,50 +8320,63 @@
 msgstr "���堺���∞������"
 
 msgid "Capabilities"
-msgstr "�後���"
-
-#. 4 separate strings are needed in order to ease translators' job
+msgstr "�弱���"
+
+#  NOTE ������絖�筝峨�� Oscar (ICQ) ��茹i����④鐚�http://pidgin.im/pipermail/translators/2010-November/000554.html
+#  NOTE Oscar: ��絅遵��医��� Visible List ��
+#  NOTE Yahoo: �����冴���沿昆����鐚�絨�����絎���絅遵��援┗筝�膩�
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "�援┗筝�膩�"
 
-#, fuzzy
+#  NOTE ��絅遵�緇� Visible List �хЩ��
+#  NOTE ���� "Don't Appear Permanently Offline"
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
-msgstr "�援┗筝�膩�"
-
-# NOTE 筝�罨∞�糸�ユ��筝��援┗�∝�鐚���篁ュ����������絖���
+msgstr "��罩√�援┗筝�膩�"
+
+#  NOTE Oscar: ��絅遵��医��� Invisible List ��
+#  NOTE Yahoo: �����冴���沿昆����鐚�絨�����絎���絅遵��援┗�∝�
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
-msgstr "�����援┗�∝�"
-
-# NOTE 筝�罨∞�糸�ユ��筝��援┗�∝�鐚���篁ュ����������絖���
-#, fuzzy
+msgstr "�援┗�∝�"
+
+#  NOTE ��絅遵�緇� Invisible List �хЩ��
+#  NOTE ���� "Don't Appear Permanently Offline"
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
-msgstr "�����援┗�∝�"
-
-#, fuzzy
+msgstr "��罩√�援┗�∝�"
+
 msgid "you have no buddies on this list"
-msgstr "篏�綏牙�緇�MultiMX筝㊧←荼√�冴��"
-
-#, fuzzy, c-format
+msgstr "��羝����ф���絅遵�"
+
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
 msgstr ""
-"篏���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��"
-"��荀�羆����域�茘�����"
-
-#, fuzzy
+"��絅遵��医�����羝����э������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御����%s��"
+
 msgid "Visible List"
-msgstr "����"
+msgstr "���援┗筝�膩���羝���"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
-msgstr ""
-
-#, fuzzy
+msgstr "��篋�絅遵�����沿昆��篁��順��荀�篏���筝�膩�����"
+
 msgid "Invisible List"
-msgstr "��茫�羝���"
+msgstr "���援┗�∝���羝���"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "�傑��������篋�絅遵��沿昆"
 
 msgid "Aquarius"
 msgstr "羂雁Г綺�"
@@ -8426,7 +8454,7 @@
 msgstr "�銀�"
 
 msgid "Visible"
-msgstr "����"
+msgstr "筝��沿昆"
 
 # XXX ��⑮ - 20090226
 msgid "Friend Only"
@@ -10798,6 +10826,7 @@
 msgstr "筝���失�������羝���賢"
 
 # NOTE Yahoo 絎��壕⑮��羂檎��蕁�ず�∝���鐚�茯��巡�藥��九��恰�����絨���篋削����傑����荳���
+#  NOTE ���� "Appear Offline"
 msgid "Appear Permanently Offline"
 msgstr "�傑���援┗�∝�"
 
@@ -10805,6 +10834,7 @@
 msgstr "�丞��"
 
 #  NOTE ��������х��筝�����篁�
+#  NOTE ���� "Don't Appear Offline"
 msgid "Don't Appear Permanently Offline"
 msgstr "��罩∫�傑���援┗�∝�"
 
@@ -12779,6 +12809,11 @@
 msgid "Lao"
 msgstr "絲�����"
 
+#  NOTE 篁g⊆ mai鐚��医墾��筝�腮��壕�鐚�膓㊤�榊�丞�茘������������
+#  XXX �鞘��井③綣���佂�h⑮��鐚����� http://zh.wikipedia.org/zh/菴������, http://tc.wangchao.net.cn/baike/detail_2071696.html
+msgid "Maithili"
+msgstr "��������"
+
 #  NOTE��薤��狗���������腮��掩�茯���鐚�莊�絽�����薤��狗��筝��♂��篆�
 msgid "Macedonian"
 msgstr "薤��狗����"
@@ -15969,6 +16004,19 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "篏�羃���罨���腱脂�ょ�綣��"
 
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr "鎵九�т���腟�羌��活叱��筝㊦�主�����\n"
+
+# XXX �����頑⑮��茴�������鐚� 20090305 acli
+#~ msgid "Transfer was closed."
+#~ msgstr "�活叱綏画←筝㊥②��"
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "�≧�����絽九�т���腟�羌�"
+
+#~ msgid "Set your friendly name."
+#~ msgstr "荐㊤������援┗��"
+
 #~ msgid "The certificate has expired and should not be considered valid."
 #~ msgstr "��綣究��茘�綏臥�丈��鐚���荀�篏��≧����"
 
--- a/po/zh_TW.po	Mon Nov 22 03:01:14 2010 +0000
+++ b/po/zh_TW.po	Mon Nov 22 03:04:17 2010 +0000
@@ -6,7 +6,7 @@
 # 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.650 2010/10/17 14:56:33 acli Exp $
+# $InternalId: zh_TW.po,v 1.655 2010/11/18 06:05:50 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -58,11 +58,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.7.4\n"
+"Project-Id-Version: Pidgin 2.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-21 00:12-0400\n"
-"PO-Revision-Date: 2010-10-17 10:55-0400\n"
-"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
+"POT-Creation-Date: 2010-11-21 13:55-0500\n"
+"PO-Revision-Date: 2010-11-15 16:24-0500\n"
+"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -373,10 +373,10 @@
 msgstr "絋���荀���臀���腮縁�茫�莠後�ョ��遵�筝蚊��"
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "腱脂�ら��腟�絅遵�������腱脂�よ��∝������絅遵�"
+msgstr "腱脂�ら��腟�絅遵�������腱脂�よ��∝������絅遵�"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "腱脂�ら����臂ょ�������腱脂�よ��∝������絅遵�"
+msgstr "腱脂�ら����臂ょ�������腱脂�よ��∝������絅遵�"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -728,14 +728,14 @@
 msgstr "��吡���ら���檎����鐚�plugins version"
 
 msgid "No such command (in this context)."
-msgstr "羃���������篁わ�������茖鋎睡���"
+msgstr "羃���������篁わ�������茖>戎���"
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 "荀��峨���筝���篁ょ��茯����莠後�ャ��/help &lt;��篁�&gt;���喝���\n"
-"����茖����������篁ゆ��鐚�\n"
+"����茖¥���������篁ゆ��鐚�\n"
 
 #, c-format
 msgid ""
@@ -5034,16 +5034,6 @@
 msgid "Unknown Error in presence"
 msgstr "筝���������莖�荐����"
 
-msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "絽九�т���腟�羌��活叱��筝㊦�主�����\n"
-
-# XXX �����頑⑮��茴�������鐚� 20090305 acli
-msgid "Transfer was closed."
-msgstr "�活叱綏画←筝㊥②��"
-
-msgid "Failed to open in-band bytestream"
-msgstr "�≧�����絽九�т���腟�羌�"
-
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "�≧��渇��罟�罅��� %s鐚����阪��剛���吚�罅��活叱"
@@ -5463,28 +5453,6 @@
 msgid "The username specified does not exist."
 msgstr "����莠後�ョ��絽活��筝��絖�����"
 
-# XXX ��⑮
-#, c-format
-msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "�� %s (%s) ��絅遵�羝����画���罩ュ����筝㊤�榊憜�馹�"
-
-# XXX ��⑮
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s �����亥���絅遵�羝�������%s��臂ょ�茖���私���失�����鐚�����医�����絅遵��割失����"
-"��絅遵�羝������"
-
-# XXX ��⑮
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s �����亥���絅遵�羝�����や���失�����鐚�����医�����絅遵��割失������絅遵�羝������"
-
 msgid "Unable to parse message"
 msgstr "�≧�茹f��荐���"
 
@@ -5663,6 +5631,28 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN ���鐚�%s\n"
 
+# XXX ��⑮
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "�� %s (%s) ��絅遵�羝����画���罩ュ����筝㊤�榊憜�馹�"
+
+# XXX ��⑮
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s �����亥���絅遵�羝�������%s��臂ょ�茖¥��私���失�����鐚�����医�����絅遵��割失����"
+"��絅遵�羝������"
+
+# XXX ��⑮
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s �����亥���絅遵�羝�����や���失�����鐚�����医�����絅遵��割失������絅遵�羝������"
+
 # XXX ��⑮鐚���緇��拷�� - 20090226 acli
 # NOTE: (09��14��13腱� EST) wing: what does "Other Contacts" (msn/group.h:36) actually mean? ..
 # NOTE: (09��24��18腱� EST) khc: I'd probably just translate to �銀�篋�, hehe
@@ -5679,7 +5669,7 @@
 
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
-msgstr "%s 絨������種�<a href='msn-wink://%s'>茫�藥�����茖���冗������篏�</a>"
+msgstr "%s 絨������種�<a href='msn-wink://%s'>茫�藥�����茖≧�㊥�冗������篏�</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
@@ -5687,7 +5677,7 @@
 
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
-msgstr "%s ��箴�篋�筝�罧笈��括��罧居�<a href='audio://%s'>茫�藥�����茖����</a>"
+msgstr "%s ��箴�篋�筝�罧笈��括��罧居�<a href='audio://%s'>茫�藥�����茖≧�㊥��</a>"
 
 #, c-format
 msgid "%s sent a voice clip, but it could not be saved"
@@ -5718,8 +5708,8 @@
 msgid "Set friendly name for %s."
 msgstr "荐㊤� %s ���援┗��"
 
-msgid "Set your friendly name."
-msgstr "荐㊤������援┗��"
+msgid "Set Friendly Name"
+msgstr "荐㊤��援┗"
 
 # NOTE MSN���援┗筝���Yahoo鐚�篏睡������札莠後�ヤ算篏����井�援┗鐚�
 # NOTE �割戎��篏睡������絽活��罸��♂��篆�鐚�篌寂�箙���������
@@ -5727,6 +5717,18 @@
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�ヤ査�� MSN �ラ�掩������篋肴�����蕁�ず�����援┗��"
 
+msgid "This Location"
+msgstr "���������臀�"
+
+msgid "This is the name that identifies this location"
+msgstr "�����������臀��篁ラ������腮延撮茵�"
+
+msgid "Other Locations"
+msgstr "�銀������臀�"
+
+msgid "You can sign out from other locations here"
+msgstr "�������茖∞�糸�阪�銀������臀�"
+
 msgid "Set your home phone number."
 msgstr "荐㊤�����篏鎘狗�肢���腆若��"
 
@@ -5780,7 +5782,7 @@
 msgstr "罩e��轡篏�"
 
 msgid "Has you"
-msgstr "篏����鐚�絅刻���絅遵�羝����"
+msgstr "篏����鐚�絅刻���絅遵�羝����"
 
 msgid "Home Phone Number"
 msgstr "篏鎘狗�肢���腆�"
@@ -5813,6 +5815,9 @@
 msgid "Set Friendly Name..."
 msgstr "荐㊤��援┗..."
 
+msgid "View Locations..."
+msgstr "罟∵������臀�..."
+
 msgid "Set Home Phone Number..."
 msgstr "荐㊤�篏鎘狗�肢���腆�..."
 
@@ -6293,7 +6298,7 @@
 msgstr "�贋�医��篋肴���"
 
 msgid "Here you can update your MXit profile"
-msgstr "���札����茖�吚�井���� MXit ����篋肴���"
+msgstr "���札����茖≧�贋�井���� MXit ����篋肴���"
 
 msgid "View Splash"
 msgstr "罟∵���������"
@@ -7218,6 +7223,11 @@
 "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
 "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
+msgid ""
+"You required encryption in your account settings, but one of the servers "
+"doesn't support it."
+msgstr "����験��荐㊤�筝㊥��絎�篋�篏睡����絲�鐚�篏��銀賢筝���篌堺�������吓��絲����純��"
+
 # NOTE �����荀�羆� %s��絅遵���鋋��� - acli 20090902
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
@@ -7231,7 +7241,7 @@
 msgstr "篌堺����;腓榊�糸�ュ��綽���絎�������薊�茘�鐚�篏������句�絨�����吓����薊�茘���"
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr "AOL 筝���荐掩����絽活������茖�嶃��"
+msgstr "AOL 筝���荐掩����絽活������茖∞�糸��"
 
 # NOTE �����荀�羆� %s��絅遵���鋋��� - acli 20090902
 #, c-format
@@ -7536,6 +7546,11 @@
 "�≧�篁� %s 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽����堺�����脂�球�医��鐚�����篁ヨ�掩��"
 "絖�罸�莎桁�鐚�筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����"
 
+msgid ""
+"You required encryption in your account settings, but encryption is not "
+"supported by your system."
+msgstr "����験��荐㊤�筝㊥��絎�篋�篏睡����絲�鐚�篏�����膤紫輝筝���吓��絲����純��"
+
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr "����醇�����㊥�����т賢�潔�g���絋���絮��鐚�茫��� %s ������羃����贋�違��"
@@ -8025,13 +8040,11 @@
 msgid "Set Privacy Options..."
 msgstr "荐㊤��援��檎��..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "����"
-
-#, fuzzy
+msgstr "蕁�ず���援┗筝�膩���羝���"
+
 msgid "Show Invisible List"
-msgstr "��茫�羝���"
+msgstr "蕁�ず���援┗�∝���羝���"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -8049,6 +8062,9 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "篏睡���糸��灸散�医����絨�絅遵�..."
 
+msgid "Don't use encryption"
+msgstr "筝�篏睡����絲�"
+
 msgid "Use clientLogin"
 msgstr "篏睡�� clientLogin"
 
@@ -8264,10 +8280,9 @@
 msgid "Buddy Comment"
 msgstr "絅遵���荐�"
 
-#  NOTE Connection security �檎��鐚�����失������吡����羈�筝�篏睡�� TLS, 絋�篌堺�������� TLS ��鋌ヤ���絲����劫�膵主��画��g�
-#, fuzzy, c-format
+#, c-format
 msgid "User information not available: %s"
-msgstr "�銀失������吚��鐚�篏睡����絲�����"
+msgstr "�鞘��遺戎����莖�荐�鐚�%s"
 
 msgid "Mobile Phone"
 msgstr "茵����肢�"
@@ -8276,7 +8291,7 @@
 msgstr "��篋榊恐��"
 
 #. aim_userinfo_t
-#. strip_html_tags
+#. use_html_status
 msgid "Additional Information"
 msgstr "�銀�莖�荐�"
 
@@ -8305,48 +8320,61 @@
 msgid "Capabilities"
 msgstr "�後���"
 
-#. 4 separate strings are needed in order to ease translators' job
+#  NOTE ������絖�筝峨�� Oscar (ICQ) ��茹i����④鐚�http://pidgin.im/pipermail/translators/2010-November/000554.html
+#  NOTE Oscar: ��絅遵��医��� Visible List ��
+#  NOTE Yahoo: �����冴���沿昆����鐚�絨�����絎���絅遵��援┗筝�膩�
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear online to the chosen user even when your status is set to
+#. Invisible.
 msgid "Appear Online"
 msgstr "�援┗筝�膩�"
 
-#, fuzzy
+#  NOTE ��絅遵�緇� Visible List �хЩ��
+#  NOTE ���� "Don't Appear Permanently Offline"
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user when your status is set to
+#. Invisible (this is the default).
 msgid "Don't Appear Online"
-msgstr "�援┗筝�膩�"
-
-# NOTE 筝�罨∞�糸�ユ��筝��援┗�∝�鐚���篁ュ����������絖���
+msgstr "��罩√�援┗筝�膩�"
+
+#  NOTE Oscar: ��絅遵��医��� Invisible List ��
+#  NOTE Yahoo: �����冴���沿昆����鐚�絨�����絎���絅遵��援┗�∝�
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to always appear offline to the chosen user (even when your status
+#. isn't Invisible).
 msgid "Appear Offline"
-msgstr "�����援┗�∝�"
-
-# NOTE 筝�罨∞�糸�ユ��筝��援┗�∝�鐚���篁ュ����������絖���
-#, fuzzy
+msgstr "�援┗�∝�"
+
+#  NOTE ��絅遵�緇� Invisible List �хЩ��
+#  NOTE ���� "Don't Appear Permanently Offline"
+#. Translators: This string is a menu option that, if selected, will cause
+#. you to appear offline to the chosen user if you are invisible, and
+#. appear online to the chosen user if you are not invisible (this is the
+#. default).
 msgid "Don't Appear Offline"
-msgstr "�����援┗�∝�"
-
-#, fuzzy
+msgstr "��罩√�援┗�∝�"
+
 msgid "you have no buddies on this list"
-msgstr "��群膓�緇�MultiMX筝㊧←荼√�冴��"
-
-#, fuzzy, c-format
+msgstr "��羝����ф���絅遵�"
+
+#, c-format
 msgid ""
 "You can add a buddy to this list by right-clicking on them and selecting \"%s"
 "\""
 msgstr ""
-"���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��"
-"��荀�羆����域�茘�����"
-
-#, fuzzy
+"��絅遵��医�����羝����э������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御����%s��"
+
 msgid "Visible List"
-msgstr "����"
+msgstr "���援┗筝�膩���羝���"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
-msgstr ""
-
-#, fuzzy
+msgstr "��篋�絅遵������沿昆��篁��順��荀�����筝�膩�����"
+
 msgid "Invisible List"
-msgstr "��茫�羝���"
+msgstr "���援┗�∝���羝���"
 
 msgid "These buddies will always see you as offline"
-msgstr ""
+msgstr "�傑��������篋�絅遵��沿昆"
 
 msgid "Aquarius"
 msgstr "羂雁Г綺�"
@@ -8424,7 +8452,7 @@
 msgstr "�銀�"
 
 msgid "Visible"
-msgstr "����"
+msgstr "筝��沿昆"
 
 # XXX ��⑮ - 20090226
 msgid "Friend Only"
@@ -10792,6 +10820,7 @@
 msgstr "筝���失�������羝���賢"
 
 # NOTE Yahoo 絎��壕⑮��羂檎��蕁�ず�∝���鐚�茯��巡�藥��九��恰�����絨���篋削����傑����荳���
+#  NOTE ���� "Appear Offline"
 msgid "Appear Permanently Offline"
 msgstr "�傑���援┗�∝�"
 
@@ -10799,6 +10828,7 @@
 msgstr "�丞��"
 
 #  NOTE ��������х��筝�����篁�
+#  NOTE ���� "Don't Appear Offline"
 msgid "Don't Appear Permanently Offline"
 msgstr "��罩∫�傑���援┗�∝�"
 
@@ -12773,6 +12803,11 @@
 msgid "Lao"
 msgstr "絲�����"
 
+#  NOTE 篁g⊆ mai鐚��医墾��筝�腮��壕�鐚�膓㊤�榊�丞�茘������������
+#  XXX �鞘��井③綣���佂�h⑮��鐚����� http://zh.wikipedia.org/zh/菴������, http://tc.wangchao.net.cn/baike/detail_2071696.html
+msgid "Maithili"
+msgstr "��������"
+
 #  NOTE��薤��狗���������腮��掩�茯���鐚�莊�絽�����薤��狗��筝��♂��篆�
 msgid "Macedonian"
 msgstr "薤��狗����"
@@ -12951,7 +12986,7 @@
 "絋���絽����峨�<font size=\"4\">�銀� Pidgin 篏睡������箴������</font>�����脂�笈��<a "
 "href=\"mailto:support@pidgin.im\">support@pidgin.im</a>��<br/>������<b>������"
 "</b>�灸散茫�紕�鐚�鐚�<a href=\"http://pidgin.im/pipermail/support/\">茫�紕�絖�罟�茫�藥�"
-"����茖�</a>鐚�<br/>���紕���筝��榊�筝������主��罔∞�鐚�������荐���絎�罔∞�鐚���箴�篁私���"
+"����茖�</a>鐚�<br/>���紕���筝��榊�筝������主��罔∞�鐚�������荐���絎�罔∞�鐚���箴�篁私���"
 "�器�<br/>�弱�茫�篁�<b>�掩��</b>�坂源鐚�篁ヤ賢�����銀�茯����弱�篋���篏��九�亥����荀����"
 "������<br/>"
 
@@ -14685,7 +14720,7 @@
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
 msgstr ""
-"�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n"
+"�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n"
 "��腟����緇����取���鐚�腥�����紊����冴��������鐚����榊�倶��絲���\n"
 "篏睡����絅遵�絽活����\n"
 
@@ -15963,6 +15998,19 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "�����罨���腱脂�ょ�綣��"
 
+#~ msgid "An error occurred on the in-band bytestream transfer\n"
+#~ msgstr "鎵九�т���腟�羌��活叱��筝㊦�主�����\n"
+
+# XXX �����頑⑮��茴�������鐚� 20090305 acli
+#~ msgid "Transfer was closed."
+#~ msgstr "�活叱綏画←筝㊥②��"
+
+#~ msgid "Failed to open in-band bytestream"
+#~ msgstr "�≧�����絽九�т���腟�羌�"
+
+#~ msgid "Set your friendly name."
+#~ msgstr "荐㊤������援┗��"
+
 #~ msgid "The certificate has expired and should not be considered valid."
 #~ msgstr "��綣究��茘�綏臥�丈��鐚���荀�篏��≧����"