pidgin: bd1da348: Updated Chinese (Hong Kong and Tradition...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Mon Feb 15 21:40:35 EST 2010 

-----------------------------------------------------------------
Revision: bd1da3489eef317a805524eef94fd4e08719159b
Ancestor: 65f082f9eed3753e9ab3457861c2118f840d9cd1
Author: darkrain42 at pidgin.im
Date: 2010-02-16T02:34:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bd1da3489eef317a805524eef94fd4e08719159b

Modified files:
        po/ChangeLog po/sk.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

Updated Chinese (Hong Kong and Traditional) and Slovak translations.

Closes #11377, #11378.

-------------- next part --------------
============================================================
--- po/ChangeLog	024e49fe3c0e57b90530f349e6205e9f6fc85948
+++ po/ChangeLog	691b195c29f386f3d110e9ad053c3ffc6559cb56
@@ -4,7 +4,10 @@ version 2.6.6
 	* Afrikaans translation updated (Friedel Wolff)
 	* Albanian translation updated (Besnik Bleta)
 	* Bengali translation updated (Jamil Ahmed)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R. Liu)
 	* Chinese (Simplified) translation updated (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
 	* Czech translation updated (David Vachulka)
 	* French translation updated (?ric Boumaour)
 	* German translation updated (Bj?rn Voigt and Jochen Kemnade)
@@ -20,6 +23,7 @@ version 2.6.6
 	* Polish win32 installer updated (Piotr Dr?g)
 	* Punjabi translation updated (Amanpreet Singh Alam)
 	* Russian translation updated (????? ??????????)
+	* Slovak translation updated (loptosko)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Spanish translation updated (Francisco Javier F. Serrador)
 	* Tamil translation updated (I. Felix)
============================================================
--- po/sk.po	6dbe092218a08769fa06fa821f7d4571926d07c5
+++ po/sk.po	85e81f571953ad916be84783a35315c9857d4bf5
@@ -1,7 +1,7 @@
 # translation of pidgin.po to Slovak
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Pidgin package.
-# loptosko <loptosko at gmail.com>, 2007, 2008, 2009.
+# loptosko <loptosko at gmail.com>, 2007, 2008, 2009, 2010.
 # Jozef K??er <quickparser at gmail.com>, 2007.
 # Ivan Mas?r <helix84 at centrum.sk>, 2007.
 # Pavol Kla?ansk? <pavolzetor at gmail.com>, 2008.
@@ -11,8 +11,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2009-09-03 14:47+0100\n"
+"POT-Creation-Date: 2010-02-15 18:31-0800\n"
+"PO-Revision-Date: 2010-02-15 21:06+0100\n"
 "Last-Translator: loptosko <loptosko at gmail.com>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -635,9 +635,8 @@ msgstr "Zapn?? zvuky"
 msgid "Enable Sounds"
 msgstr "Zapn?? zvuky"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Nepodarilo sa pripoji?"
+msgstr "Nie ste pripojen?."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMATICK? ODPOVE?> "
@@ -649,9 +648,8 @@ msgstr[2] "Zoznam %d pou??vate?ov:\n"
 msgstr[1] "Zoznam %d pou??vate?ov:\n"
 msgstr[2] "Zoznam %d pou??vate?ov:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Podporovan? ladiace vo?by s?:  version"
+msgstr "Podporovan? ladiace vo?by s?: plugins version"
 
 msgid "No such command (in this context)."
 msgstr "Tento pr?kaz neexistuje (v tejto situ?cii)."
@@ -1529,10 +1527,10 @@ msgid "TinyURL for above: %s"
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL pre vy??ie: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "?akajte, pros?m, k?m TinyURL z?ska krat?iu URL ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "TinyURL vytv?ra? iba pre adresy tejto d??ky alebo dlh?ie"
@@ -1552,6 +1550,7 @@ msgstr "Prihl?sen?"
 msgid "Online"
 msgstr "Prihl?sen?"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Odhl?sen?"
 
@@ -1661,6 +1660,8 @@ msgstr ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Certifik?t nie je d?verihodn?, preto?e ?iadny z certifik?tov, ktor? ho m??u "
+"overi?, moment?lne nie je d?verihodn?.  "
 
 msgid "The certificate is not valid yet."
 msgstr "Certifik?t zatia? nie je platn?."
@@ -1892,9 +1893,9 @@ msgstr "Proces resolvera bol ukon?en? 
 msgid "Resolver process exited without answering our request"
 msgstr "Proces resolvera bol ukon?en? bez toho, aby odpovedal na po?iadavku"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Chyba pri preklade %s: %d"
+msgstr "Chyba pri preklade %s na punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1941,6 +1942,9 @@ msgstr "%s nie je be?n? s?bor. Odmiet
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nie je be?n? s?bor. Odmietam ho prep?sa?.\n"
 
+msgid "File is not readable."
+msgstr "Nie je mo?n? ??ta? s?bor."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "Pou??vate? %s v?m chce posla? s?bor %s (%s)"
@@ -2203,17 +2207,14 @@ msgstr "Vyskytla sa z?va?n? chyba v F
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "Vyskytla sa z?va?n? chyba v Farsight2."
 
-#, fuzzy
 msgid "Conference error"
-msgstr "Chyba konferencie."
+msgstr "Chyba konferencie"
 
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "Chyba mikrof?nu."
+msgstr "Chyba mikrof?nu"
 
-#, fuzzy
 msgid "Error with your webcam"
-msgstr "Chyba webkamery."
+msgstr "Chyba webkamery"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3149,10 +3150,12 @@ msgstr "Prida? na chat..."
 msgid "Add to chat..."
 msgstr "Prida? na chat..."
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Prihl?sen?"
 
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3779,6 +3782,13 @@ msgstr "Server vy?aduje textov? autent
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server vy?aduje textov? autentifik?ciu cez neza?ifrovan? pr?d"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "Chybn? odpove? zo servera"
+
+msgid "Server does not use any supported authentication method"
+msgstr "Server nepou??va ?iadny z podporovan?ch sp?sobov autentifik?cie"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3790,25 +3800,34 @@ msgstr "?isto textov? autentifik?cia"
 msgid "Plaintext Authentication"
 msgstr "?isto textov? autentifik?cia"
 
-msgid "SASL authentication failed"
-msgstr "SASL autentifik?cia zlyhala"
-
-msgid "Invalid response from server"
-msgstr "Chybn? odpove? zo servera"
-
-msgid "Server does not use any supported authentication method"
-msgstr "Server nepou??va ?iadny z podporovan?ch sp?sobov autentifik?cie"
-
 msgid "You require encryption, but it is not available on this server."
 msgstr "Po?adovali ste ?ifrovanie, ale na tomto serveri nie je dostupn?."
 
 msgid "Invalid challenge from server"
 msgstr "Chybn? v?zva zo servera"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "Server pova?uje autentiz?ciu za dokon?en?, ale klient nie"
+
+msgid "SASL authentication failed"
+msgstr "SASL autentifik?cia zlyhala"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "Chyba SASL: %s"
 
+msgid "Unable to canonicalize username"
+msgstr "Nebolo mo?n? kanonikalizova? pou??vate?sk? meno"
+
+msgid "Unable to canonicalize password"
+msgstr "Nebolo mo?n? kanonikalizova? heslo"
+
+msgid "Malicious challenge from server"
+msgstr "Nebezpe?n? v?zva zo servera"
+
+msgid "Unexpected response from server"
+msgstr "Ne?akan? odpove? zo servera"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "Mana??r pripojen? BOSH preru?il va?e sedenie."
 
@@ -3909,13 +3928,16 @@ msgstr "Zdroj"
 msgid "Resource"
 msgstr "Zdroj"
 
-#, c-format
-msgid "%s ago"
-msgstr "%s dozadu"
+msgid "Uptime"
+msgstr "?as v prev?dzke"
 
 msgid "Logged Off"
 msgstr "Odhl?sen?"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s dozadu"
+
 msgid "Middle Name"
 msgstr "Prostredn? meno"
 
@@ -3964,12 +3986,14 @@ msgstr "Odhl?si?"
 msgid "Log Out"
 msgstr "Odhl?si?"
 
+#. 2
 msgid "Chatty"
 msgstr "Zhovor?iv?"
 
 msgid "Extended Away"
 msgstr "Dlh?ie nepr?tomn?"
 
+#. 3
 msgid "Do Not Disturb"
 msgstr "Neru?i?"
 
@@ -4104,12 +4128,6 @@ msgstr "Ping vypr?al"
 msgid "Ping timed out"
 msgstr "Ping vypr?al"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-"Neboli n?jden? in? met?dy XMPP spojenia po tom ?o zlyhalo priame spojenie."
-
 msgid "Invalid XMPP ID"
 msgstr "Chybn? XMPP ID"
 
@@ -4234,6 +4252,7 @@ msgstr "?iadny (?ak? sa)"
 msgid "None (To pending)"
 msgstr "?iadny (?ak? sa)"
 
+#. 0
 msgid "None"
 msgstr "?iadne"
 
@@ -4541,9 +4560,8 @@ msgstr "configure:  Nastavenie miestnost
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavenie miestnosti chatu."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [miestnos?]:  Opust? miestnos?."
+msgstr "part [spr?va]:  Opust? miestnos?."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Zaregistrova? sa v diskusnej miestnosti."
@@ -4663,6 +4681,9 @@ msgstr "(K?d %s)"
 msgid "(Code %s)"
 msgstr "(K?d %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "Vlastn? smajl?k v spr?ve je na odoslanie pr?li? ve?k?."
+
 msgid "XML Parse error"
 msgstr "Chyba pri spracovan? XML"
 
@@ -5071,6 +5092,10 @@ msgstr "Va?e nov? MSN priate?sk? men
 msgid "Your new MSN friendly name is too long."
 msgstr "Va?e nov? MSN priate?sk? meno je pr?li? dlh?."
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "Vypl?te priate?sk? meno pre %s."
+
 msgid "Set your friendly name."
 msgstr "Vypl?te va?e priate?sk? meno."
 
@@ -5203,13 +5228,13 @@ msgstr ""
 "Pre MSN je potrebn? podpora SSL. Nain?talujte, pros?m, podporovan? SSL "
 "kni?nicu."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"Nepodarilo sa prida? priate?a %s, preto?e pou??vate?sk? meno je chybn?.  "
-"Pou??vate?sk? men? musia by? spr?vna e-mailov? adresa."
+"Nepodarilo sa prida? priate?a %s preto?e pou??vate?sk? meno je chybn?.  "
+"Pou??vate?sk? men? musia by? platn? e-mailov? adresa."
 
 msgid "Unable to Add"
 msgstr "Nepodarilo sa prida?"
@@ -5432,9 +5457,8 @@ msgstr "Nezn?ma chyba (%d)"
 msgid "Unknown error (%d)"
 msgstr "Nezn?ma chyba (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Nebolo mo?n? prida? pou??vate?a"
+msgstr "Nebolo mo?n? odstr?ni? pou??vate?a"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiln? spr?va nebola odoslan?, preto?e bola pr?li? dlh?."
@@ -5670,28 +5694,82 @@ msgstr "Pou??vate? %s v?s odstr?nil
 msgid "%s has removed you from his or her buddy list."
 msgstr "Pou??vate? %s v?s odstr?nil zo svojho zoznamu priate?ov."
 
+#. 1
+msgid "Angry"
+msgstr "Nahnevan?"
+
+#. 2
+msgid "Excited"
+msgstr "Vzru?en?"
+
+#. 3
+msgid "Grumpy"
+msgstr "Urazen?"
+
+#. 4
+msgid "Happy"
+msgstr "??astn?"
+
+#. 5
+msgid "In Love"
+msgstr "Za??ben?"
+
+#. 6
+msgid "Invincible"
+msgstr "Neprekonate?n?"
+
+#. 7
+msgid "Sad"
+msgstr "Smutn?"
+
+#. 8
+msgid "Hot"
+msgstr "Hor??ava"
+
+#. 9
+msgid "Sick"
+msgstr "Chor?"
+
+#. 10
+msgid "Sleepy"
+msgstr "Ospal?"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Va?a aktu?lna n?lada"
+msgstr "Aktu?lna n?lada"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "N?lada pou??vate?a"
+msgstr "Nov? n?lada"
 
-#, fuzzy
 msgid "Change your Mood"
-msgstr "Zmeni? heslo"
+msgstr "Zmeni? va?u n?ladu"
 
-#, fuzzy
 msgid "How do you feel right now?"
-msgstr "Moment?lne nie som pr?tomn?"
+msgstr "Ako sa pr?ve c?tite?"
 
+msgid "The PIN you entered is invalid."
+msgstr "Zadan? PIN je neplatn?"
+
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Zadan? PIN m? chybn? d??ku [4-10]."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr "PIN je neplatn?. Mal by obsahova? iba ??slice [0-9]."
+
+msgid "The two PINs you entered do not match."
+msgstr "Dva PINy ktor? ste zadali sa nezhoduj?."
+
+msgid "The name you entered is invalid."
+msgstr "Zadan? meno je neplatn?"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr "Narodeniny s? zadan? chybne. Spr?vny form?t m? by?: 'RRRR-MM-DD'."
+
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Chyba z?pisu"
+msgstr "Chyba aktualiz?cie profilu"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5699,354 +5777,300 @@ msgid "Your profile information is not y
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "?daje z v??ho profilu nie s? na??tan?. Pros?m, sk?ste to znovu nesk?r."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Overi? PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Priezvisko"
+msgstr "Pou??vate?sk? meno"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Skry? moje ??slo"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Telef?nne ??slo na mobiln? telef?n"
+msgstr "??slo na mobiln? telef?n"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Profil pou??vate?a"
+msgstr "Aktualizova? v?? profil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Tu m??ete aktualizova? v?? MXit profil"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Zobrazi? ?vod"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Nie je dostupn? ?iadna ?vodn? obrazovka"
 
-#, fuzzy
 msgid "About"
-msgstr "O mne"
+msgstr "O module"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Zmeni? heslo..."
+msgstr "Zmeni? n?ladu..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Zmeni? heslo..."
+msgstr "Zmeni? profil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Zobrazi? z?znam..."
+msgstr "Zobrazi? ?vod..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "O mne"
+msgstr "O module..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Spr?va je pr?li? dlh?."
+msgstr "S?bor ktor? chcete posla? je pr?li? ve?k?!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Nepodarilo sa pripoji? na MXit HTTP server. Skontrolujte, pros?m, va?e "
+"nastavenie serveru."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Prihlasuje sa"
+msgstr "Prihlasuje sa..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Nepodarilo sa pripoji? na server. Zadajte, pros?m, adresu servera, na ktor? "
-"sa chcete pripoji?."
+"Nepodarilo sa pripoji? na MXit server. Skontrolujte, pros?m, va?e nastavenie "
+"serveru."
 
-#, fuzzy
 msgid "Connecting..."
-msgstr "Prip?ja sa"
+msgstr "Prip?ja sa..."
 
+msgid "The nick name you entered is invalid."
+msgstr "Zadan? prez?vka je neplatn?."
+
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Zadan? PIN m? neplatn? d??ku [7-10]."
+
 #. mxit login name
 msgid "MXit Login Name"
-msgstr ""
+msgstr "MXit prihlasovacie meno"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Prez?vka"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrova? nov? XMPP ??et"
+msgstr "Registrova? nov? MXit ??et"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Pros?m, vypl?te nasleduj?ce pol??ka"
+msgstr "Pros?m, vypl?te nasleduj?ce pol??ka:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Chyba kontaktovania MXit WAP str?nky. Pros?m, sk?ste to znovu nesk?r."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit moment?lne nedok??e spracova? po?iadavku. Pros?m, sk?ste to znovu "
+"nesk?r."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Zadan? nespr?vny bezpe?nostn? k?d. Pros?m, sk?ste to znovu nesk?r."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Va?e prihl?senie vypr?alo. Pros?m, sk?ste to znovu nesk?r."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Vybran? chybn? krajina. Pros?m, sk?ste to znovu nesk?r."
 
 msgid "Username is not registered. Please register first."
 msgstr ""
+"Pou??vate?sk? meno nie je registrovan?. Pros?m, najsk?r sa zaregistrujte."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
+msgstr "Pou??vate?sk? meno u? je registrovan?. Pros?m, vyberte si in?."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "Server je nedostupn?; sk?ste to nesk?r"
+msgstr "Vn?torn? chyba. Pros?m, sk?ste to znovu nesk?r."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Nezadali ste bezpe?nostn? k?d"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Bezpe?nos? zapnut?"
+msgstr "Bezpe?nostn? k?d"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Zadajte k?d"
+msgstr "Zadajte bezpe?nostn? k?d"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Krajina"
+msgstr "Va?a krajina"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "Preferovan? jazyk"
+msgstr "V?? jazyk"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Vy?adova? autoriz?ciu"
+msgstr "MXit autoriz?cia"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "Overenie MXit ??tu"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Podrobnosti o serveri"
+msgstr "Na??tavaj? sa pou??vate?sk? inform?cie..."
 
-#, fuzzy
+msgid "Loading menu..."
+msgstr "Na??tava sa ponuka..."
+
 msgid "Status Message"
-msgstr "Odoslan? spr?vy"
+msgstr "Spr?va statusu"
 
-#, fuzzy
 msgid "Hidden Number"
-msgstr "Prostredn? meno"
+msgstr "Skryt? ??slo"
 
-#, fuzzy
 msgid "Your Mobile Number..."
-msgstr "Nastavi? ??slo mobiln?ho telef?nu..."
+msgstr "Va?e mobiln? ??slo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
+msgstr "WAP server"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Pripoji? sa pomocou TCP"
+msgstr "Pripoji? sa cez HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Zapn?? ?vodn? vyskakovaciu obrazovku"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "Stratili sme pripojenie na MXit. Pros?m, pripojte sa znovu."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Chyba spr?vy XMPP"
+msgstr "Chyba odoslania spr?vy"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Nepodarilo sa prelo?i? meno hostite?a"
+msgstr "Nepodarilo sa teraz spracova? va?u po?iadavku"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Vypr?al ?as pri ?akan? na odpove? z MXit serveru."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Podarilo sa pripoji? do Qun"
+msgstr "?spe?ne prihl?sen?..."
 
-#, fuzzy
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s v?m poslal za?ifrovan? spr?vu ale tento klient to nepodporuje."
+
 msgid "Message Error"
-msgstr "Chyba spr?vy XMPP"
+msgstr "Chyba spr?vy"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Nebolo mo?n? vykona? presmerovanie pomocou zadan?ho protokolu"
 
-#, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Vyskytla sa vn?torn? chyba MXit serveru."
+
+#, c-format
+msgid "Login error: %s (%i)"
+msgstr "Chyba prihl?senia: %s (%i)"
+
+#, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Chyba odhl?senia: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Chyba pripojenia"
+msgstr "Chyba kontaktu"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "Chyba spr?vy XMPP"
+msgstr "Chyba odoslania spr?vy"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Chyba pr?du"
+msgstr "Chyba stavu"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Chyba ikony"
+msgstr "Chyba n?lady"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Chyba pri ru?en? registr?cie"
+msgstr "Chyba pozv?nky"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Chyba pripojenia"
+msgstr "Chyba odstr?nenia kontaktu"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Prihl?senie"
+msgstr "Chyba zap?sania"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Chyba pripojenia"
+msgstr "Chyba aktualiz?cie kontaktu"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Prenos s?borov"
+msgstr "Chyba prenosu s?boru"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "Nebolo mo?n? vytvori? sledovanie"
+msgstr "Nebolo mo?n? vytvori? MultiMx miestnos?"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Chyba pri ru?en? registr?cie"
+msgstr "Chyba pozv?nky MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Chyba z?pisu"
+msgstr "Chyba profilu"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Prijat? chybn? paket z MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (?t?dium ??tania 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (?t?dium ??tania 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (?t?dium ??tania 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (?t?dium ??tania 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (?t?dium ??tania 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
+msgstr "Na MXit sa vyskytla chyba pripojenia. (?t?dium ??tania 0x06)"
 
-msgid "Angry"
-msgstr "Nahnevan?"
-
-msgid "Excited"
-msgstr "Vzru?en?"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Skupina"
-
-msgid "Happy"
-msgstr "??astn?"
-
-msgid "In Love"
-msgstr "Za??ben?"
-
-msgid "Invincible"
-msgstr "Neprekonate?n?"
-
-msgid "Sad"
-msgstr "Smutn?"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Hostite?:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Prez?vka"
-
-msgid "Sleepy"
-msgstr "Ospal?"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Odosiela sa"
+msgstr "?ak? sa"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Pozva?"
+msgstr "Pozvan?"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Odmietnu?"
+msgstr "Odmietnut?"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Odstr?ni?"
+msgstr "Odstr?nen?"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit reklama"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Pracovn? inform?cie"
+msgstr "Viac inform?ci?"
 
 #, c-format
 msgid "No such user: %s"
@@ -6660,8 +6684,11 @@ msgstr "Port servera"
 msgid "Server port"
 msgstr "Port servera"
 
-#. Note to translators: %s in this string is a URL
 #, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Bola prijat? neo?ak?van? odpove? od %s: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
 msgstr "Bola prijat? neo?ak?van? odpove? od %s"
 
@@ -6678,6 +6705,13 @@ msgstr "Chyba pri po?adovan? %s: %s"
 msgid "Error requesting %s: %s"
 msgstr "Chyba pri po?adovan? %s: %s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+"Server pre prihl?senie vy?aduje, aby ste vyp?sali CAPTCHAg, ale tento klient "
+"nepodporuje CAPTCHA."
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL neumo??uje v??mu pou??vate?sk?mu menu sa tu autentifikova?"
 
@@ -6826,46 +6860,42 @@ msgid "Cannot receive IM due to parental
 msgstr "Nie, pok?m ste na AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Nie je mo?n? prija? spr?vu kv?li rodi?ovsk?m obmedzeniam"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgstr "Nie je mo?n? posla? SMS bez ods?hlasenia podmienok"
 
-#, fuzzy
 msgid "Cannot send SMS"
-msgstr "Nepodarilo sa odosla? s?bor"
+msgstr "Nepodarilo sa posla? SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Nie je mo?n? odosla? prie?inok."
+msgstr "Nie je mo?n? posla? SMS do tejto krajiny."
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Ned? sa odosla? SMS do nezn?mej krajiny"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "??ty robotov nem??u zaklada? rozhovory"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "??et robota nem??e komunikova? s t?mto pou??vate?om"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "??et robota dosiahol limit komunik?cie"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "??et robota dosiahol denn? limit komunik?cie"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgstr "??et robota dosiahol mesa?n? limit komunik?cie"
 
-#, fuzzy
 msgid "Unable to receive offline messages"
-msgstr "Nepodarilo sa odosla? spr?vu."
+msgstr "Nepodarilo sa prija? offline spr?vy."
 
-#, fuzzy
 msgid "Offline message store full"
-msgstr "Offline spr?va"
+msgstr "?lo?isko offline spr?v je pln?"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -7034,14 +7064,14 @@ msgstr "Slu?ba AOL je do?asne nedostup
 msgstr "Slu?ba AOL je do?asne nedostupn?."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Prip?jali a odp?jali ste sa pr?li? ?asto. Po?kajte desa? min?t a sk?ste "
-"znova. Ak budete i na?alej sk??a?, budete musie? ?aka? este dlh?ie."
+"Va?e prihlasovacie meno sa prip?jalo a odp?jalo pr?li? ?asto. Po?kajte desa? "
+"min?t a sk?ste to znovu. Ak budete pokra?ova?, budete musie? ?aka? este "
+"dlh?ie."
 
 #. client too old
 #, c-format
@@ -7051,14 +7081,13 @@ msgstr ""
 "na %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Prip?jali a odp?jali ste sa pr?li? ?asto. Po?kajte min?tu a sk?ste to znova. "
-"Ak budete pokra?ova?, budete musie? ?aka? este dlh?ie."
+"Va?a IP adresa sa prip?jala a odp?jala pr?li? ?asto. Po?kajte min?tu a "
+"sk?ste to znovu. Ak budete pokra?ova?, budete musie? ?aka? este dlh?ie."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Zadan? k??? SecurID je neplatn?"
@@ -7206,21 +7235,21 @@ msgstr[2] "Z nezn?meho d?vodu ste pri? msgstr[1] "Z nezn?meho d?vodu ste pri?li o %hu spr?vu od pou??vate?a %s."
 msgstr[2] "Z nezn?meho d?vodu ste pri?li o %hu spr?vy od pou??vate?a %s."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Nepodarilo sa odosla? spr?vu (%s)."
+msgstr "Nepodarilo sa odosla? spr?vu: %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Nem??em odosla? spr?vu: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nem??em posla? spr?vu k %s:"
+msgstr "Nem??em posla? spr?vu k %s: %s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "Nem??em posla? spr?vu k %s:"
+msgstr "Nem??em posla? spr?vu k %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7249,14 +7278,6 @@ msgstr ""
 "[Spr?va od pou??vate?a obsahovala nespr?vne znaky, preto ju nebolo mo?n? "
 "zobrazi?.]"
 
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"Akciu nebolo mo?n? vykona?, preto?e ste prekro?ili limit hodnotenia. Pros?m, "
-"po?kajte 10 sek?nd a sk?ste to znovu."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Boli ste odpojen? z miestnosti %s."
@@ -10100,13 +10121,13 @@ msgid "Can't send SMS. Unable to obtain 
 msgstr "Otvori? schr?nku Doru?en?"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Ned? sa posla? SMS. Nebolo mo?n? z?ska? mobiln?ho oper?tora."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Ned? sa posla? SMS. Nezn?my mobiln? oper?tor."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Zis?uje sa oper?tor na poslanie SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10654,6 +10675,7 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chat cez IM.  Podporuje AIM, Google Talk, Jabber/XMPP, MSN, Yahoo a ?al?ie"
 
 msgid "Internet Messenger"
 msgstr "Internetov? komunik?tor"
@@ -11913,15 +11935,18 @@ msgstr "lao?tina"
 msgid "Lao"
 msgstr "lao?tina"
 
-msgid "Lithuanian"
-msgstr "litov?ina"
-
 msgid "Macedonian"
 msgstr "maced?n?ina"
 
 msgid "Mongolian"
 msgstr "mongol?ina"
 
+msgid "Marathi"
+msgstr "mar?th?ina"
+
+msgid "Malay"
+msgstr "malaj?ina"
+
 msgid "Bokm?l Norwegian"
 msgstr "n?rsky bokm?l"
 
@@ -11937,6 +11962,9 @@ msgstr "okcit?n?ina"
 msgid "Occitan"
 msgstr "okcit?n?ina"
 
+msgid "Oriya"
+msgstr "ur?j?ina"
+
 msgid "Punjabi"
 msgstr "pand??b?ina"
 
@@ -11991,6 +12019,9 @@ msgstr "ture?tina"
 msgid "Turkish"
 msgstr "ture?tina"
 
+msgid "Ukranian"
+msgstr "ukrajin?ina"
+
 msgid "Urdu"
 msgstr "urd?ina"
 
@@ -12012,6 +12043,9 @@ msgstr "amhar?ina"
 msgid "Amharic"
 msgstr "amhar?ina"
 
+msgid "Lithuanian"
+msgstr "litov?ina"
+
 #, c-format
 msgid "About %s"
 msgstr "O programe %s"
@@ -12619,7 +12653,7 @@ msgid "DIR"
 msgstr "Pou?itie: %s [VO?BA]...\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "ADR"
 
 msgid "use DIR for config files"
 msgstr "pre konfigura?n? s?bory pou?ije ADR"
@@ -12640,16 +12674,16 @@ msgid "NAME"
 msgstr "neprihlasova? automaticky"
 
 msgid "NAME"
-msgstr ""
+msgstr "MENO"
 
-#, fuzzy
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
 "                      specifies account(s) to use, separated by commas.\n"
 "                      Without this only the first account will be enabled)."
 msgstr ""
 "povoli? vybran? ??ty (volite?n? argument MENO\n"
-"                      ur?uje ??ty, odde?ovan? ?iarkami"
+"                      ur?uje ??ty, odde?ovan? ?iarkami\n"
+"                      Bez toho bude povolen? iba prv? ??et)."
 
 msgid "X display to use"
 msgstr "X obrazovka, ktor? pou?i?"
@@ -12912,21 +12946,19 @@ msgid "(Custom)"
 msgstr "Nezn?me... Ozn?mte to, pros?m!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Vlastn?)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(predvolen?)"
+msgid "Penguin Pimps"
+msgstr "Autori Pidginu"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "?tandardn? zvukov? t?ma programu Pidgin"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Editor t?my zoznamu priate?ov programu Pidgin"
+msgstr "?tandardn? t?ma zoznamu priate?ov programu Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "?tandardn? t?ma stavov?ch ikon programu Pidgin"
 
 msgid "Theme failed to unpack."
 msgstr "Nepodarilo sa rozbali? t?mu."
@@ -12937,30 +12969,37 @@ msgstr "Nepodarilo sa skop?rova? t?mu
 msgid "Theme failed to copy."
 msgstr "Nepodarilo sa skop?rova? t?mu."
 
-msgid "Install Theme"
-msgstr "In?talova? t?mu"
+msgid "Theme Selections"
+msgstr "V?ber t?my"
 
+#. Instructions
 msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
-"Z nasleduj?ceho zoznamu vyberte t?mu smajl?kov, ktor? chcete pou??va?. Nov? "
-"t?my je mo?n? nain?talova? pridan?m t?my do tohto zoznamu met?dou ,,?ahaj a "
-"pus?"."
+"Z nasleduj?ceho zoznamu vyberte t?mu smajl?kov, ktor? chcete pou??va?.\n"
+"Nov? t?my je mo?n? nain?talova? pridan?m t?my do tohto zoznamu met?dou "
+",,?ahaj a pus?"."
 
-msgid "Icon"
-msgstr "Ikona"
+msgid "Buddy List Theme:"
+msgstr "T?ma zoznamu priate?ov:"
 
+msgid "Status Icon Theme:"
+msgstr "Ikony statusu:"
+
+msgid "Sound Theme:"
+msgstr "Zvukov? t?ma:"
+
+msgid "Smiley Theme:"
+msgstr "T?ma smajl?kov:"
+
 msgid "Keyboard Shortcuts"
 msgstr "Kl?vesov? skratky"
 
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Z_avrie? rozhovory kl?vesom Esc"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "T?ma zoznamu priate?ov"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Ikona v oznamovacej oblasti"
@@ -13047,9 +13086,6 @@ msgstr "P?smo"
 msgid "Font"
 msgstr "P?smo"
 
-msgid "Use document font from _theme"
-msgstr "Pou?i? p?smo dokumentov _t?my"
-
 msgid "Use font from _theme"
 msgstr "Pou?i? p?smo _t?my"
 
@@ -13072,15 +13108,13 @@ msgstr "Nebolo mo?n? spusti? program 
 msgid "Cannot start browser configuration program."
 msgstr "Nebolo mo?n? spusti? program na nastavenie prehliada?a."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Vypn??"
+msgstr "Vypnut?"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Pou?i? _automaticky zisten? IP adresu: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "ST_UN server:"
 
@@ -13096,79 +13130,28 @@ msgstr "Povoli? _automatick? presmerov
 msgid "_Enable automatic router port forwarding"
 msgstr "Povoli? _automatick? presmerovanie portu routeru"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "_Ru?ne ur?i? rozsah portov, na ktor?ch po??va?"
+msgstr "_Manu?lne zada? rozsah portov, na ktor?ch na??va?:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Status:"
+msgstr "?_tart:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Rozbali?"
+msgstr "_Koniec:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Relay Server (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN server:"
+msgstr "_TURN server:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "Pou??vate?sk? meno:"
+msgstr "_Pou??vate?sk? meno:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Heslo:"
+msgstr "_Heslo:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy server a prehliada?"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Program na nastavenie proxy nebol n?jden?.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Program na nastavenie prehliada?a nebol n?jden?.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Predvo?by proxy a prehliada?a sa daj? nastavi?\n"
-"v predvo?b?ch prostredia GNOME"
-
-msgid "Configure _Proxy"
-msgstr "Nastavi? _Proxy"
-
-msgid "Configure _Browser"
-msgstr "Nastavi? _Prehliada?"
-
-msgid "Proxy Server"
-msgstr "Proxy server"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Pou?i? vzdialen? DNS s proxy SOCKS 4"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Typ proxy:"
-
-msgid "No proxy"
-msgstr "Bez proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Pou??vate?sk? meno:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13208,6 +13191,15 @@ msgstr "V?ber prehliada?a"
 msgid "Browser Selection"
 msgstr "V?ber prehliada?a"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Predvo?by prehliada?a sa nastavuj? v predvo?b?ch prostredia GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Program na nastavenie prehliada?a nebol n?jden?.</b>"
+
+msgid "Configure _Browser"
+msgstr "Nastavi? _Prehliada?"
+
 msgid "_Browser:"
 msgstr "_Prehliada?:"
 
@@ -13231,6 +13223,35 @@ msgstr ""
 "_Ru?ne:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Predvo?by proxy sa nastavuj? v predvo?b?ch prostredia GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Program na nastavenie proxy nebol n?jden?.</b>"
+
+msgid "Configure _Proxy"
+msgstr "Nastavi? _Proxy"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Pou?i? vzdialen? _DNS s proxy SOCKS 4"
+
+msgid "Proxy t_ype:"
+msgstr "T_yp proxy:"
+
+msgid "No proxy"
+msgstr "Bez proxy"
+
+msgid "P_ort:"
+msgstr "P_ort:"
+
+msgid "User_name:"
+msgstr "Pou??vate?sk? me_no:"
+
 msgid "Log _format:"
 msgstr "_Form?t z?znamu:"
 
@@ -13314,25 +13335,18 @@ msgstr "Pod?a vyu?itia kl?vesnice ale
 msgid "Based on keyboard or mouse use"
 msgstr "Pod?a vyu?itia kl?vesnice alebo my?i"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Po?et min?t pred ne?innos?ou:"
+
+msgid "Change to this status when _idle:"
+msgstr "Prepn?? na tento status pri _ne?innosti:"
+
 msgid "_Auto-reply:"
 msgstr "_Automatick? odpove?:"
 
 msgid "When both away and idle"
 msgstr "Pri nepr?tomnosti a ne?innosti"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatick? nepr?tomnos?"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Po?et min?t pred ne?innos?ou:"
-
-msgid "Change status when _idle"
-msgstr "Zmeni? status pri _ne?innosti"
-
-msgid "Change _status to:"
-msgstr "Zmeni? _status na:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Status pri spusten?"
@@ -13346,15 +13360,15 @@ msgstr "Rozhranie"
 msgid "Interface"
 msgstr "Rozhranie"
 
-msgid "Smiley Themes"
-msgstr "T?my smajl?kov"
-
 msgid "Browser"
 msgstr "Prehliada?"
 
 msgid "Status / Idle"
 msgstr "Status / ne?inn?"
 
+msgid "Themes"
+msgstr "T?my"
+
 msgid "Allow all users to contact me"
 msgstr "Povoli? v?etk?m pou??vate?om kontaktova? ma"
 
@@ -13660,6 +13674,9 @@ msgstr "_Ulo?i? s?bor"
 msgid "_Save File"
 msgstr "_Ulo?i? s?bor"
 
+msgid "Do you really want to clear?"
+msgstr "Naozaj chcete vypr?zdni??"
+
 msgid "Select color"
 msgstr "Vyberte farbu"
 
@@ -13698,9 +13715,6 @@ msgstr "Smajl?ci programu Pidgin"
 msgid "Pidgin smileys"
 msgstr "Smajl?ci programu Pidgin"
 
-msgid "Penguin Pimps"
-msgstr "Autori Pidginu"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "Vyberte t?to mo?nos?, ak nechcete grafick?ch smajl?kov."
 
@@ -14335,6 +14349,9 @@ msgstr "Polo?ka rozhovoru"
 msgid "Conversation Entry"
 msgstr "Polo?ka rozhovoru"
 
+msgid "Conversation History"
+msgstr "Hist?ria rozhovoru"
+
 msgid "Request Dialog"
 msgstr "Dial?g po?iadavku"
 
@@ -14799,9 +14816,8 @@ msgstr "_Spusti? %s pri ?tarte Windows
 msgid "_Start %s on Windows startup"
 msgstr "_Spusti? %s pri ?tarte Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Umo?ni? viacero s?be?n?ch prihl?sen?"
+msgstr "Umo?ni? viacero spusten?"
 
 msgid "_Dockable Buddy List"
 msgstr "_Ukotvite?n? zoznam priate?ov"
@@ -14863,7 +14879,43 @@ msgstr "Tento modul je vhodn? pre laden
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Tento modul je vhodn? pre ladenie XMPP serverov alebo klientov."
 
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "Neboli n?jden? in? met?dy XMPP spojenia po tom ?o zlyhalo priame spojenie."
+
 #, fuzzy
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "Akciu nebolo mo?n? vykona?, preto?e ste prekro?ili limit hodnotenia. "
+#~ "Pros?m, po?kajte 10 sek?nd a sk?ste to znovu."
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(predvolen?)"
+
+#~ msgid "Install Theme"
+#~ msgstr "In?talova? t?mu"
+
+#~ msgid "Icon"
+#~ msgstr "Ikona"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Pou?i? p?smo dokumentov _t?my"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy server a prehliada?"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatick? nepr?tomnos?"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Zmeni? _status na:"
+
+#, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr ""
 #~ "Certifik?t, ktor?m je tento certifik?t vydan?, je pre Pidgin nezn?my."
@@ -16068,9 +16120,6 @@ msgstr "Tento modul je vhodn? pre laden
 #~ "s?bore 'COPYRIGHT'. Na tento program v?m neposkytujeme ?iadnu z?ruku."
 #~ "<BR><BR>"
 
-#~ msgid "Conversation History"
-#~ msgstr "Hist?ria rozhovoru"
-
 #~ msgid "Log Viewer"
 #~ msgstr "Zobrazova? z?znamov"
 
============================================================
--- po/zh_HK.po	3697bc390fe17c2a5961f95092010e885b0175d5
+++ po/zh_HK.po	dacd98158224f72cd1cc2c16ab91c37ae498e8c8
@@ -1,14 +1,14 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.22 2009/11/27 10:02:35 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.24 2010/02/15 23:14:17 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2009, Paladin R. Liu <paladin at ms1.hinet.net>
-# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li at gmail.com>
+# Copyright (C) 2002-2010, Paladin R. Liu <paladin at ms1.hinet.net>
+# Copyright (C) 2003-2010, Ambrose C. Li <ambrose.li at gmail.com>
 #
 # PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.615 2009/11/29 00:48:50 acli Exp $
+# $InternalId: zh_TW.po,v 1.619 2010/02/15 23:14:17 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -60,10 +60,10 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.4\n"
+"Project-Id-Version: Pidgin 2.6.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-09-03 06:04-0400\n"
+"POT-Creation-Date: 2010-02-15 18:32-0800\n"
+"PO-Revision-Date: 2010-02-14 03:06-0400\n"
 "Last-Translator: Ambrose Li <ambrose.li at gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -1652,11 +1652,13 @@ msgstr "???"
 msgid "No Grouping"
 msgstr "???"
 
+# XXX ?? 20100215/acli
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "?????"
 
+# XXX ?? 20100215/acli
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "????(?????)"
 
 #  *< name
 #  *< version
@@ -2037,6 +2039,9 @@ msgstr "%s ??????,??? msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ??????,????????\n"
 
+msgid "File is not readable."
+msgstr "???????"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ??? %s (%s) ??"
@@ -3902,6 +3907,13 @@ msgstr "??????????? msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "????????????????????"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "???????????"
+
+msgid "Server does not use any supported authentication method"
+msgstr "???????????????????"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3911,15 +3923,6 @@ msgstr "????"
 msgid "Plaintext Authentication"
 msgstr "????"
 
-msgid "SASL authentication failed"
-msgstr "SASL ????"
-
-msgid "Invalid response from server"
-msgstr "???????????"
-
-msgid "Server does not use any supported authentication method"
-msgstr "???????????????????"
-
 msgid "You require encryption, but it is not available on this server."
 msgstr "?????,????????????"
 
@@ -3927,10 +3930,28 @@ msgstr "??????????? msgid "Invalid challenge from server"
 msgstr "?????????????"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "?????????????,???????"
+
+msgid "SASL authentication failed"
+msgstr "SASL ????"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL ??:%s"
 
+msgid "Unable to canonicalize username"
+msgstr "???????????"
+
+msgid "Unable to canonicalize password"
+msgstr "???????????"
+
+msgid "Malicious challenge from server"
+msgstr "?????????????"
+
+msgid "Unexpected response from server"
+msgstr "???????????"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH ???????????????"
 
@@ -4037,13 +4058,17 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
-msgstr "%s?"
+# NOTE ?????,??????? 20100214
+msgid "Uptime"
+msgstr "????"
 
 msgid "Logged Off"
 msgstr "???"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s?"
+
 # NOTE: ????????????,?????????,??????
 # NOTE: ????????????????,???,?????PO???????
 msgid "Middle Name"
@@ -4246,11 +4271,6 @@ msgstr "Ping??"
 msgid "Ping timed out"
 msgstr "Ping??"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr "??????,???????? XMPP ?????"
-
 msgid "Invalid XMPP ID"
 msgstr "XMPP ????"
 
@@ -4881,6 +4901,9 @@ msgstr "(?? %s)"
 msgid "(Code %s)"
 msgstr "(?? %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "???????????????????????????"
+
 msgid "XML Parse error"
 msgstr "XML ????"
 
@@ -5305,6 +5328,10 @@ msgstr "??? MSN ?????"
 msgid "Your new MSN friendly name is too long."
 msgstr "??? MSN ?????"
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "?? %s ????"
+
 msgid "Set your friendly name."
 msgstr "???????"
 
@@ -6914,8 +6941,12 @@ msgstr "??????"
 msgstr "??????"
 
 # NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
-#. Note to translators: %s in this string is a URL
 #, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s ????????:%s"
+
+# NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
 msgid "Received unexpected response from %s"
 msgstr "%s ????????"
 
@@ -6933,6 +6964,11 @@ msgstr "???? %s ??????msgid "Error requesting %s: %s"
 msgstr "???? %s ???????:%s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr "????????????????,??????????????"
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ????????????"
 
@@ -7503,13 +7539,6 @@ msgstr "(?????????? "characters.]"
 msgstr "(??????????????,???????????)"
 
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"?????????????,????????????????????????"
-"?????\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "??????? %s ?????"
@@ -11147,7 +11176,7 @@ msgid "The text information for when a g
 msgstr "????????"
 
 msgid "The text information for when a group is expanded"
-msgstr "?????????????????"
+msgstr "?????????????????"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
@@ -11163,7 +11192,7 @@ msgid "The text information for when a g
 msgstr "????????"
 
 msgid "The text information for when a group is collapsed"
-msgstr "?????????????????"
+msgstr "?????????????????"
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
@@ -11184,7 +11213,7 @@ msgid "The text information for when a c
 # NOTE ??contact???,????????contact???????contact????buddy
 # NOTE ???,???text information for when a contact is expanded?????contact???
 msgid "The text information for when a contact is expanded"
-msgstr "????????????????????"
+msgstr "????????????????????"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
@@ -11192,7 +11221,7 @@ msgid "The text information for when a b
 msgstr "???????"
 
 msgid "The text information for when a buddy is online"
-msgstr "?????????????????"
+msgstr "?????????????????"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
@@ -11200,7 +11229,7 @@ msgid "The text information for when a b
 msgstr "???????"
 
 msgid "The text information for when a buddy is away"
-msgstr "?????????????????"
+msgstr "?????????????????"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
@@ -11208,7 +11237,7 @@ msgid "The text information for when a b
 msgstr "???????"
 
 msgid "The text information for when a buddy is offline"
-msgstr "?????????????????"
+msgstr "?????????????????"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -11216,7 +11245,7 @@ msgid "The text information for when a b
 msgstr "???????"
 
 msgid "The text information for when a buddy is idle"
-msgstr "?????????????????"
+msgstr "?????????????????"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
@@ -11224,7 +11253,7 @@ msgid "The text information for when a b
 msgstr "??????????"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr "????????????????????"
+msgstr "????????????????????"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
@@ -11234,10 +11263,10 @@ msgid ""
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
-msgstr "?????????????????????????????????"
+msgstr "?????????????????????????????????"
 
 msgid "The text information for a buddy's status"
-msgstr "????????????"
+msgstr "????????????"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -12293,9 +12322,6 @@ msgstr "???"
 msgid "Lao"
 msgstr "???"
 
-msgid "Lithuanian"
-msgstr "????"
-
 #  NOTE?????????????,???????????
 msgid "Macedonian"
 msgstr "????"
@@ -12303,6 +12329,10 @@ msgstr "???"
 msgid "Mongolian"
 msgstr "???"
 
+#  NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4
+msgid "Marathi"
+msgstr "????"
+
 msgid "Malay"
 msgstr "???"
 
@@ -12328,6 +12358,10 @@ msgstr "???"
 msgid "Occitan"
 msgstr "???"
 
+# NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=oriya&qrytype=en&x=33&y=10
+msgid "Oriya"
+msgstr "????"
+
 msgid "Punjabi"
 msgstr "????"
 
@@ -12419,6 +12453,9 @@ msgstr "?????"
 msgid "Amharic"
 msgstr "?????"
 
+msgid "Lithuanian"
+msgstr "????"
+
 #, c-format
 msgid "About %s"
 msgstr "?? %s"
@@ -12848,7 +12885,7 @@ msgid "Select Text Color"
 msgstr "????"
 
 msgid "Select Text Color"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Select Background Color"
 msgstr "??????"
@@ -14067,6 +14104,9 @@ msgstr "????(_S)"
 msgid "_Save File"
 msgstr "????(_S)"
 
+msgid "Do you really want to clear?"
+msgstr "???????"
+
 msgid "Select color"
 msgstr "????"
 
@@ -15319,6 +15359,18 @@ msgstr "??? XMPP ?????? msgstr "??? XMPP ????????????"
 
 #~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr "??????,???????? XMPP ?????"
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "?????????????,???????????????????????"
+#~ "??????\n"
+
+#~ msgid ""
 #~ "The root certificate this one claims to be issued by is unknown to Pidgin."
 #~ msgstr "????????? Pidgin ????????????"
 
============================================================
--- po/zh_TW.po	4e39029e119c8c2509f18d921af95ad13f4937a0
+++ po/zh_TW.po	3b94f98fff774b96e2989bd1dea7f7c6933b4b6d
@@ -1,12 +1,12 @@
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2009, Paladin R. Liu <paladin at ms1.hinet.net>
-# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li at gmail.com>
+# Copyright (C) 2002-2010, Paladin R. Liu <paladin at ms1.hinet.net>
+# Copyright (C) 2003-2010, Ambrose C. Li <ambrose.li at gmail.com>
 #
 # PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.615 2009/11/29 00:48:50 acli Exp $
+# $InternalId: zh_TW.po,v 1.619 2010/02/15 23:14:17 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -58,10 +58,10 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.4\n"
+"Project-Id-Version: Pidgin 2.6.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 20:30-0500\n"
-"PO-Revision-Date: 2009-09-03 06:04-0400\n"
+"POT-Creation-Date: 2010-02-15 18:33-0800\n"
+"PO-Revision-Date: 2010-02-14 03:06-0400\n"
 "Last-Translator: Ambrose Li <ambrose.li at gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n at linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -1650,11 +1650,13 @@ msgstr "???"
 msgid "No Grouping"
 msgstr "???"
 
+# XXX ?? 20100215/acli
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "?????"
 
+# XXX ?? 20100215/acli
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "????(?????)"
 
 #  *< name
 #  *< version
@@ -2035,6 +2037,9 @@ msgstr "%s ??????,??? msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ??????,????????\n"
 
+msgid "File is not readable."
+msgstr "???????"
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ??? %s (%s) ??"
@@ -3900,6 +3905,13 @@ msgstr "??????????? msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "????????????????????"
 
+#. This should never happen!
+msgid "Invalid response from server"
+msgstr "???????????"
+
+msgid "Server does not use any supported authentication method"
+msgstr "???????????????????"
+
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3909,15 +3921,6 @@ msgstr "????"
 msgid "Plaintext Authentication"
 msgstr "????"
 
-msgid "SASL authentication failed"
-msgstr "SASL ????"
-
-msgid "Invalid response from server"
-msgstr "???????????"
-
-msgid "Server does not use any supported authentication method"
-msgstr "???????????????????"
-
 msgid "You require encryption, but it is not available on this server."
 msgstr "?????,????????????"
 
@@ -3925,10 +3928,28 @@ msgstr "??????????? msgid "Invalid challenge from server"
 msgstr "?????????????"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr "?????????????,???????"
+
+msgid "SASL authentication failed"
+msgstr "SASL ????"
+
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL ??:%s"
 
+msgid "Unable to canonicalize username"
+msgstr "???????????"
+
+msgid "Unable to canonicalize password"
+msgstr "???????????"
+
+msgid "Malicious challenge from server"
+msgstr "?????????????"
+
+msgid "Unexpected response from server"
+msgstr "???????????"
+
 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH ???????????????"
 
@@ -4035,13 +4056,17 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
-#, c-format
-msgid "%s ago"
-msgstr "%s?"
+# NOTE ?????,??????? 20100214
+msgid "Uptime"
+msgstr "????"
 
 msgid "Logged Off"
 msgstr "???"
 
+#, c-format
+msgid "%s ago"
+msgstr "%s?"
+
 # NOTE: ????????????,?????????,??????
 # NOTE: ????????????????,???,?????PO???????
 msgid "Middle Name"
@@ -4244,11 +4269,6 @@ msgstr "Ping??"
 msgid "Ping timed out"
 msgstr "Ping??"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr "??????,???????? XMPP ?????"
-
 msgid "Invalid XMPP ID"
 msgstr "XMPP ????"
 
@@ -4879,6 +4899,9 @@ msgstr "(?? %s)"
 msgid "(Code %s)"
 msgstr "(?? %s)"
 
+msgid "A custom smiley in the message is too large to send."
+msgstr "???????????????????????????"
+
 msgid "XML Parse error"
 msgstr "XML ????"
 
@@ -5303,6 +5326,10 @@ msgstr "??? MSN ?????"
 msgid "Your new MSN friendly name is too long."
 msgstr "??? MSN ?????"
 
+#, c-format
+msgid "Set friendly name for %s."
+msgstr "?? %s ????"
+
 msgid "Set your friendly name."
 msgstr "???????"
 
@@ -6912,8 +6939,12 @@ msgstr "??????"
 msgstr "??????"
 
 # NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
-#. Note to translators: %s in this string is a URL
 #, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "%s ????????:%s"
+
+# NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
 msgid "Received unexpected response from %s"
 msgstr "%s ????????"
 
@@ -6931,6 +6962,11 @@ msgstr "???? %s ??????msgid "Error requesting %s: %s"
 msgstr "???? %s ???????:%s"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr "????????????????,??????????????"
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ????????????"
 
@@ -7501,13 +7537,6 @@ msgstr "(?????????? "characters.]"
 msgstr "(??????????????,???????????)"
 
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"?????????????,????????????????????????"
-"?????\n"
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "??????? %s ?????"
@@ -12287,9 +12316,6 @@ msgstr "???"
 msgid "Lao"
 msgstr "???"
 
-msgid "Lithuanian"
-msgstr "????"
-
 #  NOTE?????????????,???????????
 msgid "Macedonian"
 msgstr "????"
@@ -12297,6 +12323,10 @@ msgstr "???"
 msgid "Mongolian"
 msgstr "???"
 
+#  NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=marathi&qrytype=en&x=15&y=4
+msgid "Marathi"
+msgstr "????"
+
 msgid "Malay"
 msgstr "???"
 
@@ -12322,6 +12352,10 @@ msgstr "????"
 msgid "Occitan"
 msgstr "????"
 
+# NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=oriya&qrytype=en&x=33&y=10
+msgid "Oriya"
+msgstr "????"
+
 msgid "Punjabi"
 msgstr "????"
 
@@ -12413,6 +12447,9 @@ msgstr "?????"
 msgid "Amharic"
 msgstr "?????"
 
+msgid "Lithuanian"
+msgstr "????"
+
 #, c-format
 msgid "About %s"
 msgstr "?? %s"
@@ -14061,6 +14098,9 @@ msgstr "????(_S)"
 msgid "_Save File"
 msgstr "????(_S)"
 
+msgid "Do you really want to clear?"
+msgstr "???????"
+
 msgid "Select color"
 msgstr "????"
 
@@ -15313,6 +15353,18 @@ msgstr "??? XMPP ?????? msgstr "??? XMPP ????????????"
 
 #~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr "??????,???????? XMPP ?????"
+
+#~ msgid ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "?????????????,???????????????????????"
+#~ "??????\n"
+
+#~ msgid ""
 #~ "The root certificate this one claims to be issued by is unknown to Pidgin."
 #~ msgstr "????????? Pidgin ????????????"

More information about the Commits mailing list