pidgin: e10b3682: Check in re-based .po files so our night...

markdoliner at pidgin.im markdoliner at pidgin.im
Thu Jul 2 06:01:08 EDT 2009


-----------------------------------------------------------------
Revision: e10b36824b7fe62e7645add5beca9ae060d64706
Ancestor: b8cd3c2fd3a682690d45413ac304bdd196047c3c
Author: markdoliner at pidgin.im
Date: 2009-07-02T08:41:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e10b36824b7fe62e7645add5beca9ae060d64706

Modified files:
        po/af.po po/am.po po/ar.po po/az.po po/be at latin.po po/bg.po
        po/bn.po po/bs.po po/ca.po po/ca at valencia.po po/cs.po
        po/da.po po/de.po po/dz.po po/el.po po/en_AU.po po/en_CA.po
        po/en_GB.po po/eo.po po/es.po po/et.po po/eu.po po/fa.po
        po/fi.po po/fr.po po/ga.po po/gl.po po/gu.po po/he.po
        po/hi.po po/hu.po po/hy.po po/id.po po/it.po po/ja.po
        po/ka.po po/km.po po/kn.po po/ko.po po/ku.po po/lo.po
        po/lt.po po/mk.po po/mn.po po/my_MM.po po/nb.po po/ne.po
        po/nl.po po/nn.po po/oc.po po/pa.po po/pl.po po/ps.po
        po/pt.po po/pt_BR.po po/ro.po po/ru.po po/si.po po/sk.po
        po/sl.po po/sq.po po/sr.po po/sr at latin.po po/sv.po po/sw.po
        po/ta.po po/te.po po/th.po po/tr.po po/uk.po po/ur.po
        po/vi.po po/xh.po po/zh_CN.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

Check in re-based .po files so our nightly l10n stats generation has less work to do

-------------- next part --------------
============================================================
--- po/af.po	b67ccf78559dcb31684552d4bcf9d19d193b98ff
+++ po/af.po	5447012988c05dd9f4af78656aa333bb6ef337c0
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:36-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-23 19:54+0200\n"
 "Last-Translator: F Wolff <friedel at translate.org.za>\n"
 "Language-Team: translate-discuss-af at lists.sourceforge.net\n"
@@ -1780,6 +1780,8 @@ msgstr "+++ %s het afgemeld"
 msgid "+++ %s signed off"
 msgstr "+++ %s het afgemeld"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -2190,6 +2192,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Kon nie verbinding daarstel nie"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "U gebruik tans %s, maar hierdie inprop vereis %s."
@@ -3163,6 +3169,11 @@ msgstr "Geselsie_naam:"
 msgid "Chat _name:"
 msgstr "Geselsie_naam:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Kan nie aan bediener koppel nie."
+
 msgid "Chat error"
 msgstr "Geselsiefout"
 
@@ -3211,6 +3222,10 @@ msgstr "Gadu-Gadu-gebruiker"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-gebruiker"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Stel gebruikerinligting..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende bevel: %s"
@@ -3253,7 +3268,8 @@ msgstr "_Wagwoord:"
 msgid "_Password:"
 msgstr "_Wagwoord:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-byname kan nie spasies bevat nie"
 
 #. 1. connect to server
@@ -3729,6 +3745,9 @@ msgstr "Bediener gebruik nie enige geste
 msgid "Server does not use any supported authentication method"
 msgstr "Bediener gebruik nie enige gesteunde stawingmetode nie"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "U vereis enkripsie, maar dis nie op hierdie bediener beskikbaar nie."
+
 msgid "Invalid challenge from server"
 msgstr "Ongeldige uitdaging vanaf bediener"
 
@@ -3999,6 +4018,14 @@ msgstr "Hulpbron"
 msgid "Resource"
 msgstr "Hulpbron"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Aangemeld"
+
 msgid "Middle Name"
 msgstr "Tweede naam"
 
@@ -4165,9 +4192,18 @@ msgstr "Vind kamers"
 msgid "Find Rooms"
 msgstr "Vind kamers"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "U vereis enkripsie, maar dis nie op hierdie bediener beskikbaar nie."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Geen passende gebruikers gevind nie"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rol"
+
 msgid "Ping timeout"
 msgstr "Pieng-uittelling"
 
@@ -4187,7 +4223,7 @@ msgstr "Ongeldige XMPP-ID. Domein moet i
 msgstr "Ongeldige XMPP-ID. Domein moet ingestel word."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Verbind aan bediener het misluk."
 
 #, c-format
@@ -4214,9 +4250,6 @@ msgstr "Deregistrasie het misluk"
 msgid "Unregistration Failed"
 msgstr "Deregistrasie het misluk"
 
-msgid "Already Registered"
-msgstr "Reeds geregistreer"
-
 msgid "State"
 msgstr "Staat"
 
@@ -4229,6 +4262,9 @@ msgstr "Datum"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Reeds geregistreer"
+
 msgid "Unregister"
 msgstr "Deregistreer"
 
@@ -4258,6 +4294,10 @@ msgstr "Verander registrasie"
 msgid "Change Registration"
 msgstr "Verander registrasie"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Verbind aan bediener het misluk."
+
 msgid "Error unregistering account"
 msgstr "Kon nie rekening deregistreer nie"
 
@@ -4623,16 +4663,18 @@ msgstr "ban &lt;gebruiker&gt; [rede]:  V
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;gebruiker&gt; [rede]:  Verban 'n gebruiker uit die kamer."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;gebruiker&gt; &lt;eienaar|admin|lid|verworpene|geen&gt;: Stel "
 "'n gebruiker se affiliasie met die kamer in."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;gebruiker&gt; &lt;moderator|deelnemer|besoeker|geen&gt;: Stel 'n "
 "gebruiker se rol in die kamer in."
@@ -4699,6 +4741,9 @@ msgstr "L?eroordraginstaanbediener"
 msgid "File transfer proxies"
 msgstr "L?eroordraginstaanbediener"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5095,6 +5140,11 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie."
+
 msgid "Nudge"
 msgstr "Stootjie"
 
@@ -5438,63 +5488,26 @@ msgstr "Windows Live-ID-stawing: Ongeldi
 msgstr "Windows Live-ID-stawing: Ongeldige antwoord"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s is nie 'n geldige groep nie."
-
-msgid "Unknown error."
-msgstr "Onbekende fout."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s op %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s het u so pas 'n stootjie gestuur!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Onbekende fout (%d)"
 
 msgid "Unable to add user"
 msgstr "Kan nie gebruiker byvoeg nie"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Onbekende fout (%d)"
+
 msgid "The following users are missing from your addressbook"
 msgstr "Die volgende gebruikers is nie in die adresboek nie."
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kan nie gebruiker by %s byvoeg nie (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kan nie gebruiker op %s blokkeer nie (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kan nie gebruiker op %s toelaat nie (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s kon nie bygevoeg word nie omdat u vriendelys vol is."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is nie 'n geldige paspoortrekening nie."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Diens tydelik nie beskikbaar nie."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiele boodskap is nie gestuur nie omdat dit te lank was."
 
-msgid "Unable to rename group"
-msgstr "Kan nie groep hernoem nie"
-
-msgid "Unable to delete group"
-msgstr "Kan nie groep uitvee nie"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5580,6 +5593,9 @@ msgstr ""
 msgstr ""
 "U MSN-vriendelys is tydelik nie beskikbaar nie. Wag gerus en probeer weer."
 
+msgid "Unknown error."
+msgstr "Onbekende fout."
+
 msgid "Handshaking"
 msgstr "Bladskud"
 
@@ -5598,6 +5614,16 @@ msgstr "Kry tans vriendelys"
 msgid "Retrieving buddy list"
 msgstr "Kry tans vriendelys"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie."
+
 msgid "Away From Computer"
 msgstr "Weg van rekenaar"
 
@@ -5641,14 +5667,6 @@ msgstr ""
 msgstr ""
 "Boodskap is dalk nie gestuur nie omdat 'n onbekende fout voorgekom het:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s het u by sy of haar vriendelys gevoeg."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s het u van sy of haar vriendelys verwyder."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Skrap vriend uit adresboek?"
 
@@ -5678,6 +5696,51 @@ msgstr "MSN-protokolinprop"
 msgstr "MSN-protokolinprop"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s is nie 'n geldige groep nie."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s op %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kan nie gebruiker by %s byvoeg nie (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kan nie gebruiker op %s blokkeer nie (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kan nie gebruiker op %s toelaat nie (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s kon nie bygevoeg word nie omdat u vriendelys vol is."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is nie 'n geldige paspoortrekening nie."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Diens tydelik nie beskikbaar nie."
+
+msgid "Unable to rename group"
+msgstr "Kan nie groep hernoem nie"
+
+msgid "Unable to delete group"
+msgstr "Kan nie groep uitvee nie"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s het u by sy of haar vriendelys gevoeg."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s het u van sy of haar vriendelys verwyder."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Geen so 'n gebruiker nie: %s"
 
@@ -5706,6 +5769,8 @@ msgstr "Verbinding met bediener verloor"
 msgstr "Verbinding met bediener verloor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nuwe posboodskappe"
 
@@ -5754,17 +5819,19 @@ msgstr "Protokolfout, kode %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Protokolfout, kode %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s U wagwoord is %d karakters, meer as die verwagte maksimum lengte van %d "
 "vir MySpaceIM. Maak u wagwoord korter by http://profileedit.myspace.com/"
 "index.cfm?fuseaction=accountSettings.changePassword en probeer weer."
 
+msgid "Incorrect username or password"
+msgstr "Verkeerde gebruikernaam of wagwoord"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fout"
 
@@ -6082,9 +6149,6 @@ msgstr "Meesterargief is gewankonfiguree
 msgid "Master archive is misconfigured"
 msgstr "Meesterargief is gewankonfigureer"
 
-msgid "Incorrect username or password"
-msgstr "Verkeerde gebruikernaam of wagwoord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kon nie die gasheer van die gebruikernaam herken wat u getik het nie"
 
@@ -6300,6 +6364,28 @@ msgstr "Bedienerpoort"
 msgid "Server port"
 msgstr "Bedienerpoort"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Onverwagte HTTP-respons van die bediener ontvang."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"U het nou te gereeld gekoppel en ontkoppel. Wag tien minute en probeer weer. "
+"Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Kon nie aanmeldteken aanvra nie"
+
+msgid "Incorrect password."
+msgstr "Verkeerde wagwoord."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Kon nie by geselsie aansluit nie"
 
@@ -6601,14 +6687,33 @@ msgstr ""
 "is.  Skermname moet geldige e-posadresse wees, of met 'n letter begin en net "
 "letters, syfers en spasies bevat, of net syfers bevat."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"U kan dalk binnekort ontkoppel word.  As dit gebeur, kontroleer %s vir "
+"bywerkings."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kan nie 'n geldige AIM-aanmeldhutswaarde kry nie."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "U kan dalk binnekort ontkoppel word.  Kontroleer %s vir bywerkings."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kan nie geldige aanmeldhutswaarde kry nie."
+
+msgid "Could Not Connect"
+msgstr "Kon nie koppel nie"
+
+msgid "Received authorization"
+msgstr "Magtiging ontvang"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Ongeldige gebruikernaam."
 
-msgid "Incorrect password."
-msgstr "Verkeerde wagwoord."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "U rekening is tans opgeskort."
@@ -6617,25 +6722,19 @@ msgstr "Die AOL-kitsboodskapdiens is tyd
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Die AOL-kitsboodskapdiens is tydelik nie beskikbaar nie."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Die kli?ntweergawe wat u gebruik, is te oud. Gradeer gerus op by %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "U het nou te gereeld gekoppel en ontkoppel. Wag tien minute en probeer weer. "
 "Indien u voortgaan om te probeer sal u selfs nog langer moet wag."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Die kli?ntweergawe wat u gebruik, is te oud. Gradeer gerus op by %s"
-
-msgid "Could Not Connect"
-msgstr "Kon nie koppel nie"
-
-msgid "Received authorization"
-msgstr "Magtiging ontvang"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Die SecurID-sleutel wat getik is, is ongeldig."
 
@@ -6651,22 +6750,6 @@ msgstr "_Regso"
 msgid "_OK"
 msgstr "_Regso"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"U kan dalk binnekort ontkoppel word.  As dit gebeur, kontroleer %s vir "
-"bywerkings."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kan nie 'n geldige AIM-aanmeldhutswaarde kry nie."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "U kan dalk binnekort ontkoppel word.  Kontroleer %s vir bywerkings."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kan nie geldige aanmeldhutswaarde kry nie."
-
 msgid "Password sent"
 msgstr "Wagwoord gestuur"
 
@@ -7176,6 +7259,7 @@ msgstr "Stel gebruikerinligting (web)...
 msgid "Set User Info (web)..."
 msgstr "Stel gebruikerinligting (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Verander wagwoord (web)"
 
@@ -7205,6 +7289,10 @@ msgstr "Soek vir vriend met inligting"
 msgid "Search for Buddy by Information"
 msgstr "Soek vir vriend met inligting"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Gebruiker is nie aangemeld nie"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9505,11 +9593,6 @@ msgstr "Magtig domein"
 msgid "Auth Domain"
 msgstr "Magtig domein"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s het u 'n webkamera-uitnodiging gestuur, wat nog nie ondersteun word nie."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9535,6 +9618,44 @@ msgstr "Vriend byvoeg geweier"
 msgid "Add buddy rejected"
 msgstr "Vriend byvoeg geweier"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Het ongeldige data ontvang tydens verbinding met bediener."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Verkeerde wagwoord"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Onbekende fout, nommer %d. As u by die Yahoo!-webwerf aanmeld, kan dit dalk "
+"die probleem oplos."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Gebruiker bestaan nie"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Onbekende fout, nommer %d. As u by die Yahoo!-webwerf aanmeld, kan dit dalk "
+"die probleem oplos."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Verkeerde gebruikernaam of wagwoord"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9647,8 +9768,8 @@ msgstr "Begin krabbel"
 msgid "Start Doodling"
 msgstr "Begin krabbel"
 
-msgid "Activate which ID?"
-msgstr "Aktiveer watter ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Sluit by wie in geselsie aan?"
@@ -10436,8 +10557,9 @@ msgstr "Werk gerus die nodige velde by."
 msgid "Please update the necessary fields."
 msgstr "Werk gerus die nodige velde by."
 
-msgid "Room _List"
-msgstr "Kamer_lys"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Rekening"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10445,8 +10567,8 @@ msgstr ""
 msgstr ""
 "Tik gerus die gepaste inligting vir die geselsie waarby u wil aansluit.\n"
 
-msgid "_Account:"
-msgstr "_Rekening:"
+msgid "Room _List"
+msgstr "Kamer_lys"
 
 msgid "_Block"
 msgstr "_Blokkeer"
@@ -10881,6 +11003,112 @@ msgstr "Rangskik vriende"
 msgid "/Buddies/Sort Buddies"
 msgstr "Rangskik vriende"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Agtergrondkleur"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Hierdie groep is by u vriendelys gevoeg"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Agtergrondkleur"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Vou oop"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Kies agtergrondkleur"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Vou toe"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Kies agtergrondkleur"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Kortpad"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Aanlyn"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Weg"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Vanlyn"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Stemmingteks"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Boodskap gestuur"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Verander gebruikerinligting vir %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-bedieners"
@@ -11382,6 +11610,10 @@ msgstr "Hongaars"
 msgid "Hungarian"
 msgstr "Hongaars"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Romeens"
+
 msgid "Indonesian"
 msgstr "Indonesies"
 
@@ -11480,6 +11712,9 @@ msgstr "Sweeds"
 msgid "Swedish"
 msgstr "Sweeds"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11912,11 +12147,9 @@ msgstr "Stoor prent"
 msgid "Save Image"
 msgstr "Stoor prent"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Stoor prent..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Voeg pasgemaakte gesiggie by..."
 
@@ -12006,9 +12239,6 @@ msgstr "Fonttipe"
 msgid "Font Face"
 msgstr "Fonttipe"
 
-msgid "Background Color"
-msgstr "Agtergrondkleur"
-
 msgid "Foreground Color"
 msgstr "Voorgrondkleur"
 
@@ -12338,6 +12568,9 @@ msgstr "Hou wie dop"
 msgid "Pounce on Whom"
 msgstr "Hou wie dop"
 
+msgid "_Account:"
+msgstr "_Rekening:"
+
 msgid "_Buddy name:"
 msgstr "_Vriendnaam:"
 
@@ -12448,9 +12681,18 @@ msgstr "Onbekende vriendwag-gebeurtenis.
 msgid "Unknown.... Please report this!"
 msgstr "Onbekende vriendwag-gebeurtenis. Rapporteer dit, asseblief!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Uitpak van gesiggie-tema het misluk."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Uitpak van gesiggie-tema het misluk."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Uitpak van gesiggie-tema het misluk."
+
 msgid "Install Theme"
 msgstr "Installeer tema"
 
@@ -13010,6 +13252,10 @@ msgstr "Bestuurder van eie gesiggies"
 msgid "Custom Smiley Manager"
 msgstr "Bestuurder van eie gesiggies"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Kies vriend"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klik hier om die vriend_ikoon vir hierdie rekening te verander."
 
@@ -13231,6 +13477,78 @@ msgstr "Wys statistiese inligting oor u 
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Wys statistiese inligting oor u vriende se beskikbaarheid"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Bedieneradres"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Tik 'n konferensiebediener"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Kies 'n konferensiebediener om te vra"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Aanlyndienste"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Stuur vriendelys"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Weggaan"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Staafl?ergids"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Klankkeuse"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub-diens"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Beskrywing"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Diensbespeuring-inligting"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Blaaier:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Gebruiker bestaan nie"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Bediener ondersteun nie blokkering nie"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Diensbespeuring-inligting"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kli?nte te ontfout."
+
 msgid "Buddy is idle"
 msgstr "Vriend is ledig"
 
@@ -13733,12 +14051,6 @@ msgstr ""
 "- Dit keer alle teks agterstevoorom\n"
 "- Dit stuur 'n boodksap aan mense op u lys die oomblik wat hulle aanmeld"
 
-msgid "Cursor Color"
-msgstr "Porkleur"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekond?re porkleur"
-
 msgid "Hyperlink Color"
 msgstr "Hiperskakelkleur"
 
@@ -13748,6 +14060,10 @@ msgstr "Kleur van gemerkte boodskapnaam"
 msgid "Highlighted Message Name Color"
 msgstr "Kleur van gemerkte boodskapnaam"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Kleur van tikkennisgewing"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView- horisontale skeiding"
 
@@ -13777,35 +14093,24 @@ msgstr "GTK+-tekskortpadtema"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekskortpadtema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Koppelvlakkleure"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Aktiveer tikkennisgewings"
 
-msgid "Widget Sizes"
-msgstr "Dingessie-groottes"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+-temabeheer"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Sluit"
+
 msgid "Fonts"
 msgstr "Fonte"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-l?ernutsgoed"
 
@@ -13947,12 +14252,119 @@ msgstr ""
 msgstr ""
 "Vervang teks in uitgaande boodskappe volgens gebruikergespesifiseerde re?ls."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Nie aangemeld nie"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Nie aangemeld nie"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Sluit by geselsie aan"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignoreer"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Harder"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Magtiging gegee"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Fout "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Inligting"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Versoek-dialoog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Waarskuwingvlak"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status vir %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Geselsiekamer-lokaliteit"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Verander ikoon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+-temabeheer"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakinligting"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Vriendelys"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Vriendelys"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+-temabeheer"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+-temabeheer"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Vriendelint"
 
@@ -14156,6 +14568,21 @@ msgstr "Hierdie inprop is nuttig om XMPP
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kli?nte te ontfout."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktiveer watter ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Porkleur"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekond?re porkleur"
+
+#~ msgid "Interface colors"
+#~ msgstr "Koppelvlakkleure"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Dingessie-groottes"
+
 #~ msgid "Invite message"
 #~ msgstr "Uitnodigingsboodskap"
 
@@ -14593,9 +15020,6 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "U versoek om by groep %d aan te sluit, is deur admin %d goed gekeur"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Hierdie groep is by u vriendelys gevoeg"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Ek doen aansoek om aan te sluit"
 
@@ -14675,9 +15099,6 @@ msgstr "Hierdie inprop is nuttig om XMPP
 #~ msgid "Group Operation Error"
 #~ msgstr "Groepbewerkingsfout"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Kon nie aanmeldteken aanvra nie"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP-adres"
 
============================================================
--- po/am.po	e91cf98c1ee0e0a246ca009c8ba44f883ac38d96
+++ po/am.po	cc7ea8e7c8d0e57a5cd03f5f35d64aa4881270a0
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 0.60 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:36-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2003-04-08 09:23:11+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales at geez.org>\n"
 "Language-Team: Amharic <locales at geez.org>\n"
@@ -1817,6 +1817,8 @@ msgstr "?? -  ????? ??
 msgid "+++ %s signed off"
 msgstr "?? -  ????? ?????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????? ????"
 
@@ -2188,6 +2190,10 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3171,7 +3177,12 @@ msgstr "???? ???"
 msgid "Chat _name:"
 msgstr "???? ???"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "??????"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "?IRC ????"
 
@@ -3225,6 +3236,10 @@ msgstr "??? ????"
 msgid "Gadu-Gadu User"
 msgstr "??? ????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??????"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -3272,7 +3287,7 @@ msgstr "????? ?? (_P)"
 msgid "_Password:"
 msgstr "????? ?? (_P)"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3714,6 +3729,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -4004,6 +4022,16 @@ msgstr "??? (_R)"
 msgid "Resource"
 msgstr "??? (_R)"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr ""
+"\n"
+"<b>??? ???</b>"
+
 msgid "Middle Name"
 msgstr ""
 
@@ -4187,7 +4215,15 @@ msgstr "??? ???"
 msgid "Find Rooms"
 msgstr "??? ???"
 
-msgid "You require encryption, but it is not available on this server."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "????"
+
+#, fuzzy
+msgid "No users found"
+msgstr "????"
+
+msgid "Roles:"
 msgstr ""
 
 #, fuzzy
@@ -4211,7 +4247,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "??????"
 
 #, c-format
@@ -4240,9 +4276,6 @@ msgstr "????? ?????"
 msgid "Unregistration Failed"
 msgstr "????? ?????"
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr "???"
 
@@ -4256,6 +4289,9 @@ msgstr "??"
 msgid "Date"
 msgstr "??"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -4284,6 +4320,10 @@ msgstr "??? ?????"
 msgid "Change Registration"
 msgstr "??? ?????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "??????"
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4673,13 +4713,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4743,6 +4783,9 @@ msgstr "???? ??"
 msgid "File transfer proxies"
 msgstr "???? ??"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5142,6 +5185,10 @@ msgstr "?????"
 msgid "Non-IM Contacts"
 msgstr "?????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5521,69 +5568,28 @@ msgstr "????? ?????"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "????? ?????"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "????? ????"
-
 #, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-"%s\n"
-"%s? %s"
-
-#, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "[????? ???]"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "????? ????"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "??????"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
 #, fuzzy, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "??????"
+msgid "Unknown error (%d)"
+msgstr "????? ????"
 
-#, fuzzy, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "??????"
-
-#, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "??????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-#, fuzzy
-msgid "Unable to rename group"
-msgstr "??????"
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5656,6 +5662,10 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Unknown error."
+msgstr "????? ????"
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5676,6 +5686,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5712,14 +5730,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 msgid "Delete Buddy from Address Book?"
 msgstr ""
 
@@ -5749,6 +5759,54 @@ msgstr ""
 msgstr ""
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+"%s\n"
+"%s? %s"
+
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "??????"
+
+#, fuzzy, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "??????"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "??????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "??????"
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5782,6 +5840,8 @@ msgstr "??????"
 msgstr "??????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "[????? ???]"
@@ -5831,12 +5891,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "??? ????? ??"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6167,10 +6230,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "??? ????? ??"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6377,6 +6436,25 @@ msgstr "?????"
 msgid "Server port"
 msgstr "?????"
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr " ??????? ????? ??"
+
+msgid "Incorrect password."
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "????? ?????"
@@ -6677,15 +6755,32 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "????? ??"
 
-msgid "Incorrect password."
-msgstr ""
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6694,23 +6789,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr ""
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6727,20 +6815,6 @@ msgstr "??"
 msgid "_OK"
 msgstr "??"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -7202,6 +7276,7 @@ msgstr "??? ?????..."
 msgid "Set User Info (web)..."
 msgstr "??? ?????..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "????? ??? ???"
@@ -7235,6 +7310,9 @@ msgstr "??? ????"
 msgid "Search for Buddy by Information"
 msgstr "??? ????"
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9590,10 +9668,6 @@ msgstr "??????"
 msgid "Auth Domain"
 msgstr "??????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9617,6 +9691,38 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "??????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "??? ????? ??"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "????? (_U)"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??? ????? ??"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9728,7 +9834,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 #, fuzzy
@@ -10507,16 +10613,19 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "?IRC ????"
+msgid "A_ccount"
+msgstr ""
+"\n"
+"<b>??? ???</b>"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr ""
+#, fuzzy
+msgid "Room _List"
+msgstr "?IRC ????"
 
 #, fuzzy
 msgid "_Block"
@@ -11008,6 +11117,110 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "???? ???"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "????? ???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???? ???"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "???? ???"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "???"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "???? ???"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "???"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?????? (_M)"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11546,6 +11759,10 @@ msgstr ""
 msgid "Hungarian"
 msgstr ""
 
+#, fuzzy
+msgid "Armenian"
+msgstr "??? ????"
+
 msgid "Indonesian"
 msgstr ""
 
@@ -11649,6 +11866,9 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "?????"
@@ -12079,11 +12299,9 @@ msgstr "???? ?????... 
 msgid "Save Image"
 msgstr "???? ?????... (_S)"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "???? ?????... (_S)"
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12176,10 +12394,6 @@ msgstr "???? ??? ???
 msgstr "???? ??? ???"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "???? ???"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "???? ???"
 
@@ -12480,6 +12694,9 @@ msgstr ""
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr ""
+
 #, fuzzy
 msgid "_Buddy name:"
 msgstr "??? ????"
@@ -12598,9 +12815,15 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13196,6 +13419,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "???? ??? ???"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13425,6 +13652,72 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "??? ?????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??? ????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "???? ??? ???"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "????? ??? ?? ?????..."
+
+msgid "Gateway"
+msgstr ""
+
+#, fuzzy
+msgid "Directory"
+msgstr "?????"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "????"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "??? (_B)"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "??? ?????"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?Jabber ???? %s"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13927,12 +14220,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13943,6 +14230,10 @@ msgstr "??? ?????"
 msgid "Highlighted Message Name Color"
 msgstr "??? ?????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "???? ?? ??"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13974,36 +14265,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "???? ????"
+msgid "Disable Typing Notification Text"
+msgstr "???? ?? ??"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "???"
+
 msgid "Fonts"
 msgstr "???? ????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -14139,12 +14417,116 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr ""
+"\n"
+"<b>??? ???</b>"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "??? ?????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???"
+
+#, fuzzy
+msgid "Founder"
+msgstr "???"
+
+#, fuzzy
+msgid "Operator"
+msgstr "???"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "???"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "?IRC ????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??? ????"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "???? ?????? (Plugins)"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "???? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "??? ???"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????? ??? ?? ?????..."
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "??? ???"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "??? ????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "??? ????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -14351,6 +14733,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "???? ????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "(1 ?????)"
 
@@ -14476,10 +14862,6 @@ msgstr ""
 #~ msgstr "??????"
 
 #, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "?Jabber ???? %s"
-
-#, fuzzy
 #~ msgid "<b>ChangeLog:</b><br>%s"
 #~ msgstr "<b>????</b> %s"
 
@@ -14586,12 +14968,6 @@ msgstr ""
 #~ msgstr "?????? (_M)"
 
 #, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>??? ???</b>"
-
-#, fuzzy
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "??????"
 
@@ -14849,10 +15225,6 @@ msgstr ""
 #~ msgid "_Preferences"
 #~ msgstr "?????"
 
-#, fuzzy
-#~ msgid "_Browse"
-#~ msgstr "??? (_B)"
-
 #~ msgid "Style"
 #~ msgstr "????"
 
@@ -14862,9 +15234,6 @@ msgstr ""
 #~ msgid "Face"
 #~ msgstr "???? ??? ???"
 
-#~ msgid "Color"
-#~ msgstr "???"
-
 #~ msgid "Window"
 #~ msgstr "????"
 
============================================================
--- po/ar.po	b7dedf6c3403d01b3d22e39024ede26200255f1d
+++ po/ar.po	b867abf2b11c845a8eb973414516914faa06afce
@@ -11,7 +11,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:36-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-11-01 17:41+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny at eglug.org>\n"
 "Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -1753,6 +1753,8 @@ msgstr "+++ %s ???"
 msgid "+++ %s signed off"
 msgstr "+++ %s ???"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "???? ?????"
 
@@ -2151,6 +2153,10 @@ msgstr "(%s) %s <??-??????>: %s\
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <??-??????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??? ?? ????? ???????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "??? ?????? %s? ????? ??? ??????? ????? %s."
@@ -3108,6 +3114,11 @@ msgstr "?_?? ???????:"
 msgid "Chat _name:"
 msgstr "?_?? ???????:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "????? ??????? ????????."
+
 msgid "Chat error"
 msgstr "???? ?? ???????"
 
@@ -3156,6 +3167,10 @@ msgstr "?????? Gadu-Gadu "
 msgid "Gadu-Gadu User"
 msgstr "?????? Gadu-Gadu "
 
+#, fuzzy
+msgid "GG server"
+msgstr "???? ??????? ..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "??? ?????: %s"
@@ -3198,7 +3213,8 @@ msgstr "???? ??_??:"
 msgid "_Password:"
 msgstr "???? ??_??:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "?? ???? ????? ???????? ?? IRC ?? ???? ????? ?????"
 
 #. 1. connect to server
@@ -3700,6 +3716,9 @@ msgstr "?? ?????? ???????
 msgid "Server does not use any supported authentication method"
 msgstr "?? ?????? ??????? ?? ????? ??????? ??????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "??? ????? ??????? ??????? ????? ??? ????? ??? ???????."
+
 msgid "Invalid challenge from server"
 msgstr "???? ??? ???? ?? ???????"
 
@@ -3969,6 +3988,14 @@ msgstr "????"
 msgid "Resource"
 msgstr "????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "????? ??????"
+
 msgid "Middle Name"
 msgstr "????? ??????"
 
@@ -4135,9 +4162,18 @@ msgstr "???? ?? ?????"
 msgid "Find Rooms"
 msgstr "???? ?? ?????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "??? ????? ??????? ??????? ????? ??? ????? ??? ???????."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??????:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "?? ???? ???????? ???????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??????"
+
 msgid "Ping timeout"
 msgstr "???? ?????"
 
@@ -4157,7 +4193,7 @@ msgstr "???? XMPP ??? ?????.
 msgstr "???? XMPP ??? ?????. ??? ????? ??????."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "??? ??????? ????????."
 
 #, c-format
@@ -4184,9 +4220,6 @@ msgstr "??? ????? ???????
 msgid "Unregistration Failed"
 msgstr "??? ????? ???????"
 
-msgid "Already Registered"
-msgstr "???? ??????"
-
 msgid "State"
 msgstr "???????"
 
@@ -4199,6 +4232,9 @@ msgstr "???????"
 msgid "Date"
 msgstr "???????"
 
+msgid "Already Registered"
+msgstr "???? ??????"
+
 msgid "Unregister"
 msgstr "??? ???????"
 
@@ -4226,6 +4262,10 @@ msgstr "???? ???????"
 msgid "Change Registration"
 msgstr "???? ???????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "??? ??????? ????????."
+
 msgid "Error unregistering account"
 msgstr "??? ?? ????? ????? ??????"
 
@@ -4600,16 +4640,18 @@ msgstr ""
 "ban &lt;user&gt; [reason]:\n"
 "???? ??????? ?? ??????."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;:\n"
 "???? ????? ????????? ???????."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;:\n"
 "??? ??? ?????? ?? ????."
@@ -4681,6 +4723,9 @@ msgstr "????? ??? ???????
 msgid "File transfer proxies"
 msgstr "????? ??? ???????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5074,6 +5119,10 @@ msgstr "??????? ??? ?????
 msgid "Non-IM Contacts"
 msgstr "??????? ??? ??????? ??????"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "???? ???? %s ???? ?????? ??? ????? ???? ?????? ???."
+
 msgid "Nudge"
 msgstr "????"
 
@@ -5420,63 +5469,26 @@ msgstr "??????? ????? Window
 msgstr "??????? ????? Windows Live: ?? ??? ????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ???? ?????? ?????."
-
-msgid "Unknown error."
-msgstr "??? ?????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ??? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ???? ?? ????"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "???? ????? (%d)"
 
 msgid "Unable to add user"
 msgstr "?????? ????? ??????"
 
-msgid "The following users are missing from your addressbook"
-msgstr "?????????? ???????? ?????? ?? ???? ???????"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "?????? ????? ?????? ??? %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "???? ????? (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "????? ??? ?????? ??? %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "?????????? ???????? ?????? ?? ???? ???????"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "????? ?????? ??????? ??? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "?? ???? ????? %s ??? ????? ??????? ??????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ??? ???? ???? ???? ????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "?????? ??? ????? ??????."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "?? ????? ????? ??????? ????? ????? ???."
 
-msgid "Unable to rename group"
-msgstr "????? ????? ??? ????????"
-
-msgid "Unable to delete group"
-msgstr "????? ??? ????????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5579,6 +5591,9 @@ msgstr "????? ??????? ?? M
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "????? ??????? ?? MSN ??? ????? ??????. ?? ???? ????? ? ???? ??? ?????."
 
+msgid "Unknown error."
+msgstr "??? ?????."
+
 msgid "Handshaking"
 msgstr "????????"
 
@@ -5597,6 +5612,14 @@ msgstr "???? ??? ????? ??? msgid "Retrieving buddy list"
 msgstr "???? ??? ????? ????????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "???? ???? %s ???? ?????? ??? ????? ???? ?????? ???."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "???? ???? %s ???? ?????? ??? ????? ???? ?????? ???."
+
 msgid "Away From Computer"
 msgstr "???? ?? ???????"
 
@@ -5635,14 +5658,6 @@ msgstr "??????? ???? ????
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "??????? ???? ???? ?? ???? ????? ??? ?????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ????? ??? ????? ???????."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ???? ?? ????? ???????."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "????? ?????? ?? ???? ?????????"
 
@@ -5672,6 +5687,51 @@ msgstr "????? ???????? MSN"
 msgstr "????? ???????? MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ???? ?????? ?????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ??? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "?????? ????? ?????? ??? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "????? ??? ?????? ??? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "????? ?????? ??????? ??? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "?? ???? ????? %s ??? ????? ??????? ??????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ??? ???? ???? ???? ????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "?????? ??? ????? ??????."
+
+msgid "Unable to rename group"
+msgstr "????? ????? ??? ????????"
+
+msgid "Unable to delete group"
+msgstr "????? ??? ????????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ????? ??? ????? ???????."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ???? ?? ????? ???????."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "?? ??????? ????: %s"
 
@@ -5703,6 +5763,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "????? ???? ?????"
 
@@ -5763,17 +5825,19 @@ msgstr "??? ????????? ???
 msgid "Protocol error, code %d: %s"
 msgstr "??? ????????? ??? %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "?%s ???? ???? ????? ?? %d ???? ???? ?? %d ??? ????? ????????? ? MySpaceIM. ?? "
 "???? ???? ???? ???? ??? http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword ?? ???? ????????."
 
+msgid "Incorrect username or password"
+msgstr "??? ???? ?? ???? ?? ??? ?????"
+
 msgid "MySpaceIM Error"
 msgstr "??? ?? MySpaceIM"
 
@@ -6087,9 +6151,6 @@ msgstr "??????? ??????? ?
 msgid "Master archive is misconfigured"
 msgstr "??????? ??????? ??? ?????"
 
-msgid "Incorrect username or password"
-msgstr "??? ???? ?? ???? ?? ??? ?????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr " ?? ???? ?????? ????? ??? ???????? ??????"
 
@@ -6295,6 +6356,28 @@ msgstr "???? ???????"
 msgid "Server port"
 msgstr "???? ???????"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "????? ??????? ??? ??????? ?? ????? HTTP."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"??? ???????? ? ????? ???? ????? ?? ??? ???? ???. ????? ??? ????? ????? "
+"?????. ??? ??????? ?? ???????? ???? ??????? ?? ???????? ??? ????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "??? ????? ??????? %s"
+
+msgid "Incorrect password."
+msgstr "???? ?? ???."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "????? ???????? ????? ???????"
 
@@ -6595,14 +6678,31 @@ msgstr ""
 "????? ???? ????? ?? ?? ???? ???? ? ???? ??? ????? ? ?????? ? ??????? ?? "
 "?????? ???."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "?? ????? ?????? ?????. ???? %s ?????????."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "????? ??? ?????? ???? ????? ??? AIM."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "?? ????? ?????? ?????. ???? %s ?????????."
+
+msgid "Unable to get a valid login hash."
+msgstr "????? ??? ?????? ???? ?????."
+
+msgid "Could Not Connect"
+msgstr "????? ???????"
+
+msgid "Received authorization"
+msgstr "???????? ?????????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "??? ?????? ??? ????"
 
-msgid "Incorrect password."
-msgstr "???? ?? ???."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "????? ??????? ?????."
@@ -6611,25 +6711,19 @@ msgstr "???? ?????? AOL ???
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "???? ?????? AOL ?????? ??? ????? ??????."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "?????? ?????? ???? ???????? ????? ????. ?? ???? ???? ?? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "??? ???????? ? ????? ???? ????? ?? ??? ???? ???. ????? ??? ????? ????? "
 "?????. ??? ??????? ?? ???????? ???? ??????? ?? ???????? ??? ????."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "?????? ?????? ???? ???????? ????? ????. ?? ???? ???? ?? %s"
-
-msgid "Could Not Connect"
-msgstr "????? ???????"
-
-msgid "Received authorization"
-msgstr "???????? ?????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "????? SecurID ?????? ??? ????."
 
@@ -6645,20 +6739,6 @@ msgstr "_?????"
 msgid "_OK"
 msgstr "_?????"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "?? ????? ?????? ?????. ???? %s ?????????."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "????? ??? ?????? ???? ????? ??? AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "?? ????? ?????? ?????. ???? %s ?????????."
-
-msgid "Unable to get a valid login hash."
-msgstr "????? ??? ?????? ???? ?????."
-
 msgid "Password sent"
 msgstr "??????? ???? ????"
 
@@ -7174,6 +7254,7 @@ msgstr "?? ??????? ??????
 msgid "Set User Info (web)..."
 msgstr "?? ??????? ???????? (???)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "???? ???? ???? (???)"
 
@@ -7203,6 +7284,10 @@ msgstr "???? ?? ???? ????? msgid "Search for Buddy by Information"
 msgstr "???? ?? ???? ?????? ?????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "?? ???? ????????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9517,10 +9602,6 @@ msgstr "?????? ?? ??????"
 msgid "Auth Domain"
 msgstr "?????? ?? ??????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "???? ???? %s ???? ?????? ??? ????? ???? ?????? ???."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9544,6 +9625,40 @@ msgstr "???? ????? ????"
 msgid "Add buddy rejected"
 msgstr "???? ????? ????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "??????? ?????? ??? ????? ??? ??????? ????????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "???? ???? ??? ?????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??? ????? ??? %d. ?????? ?? ???? ?????! ??? ???? ?? ???? ??? ???????."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "???????? ??? ?????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??? ????? ??? %d. ?????? ?? ???? ?????! ??? ???? ?? ???? ??? ???????."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??? ???? ?? ???? ?? ??? ?????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9652,8 +9767,8 @@ msgstr "???? Doodling"
 msgid "Start Doodling"
 msgstr "???? Doodling"
 
-msgid "Activate which ID?"
-msgstr "?? ???? ???????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?? ??? ??? ????????"
@@ -10468,16 +10583,17 @@ msgstr "?? ???? ????? ???? msgid "Please update the necessary fields."
 msgstr "?? ???? ????? ?????? ?????????."
 
-msgid "Room _List"
-msgstr "????? ??_???"
+#, fuzzy
+msgid "A_ccount"
+msgstr "??????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "?? ???? ???? ????????? ???????? ??? ??????? ???? ??? ???????? ???.\n"
 
-msgid "_Account:"
-msgstr "_????:"
+msgid "Room _List"
+msgstr "????? ??_???"
 
 msgid "_Block"
 msgstr "??_??"
@@ -10917,6 +11033,111 @@ msgstr "/????????/???? ??? msgid "/Buddies/Sort Buddies"
 msgstr "/????????/???? ????????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "??? ???????"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "??? ???????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "???? ??? ???????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "???_?"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "???? ??? ???????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "??????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??? ????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "?? ??????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "??????? ???????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "???? ??????? ???????? ???? %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "????? SSL"
@@ -11423,6 +11644,10 @@ msgstr "?????"
 msgid "Hungarian"
 msgstr "?????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "???????"
+
 msgid "Indonesian"
 msgstr "?????????"
 
@@ -11521,6 +11746,9 @@ msgstr "??????"
 msgid "Swedish"
 msgstr "??????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "???????"
 
@@ -11956,11 +12184,9 @@ msgstr "???? ??????"
 msgid "Save Image"
 msgstr "???? ??????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "?_??? ??????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "?_?? ???? ?????..."
 
@@ -12045,9 +12271,6 @@ msgstr "??? ????"
 msgid "Font Face"
 msgstr "??? ????"
 
-msgid "Background Color"
-msgstr "??? ???????"
-
 msgid "Foreground Color"
 msgstr "??? ???????"
 
@@ -12380,6 +12603,9 @@ msgstr "????? ??? ??"
 msgid "Pounce on Whom"
 msgstr "????? ??? ??"
 
+msgid "_Account:"
+msgstr "_????:"
+
 msgid "_Buddy name:"
 msgstr "?_?? ??????:"
 
@@ -12490,9 +12716,18 @@ msgstr "??? ????? ?????. ?
 msgid "Unknown.... Please report this!"
 msgstr "??? ????? ?????. ?? ???? ???? ?? ???!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "??? ?? ??? ???? ???????."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "??? ?? ??? ???? ???????."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "??? ?? ??? ???? ???????."
+
 msgid "Install Theme"
 msgstr "???? ??????"
 
@@ -13053,6 +13288,10 @@ msgstr "???? ?????????"
 msgstr "???? ?????????"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "???? ?????"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "?????? ??? ???_????? ???? ??????:"
 
@@ -13272,6 +13511,78 @@ msgstr "???? ??????? ????
 msgid "Displays statistical information about your buddies' availability"
 msgstr "???? ??????? ??????? ?? ????? ???????"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "????? ???????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "???? ??? ????? ??????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "???? ????? ?????? ?????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "??????? ??? ????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "???? ????? ????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "???? ?????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "???? ?????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "?????? ??????"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "???? PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "??????? ?????? ??????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "??_?????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "???????? ??? ?????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "?? ?????? ??????? ?? ????? ??????? ??????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "??????? ?????? ??????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "???? ??? ??????? ?? ????? ?????? ? ????? XMPXMPPP."
+
 msgid "Buddy is idle"
 msgstr "?????? ????"
 
@@ -13767,12 +14078,6 @@ msgstr ""
 "- ???? ?? ???? ??????.\n"
 "- ???? ????? ??? ??????? ?? ???? ??????."
 
-msgid "Cursor Color"
-msgstr "??? ???????"
-
-msgid "Secondary Cursor Color"
-msgstr "??? ?????? ???????"
-
 msgid "Hyperlink Color"
 msgstr "??? ??????? ???????"
 
@@ -13782,6 +14087,10 @@ msgstr "??? ??? ??????? ?? msgid "Highlighted Message Name Color"
 msgstr "??? ??? ??????? ????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "????? ???????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "???? GtkTreeView ??????"
 
@@ -13811,35 +14120,24 @@ msgstr "???? ???????? ???
 msgid "GTK+ Text Shortcut Theme"
 msgstr "???? ???????? ???+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "????? ???????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??????? ??????? ?????"
 
-msgid "Widget Sizes"
-msgstr "????? ??????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "?????? ????? ???+ ????????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "????"
+
 msgid "Fonts"
 msgstr "??????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "????? ??? Gtkrc"
 
@@ -13976,12 +14274,119 @@ msgstr "?????? ???? ?? ??? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "?????? ???? ?? ??????? ??????? ???? ?????? ???????? ???????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "?? ???"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "?? ???"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???? ??????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "??? ???????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "???"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "???????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "???? ?????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "????? ???????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "???? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "?????? ???? ???????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "???? ????????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "?????? ????? ???+ ????????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "??????? ???????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????? ????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????? ????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "?????? ????? ???+ ????????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "?????? ????? ???+ ????????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "????? ????????"
 
@@ -14184,6 +14589,21 @@ msgstr "???? ??? ??????? ? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "???? ??? ??????? ?? ????? ?????? ? ????? XMPXMPPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "?? ???? ???????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "??? ???????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??? ?????? ???????"
+
+#~ msgid "Interface colors"
+#~ msgstr "????? ???????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "????? ??????"
+
 #~ msgid "Invite message"
 #~ msgstr "????? ??????"
 
============================================================
--- po/az.po	98682824d764cd30302c119d4b3c076aa5b8cdd5
+++ po/az.po	4572d8ccb1549ab025fb9d3489df919158d04e75
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:36-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2004-06-28 14:03+0300\n"
 "Last-Translator: Metin Amiroff <metin at karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az at lists.sourceforge.net>\n"
@@ -1818,6 +1818,8 @@ msgstr "%s x?td?n ??xd?"
 msgid "+++ %s signed off"
 msgstr "%s x?td?n ??xd?"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nam?lum x?ta"
 
@@ -2192,6 +2194,10 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "MOTD g?st?ril? bilmir"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3189,7 +3195,12 @@ msgstr "Soyad:"
 msgid "Chat _name:"
 msgstr "Soyad:"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "Oxuna bilm?di"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "Oxuma x?tas?"
 
@@ -3245,6 +3256,10 @@ msgstr "Pidgin ?stifad??isi"
 msgid "Gadu-Gadu User"
 msgstr "Pidgin ?stifad??isi"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Peycer qov?a??"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nam?lum a?mr: %s"
@@ -3289,7 +3304,7 @@ msgstr "?_ifr?:"
 msgid "_Password:"
 msgstr "?_ifr?:"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3726,6 +3741,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -4009,6 +4027,14 @@ msgstr "M?nb?"
 msgid "Resource"
 msgstr "M?nb?"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "%s x?td? girdi."
+
 msgid "Middle Name"
 msgstr "Orta Ad"
 
@@ -4180,10 +4206,19 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Yeni istifad??il?r q?bul edilmir"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rolu"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Ba?lant? bacar?lmad?"
 
@@ -4204,7 +4239,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Transfer ???n ba?lana bilm?di."
 
 #, c-format
@@ -4232,9 +4267,6 @@ msgstr "Ba?lant? bacar?lmad?"
 msgid "Unregistration Failed"
 msgstr "Ba?lant? bacar?lmad?"
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr ""
 
@@ -4247,6 +4279,9 @@ msgstr "Tarix"
 msgid "Date"
 msgstr "Tarix"
 
+msgid "Already Registered"
+msgstr ""
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Qeyd Et"
@@ -4276,6 +4311,10 @@ msgstr "S?hv ?ifr?."
 msgid "Change Registration"
 msgstr "S?hv ?ifr?."
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Transfer ???n ba?lana bilm?di."
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4645,13 +4684,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4715,6 +4754,9 @@ msgstr "Fayl transfer portu"
 msgid "File transfer proxies"
 msgstr "Fayl transfer portu"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5112,6 +5154,10 @@ msgstr "Uzaqdan ?dar?"
 msgid "Non-IM Contacts"
 msgstr "Uzaqdan ?dar?"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5478,68 +5524,28 @@ msgstr "Ba?lant? bacar?lmad?"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Ba?lant? bacar?lmad?"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "Nam?lum x?ta"
-
 #, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr "%s siz? %s yollamaq ist?yir (%s)"
-
-#, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s siz? %s yollamaq ist?yir (%s)"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Nam?lum x?ta"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Oxuna bilm?di"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Nam?lum x?ta"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-#, fuzzy
-msgid "Unable to rename group"
-msgstr "Oxuna bilm?di"
-
-#, fuzzy
-msgid "Unable to delete group"
-msgstr "Otaq siyah?s? al?na bilm?di."
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5612,6 +5618,10 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Unknown error."
+msgstr "Nam?lum x?ta"
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5633,6 +5643,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5669,14 +5687,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "?nvan Kitab?as?na ?lav? Et"
@@ -5708,6 +5718,53 @@ msgstr "AIM/ICQ Protokol ?lav?si"
 msgstr "AIM/ICQ Protokol ?lav?si"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "%s siz? %s yollamaq ist?yir (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "Oxuna bilm?di"
+
+#, fuzzy
+msgid "Unable to delete group"
+msgstr "Otaq siyah?s? al?na bilm?di."
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5741,6 +5798,8 @@ msgstr "Transfer ???n ba?lana bilm?
 msgstr "Transfer ???n ba?lana bilm?di."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Uzaqdayam ?smar??lar?"
@@ -5791,12 +5850,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "S?hv ?ifr?."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6124,10 +6186,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "S?hv ?ifr?."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6329,6 +6387,25 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "MOTD g?st?ril? bilmir"
+
+msgid "Incorrect password."
+msgstr "S?hv ?ifr?."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Transfer ???n ba?lana bilm?di."
@@ -6621,15 +6698,33 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Otaq siyah?s? al?na bilm?di."
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "S?hv istifad??i ad?."
 
-msgid "Incorrect password."
-msgstr "S?hv ?ifr?."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6638,23 +6733,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr ""
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6671,21 +6759,6 @@ msgstr "Oldu"
 msgid "_OK"
 msgstr "Oldu"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Otaq siyah?s? al?na bilm?di."
-
 msgid "Password sent"
 msgstr ""
 
@@ -7136,6 +7209,7 @@ msgstr ""
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "S?hv ?ifr?."
@@ -7167,6 +7241,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9475,10 +9552,6 @@ msgstr "Avtomatik"
 msgid "Auth Domain"
 msgstr "Avtomatik"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9502,6 +9575,38 @@ msgstr "?laq? ?lav? edili?i r?dd e
 msgid "Add buddy rejected"
 msgstr "?laq? ?lav? edili?i r?dd edildi"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Transfer ???n ba?lana bilm?di."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "S?hv ?ifr?."
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Bu fayl m?vcud deyil."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "S?hv ?ifr?."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9608,9 +9713,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Hans? ID f?alla?d?r?ls?n?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "S?hb?tt? kim? qo?ulsun?"
@@ -10394,16 +10498,17 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "/Vasit?l?r/_Otaq Siyah?s?"
+msgid "A_ccount"
+msgstr "Hesab:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "_Hesab:"
+#, fuzzy
+msgid "Room _List"
+msgstr "/Vasit?l?r/_Otaq Siyah?s?"
 
 #, fuzzy
 msgid "_Block"
@@ -10887,6 +10992,111 @@ msgstr "_Alias..."
 msgid "/Buddies/Sort Buddies"
 msgstr "_Alias..."
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Arxa plan r?ngi"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Giri? Se?iml?ri"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Arxa plan r?ngi"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Geni?l?t"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Arxa plan r?ngi"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Y??camla?d?r"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Arxa plan r?ngi"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Q?sa Yollar"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "X?td?"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Uzaqda"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?laq?l?r"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "M?tn"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?smar??"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11421,6 +11631,10 @@ msgstr "Macar Dili"
 msgstr "Macar Dili"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Rum?n Dili"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Makedon Dili"
 
@@ -11526,6 +11740,9 @@ msgstr "?sve? Dili"
 msgid "Swedish"
 msgstr "?sve? Dili"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -11954,11 +12171,9 @@ msgstr ""
 msgid "Save Image"
 msgstr ""
 
-#, c-format
 msgid "_Save Image..."
 msgstr ""
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12045,10 +12260,6 @@ msgstr "Yaz? N?v?"
 msgstr "Yaz? N?v?"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Arxa plan r?ngi"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "M?tn r?ngi"
 
@@ -12374,6 +12585,9 @@ msgstr ""
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_Hesab:"
+
 msgid "_Buddy name:"
 msgstr ""
 
@@ -12494,9 +12708,16 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "S?hb?t? qo?ula bilm?di"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13084,6 +13305,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "?laq?ni Se?"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13314,7 +13539,73 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
 #, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "0 bayt b?y?kl?y?nd? fayl g?nd?ril? bilm?z."
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Yahoo! T?sstiql?nm?si Bacar?lmad?"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "_Alias..."
+
+#, fuzzy
+msgid "Gateway"
+msgstr "%s uzaqla?d?"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Bunu axtar:"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?zahat"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "_Bunu axtar:"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "S?yyah"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Fayl transfer qov?a??"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Jabber Profili"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "?laq? h?r?k?tsizdir:"
 
@@ -13828,12 +14119,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13843,6 +14128,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Bildiri?in Sonland?r?lmas?"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13875,37 +14164,25 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ara ?z"
+msgid "Disable Typing Notification Text"
+msgstr "Yeni m?ktub bildiri?l?ri"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin Fayl ?dar?si"
 
 #, fuzzy
+msgid "Colors"
+msgstr "Ba?la"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "Hesablar"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin Fayl ?dar?si"
@@ -14048,12 +14325,118 @@ msgstr ""
 "Bildirdiyiniz qaydalara g?r? g?nd?ril?n ismar??lardak? b?zi m?tnl?ri ?v?z "
 "ed?r."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Zephyr il? onsuz da x?td?siniz"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s x?td?n ??xd?."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "S?hb?t Qo?ul"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "N?z?r Alma"
+
+#, fuzzy
+msgid "Founder"
+msgstr "saat"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?laq? r?dd edilsin?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "X?ta"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??xsi M?lumat"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "_X?b?rdarl?q G?st?r"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "V?ziyy?t"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "S?hb?t Ota?? Siyah?s? ?nvan?"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "S?hv ?ifr?."
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin Fayl ?dar?si"
+
+#, fuzzy
+msgid "Contact"
+msgstr "?laq? N?vb?si"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?laq? h?r?k?tsizdir:"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?laq? h?r?k?tsizdir:"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin Fayl ?dar?si"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin Fayl ?dar?si"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "?f?qi ?laq? Siyah?s?"
 
@@ -14263,6 +14646,14 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Hans? ID f?alla?d?r?ls?n?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ara ?z"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "(1 ismar??)"
 
@@ -14434,10 +14825,6 @@ msgstr ""
 #~ msgstr "_Yenid?n ba?lan"
 
 #, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "Jabber Profili"
-
-#, fuzzy
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
@@ -14599,10 +14986,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_?smar??:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Hesab:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "X?td?n ??x?? X?talar?n? Gizl?t"
 
@@ -14973,9 +15356,6 @@ msgstr ""
 #~ msgid "Please enter your password"
 #~ msgstr "Xahi? edirik ?ifr?nizi bildirin"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s x?td?n ??xd?."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
============================================================
--- po/be at latin.po	12a1747ecac53e691ca9d26af6d6b4e453f22c85
+++ po/be at latin.po	5a9aa945e940d12da9e5734c9ca914fe432f88ea
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:36-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-03-29 21:08+0200\n"
 "Last-Translator: YOUR NAME <E-MAIL at ADDRESS>\n"
 "Language-Team: Belarusian Latin <be-latin.open-tran.eu>\n"
@@ -1773,6 +1773,8 @@ msgstr "+++ %s vychodzi?"
 msgid "+++ %s signed off"
 msgstr "+++ %s vychodzi?"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nieviadomaja pamy?ka"
 
@@ -2176,6 +2178,10 @@ msgstr "(%s) %s <A?TA-ADKAZ>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <A?TA-ADKAZ>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Pamy?ka stvare?nia spa?u?e?nia"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Ty karystaje?sia %s, ale hety plugin vymahaje %s."
@@ -3155,6 +3161,11 @@ msgstr "Nazva _hutarki:"
 msgid "Chat _name:"
 msgstr "Nazva _hutarki:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Niemah?yma spa?u?ycca z serveram."
+
 msgid "Chat error"
 msgstr "Pamy?ka hutarki"
 
@@ -3203,6 +3214,10 @@ msgstr "Karystalnik Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Karystalnik Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Akre?l ?viestki karystalnika..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nieviadomy zahad: %s"
@@ -3245,7 +3260,8 @@ msgstr "_Parol:"
 msgid "_Password:"
 msgstr "_Parol:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Mianu?ki IRC nia mohu? utrymva? prabie?a?"
 
 #. 1. connect to server
@@ -3719,6 +3735,9 @@ msgstr "Server nie ??yvaje nivodzin z 
 msgid "Server does not use any supported authentication method"
 msgstr "Server nie ??yvaje nivodzin z padtrymanych metada? a?taryzacyi"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Ty vymahaje? ?yfrava?nia, ale server nia ?mieje hetaha."
+
 msgid "Invalid challenge from server"
 msgstr "Niapravilny vyklik ad servera"
 
@@ -3989,6 +4008,14 @@ msgstr "Resurs"
 msgid "Resource"
 msgstr "Resurs"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Uvaj?o?/Uvaj??a"
+
 msgid "Middle Name"
 msgstr "Siaredniaje imia"
 
@@ -4156,9 +4183,18 @@ msgstr "?ukaj pakoi"
 msgid "Find Rooms"
 msgstr "?ukaj pakoi"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Ty vymahaje? ?yfrava?nia, ale server nia ?mieje hetaha."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Nia znojdziena takich karystalnika?"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rola"
+
 msgid "Ping timeout"
 msgstr "Termin ?aka?nia pingu"
 
@@ -4178,7 +4214,7 @@ msgstr "Niapravilny XMPP ID. Treba akre? msgstr "Niapravilny XMPP ID. Treba akre?li? damen."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Pamy?ka spa?u?e?nia z serveram."
 
 #, c-format
@@ -4205,9 +4241,6 @@ msgstr "Pamy?ka skasava?nia rehistracy
 msgid "Unregistration Failed"
 msgstr "Pamy?ka skasava?nia rehistracyi"
 
-msgid "Already Registered"
-msgstr "U?o zarehistravany"
-
 msgid "State"
 msgstr "Stan"
 
@@ -4220,6 +4253,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "U?o zarehistravany"
+
 msgid "Unregister"
 msgstr "Skasuj rehistracyju"
 
@@ -4247,6 +4283,10 @@ msgstr "?miani rehistracyju"
 msgid "Change Registration"
 msgstr "?miani rehistracyju"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Pamy?ka spa?u?e?nia z serveram."
+
 msgid "Error unregistering account"
 msgstr "Pamy?ka skasava?nia rehistracyi"
 
@@ -4610,16 +4650,18 @@ msgstr "ban &lt;karystalnik&gt; [pry?yn
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;karystalnik&gt; [pry?yna]:  Zaba? karystalnika ? pakoi."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;karystalnik&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Akre?l suvia? karystalnika z pakojem."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;karystalnik&gt; &lt;moderator|participant|visitor|none&gt;: Akre?l "
 "rolu karystalnika ? pakoi."
@@ -4684,6 +4726,9 @@ msgstr "Proxy dla pierada?y faj?a?"
 msgid "File transfer proxies"
 msgstr "Proxy dla pierada?y faj?a?"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5087,6 +5132,11 @@ msgstr "Vydali kantakt"
 msgid "Non-IM Contacts"
 msgstr "Vydali kantakt"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s zapra?aje ciabie ? Web-kamernuju hutarku, jakaja pakul nie padtrymvajecca."
+
 msgid "Nudge"
 msgstr "?turchni"
 
@@ -5438,65 +5488,28 @@ msgstr "A?taryzacyja Windows Live ID: N
 msgstr "A?taryzacyja Windows Live ID: Niemah?yma spa?u?ycca"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nie ?ja?lajecca pravilnaj hrupaj."
-
-msgid "Unknown error."
-msgstr "Nieviadomaja pamy?ka."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ?turchaje ciabie!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Nieviadomaja pamy?ka (%d)"
 
 msgid "Unable to add user"
 msgstr "Niemah?yma dada? karystalnika"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Nieviadomaja pamy?ka (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Vo? vyniki tvajho po?uku"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Niemah?yma dada? karystalnika na %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Niemah?yma zablakava? karystalnika na %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Niemah?yma da? dazvo? karystalniku na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Niemah?yma dada? %s, bo tvoj ?pis siabro? zapo?nieny."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nie ?ja?lajecca pravilnym kontam pa?partu."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Servis ?asova niedastupny."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Paviedamle?nie nie das?anaje, bo ty nie ?vaj?o?."
 
-msgid "Unable to rename group"
-msgstr "Niemah?yma ?miani? nazvu dla hrupy"
-
-msgid "Unable to delete group"
-msgstr "Niemah?yma vydali? hrupu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5591,6 +5604,9 @@ msgstr ""
 msgstr ""
 "Tvoj ?pis siabro? MSN ?asova niedastupny. Kali ?aska, pa?akaj i pa?tary zno?."
 
+msgid "Unknown error."
+msgstr "Nieviadomaja pamy?ka."
+
 msgid "Handshaking"
 msgstr "Paciska?nie ruk"
 
@@ -5609,6 +5625,16 @@ msgstr "Atryma?nie ?pisu siabro?"
 msgid "Retrieving buddy list"
 msgstr "Atryma?nie ?pisu siabro?"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s zapra?aje ciabie ? Web-kamernuju hutarku, jakaja pakul nie padtrymvajecca."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s zapra?aje ciabie ? Web-kamernuju hutarku, jakaja pakul nie padtrymvajecca."
+
 msgid "Away From Computer"
 msgstr "Adyj?o? ad kamputara"
 
@@ -5651,14 +5677,6 @@ msgstr ""
 msgstr ""
 "Paviedamle?nie mo?a by? nie das?anym, bo adby?asia nieviadomaja pamy?ka:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s dadaje ciabie ? svoj ?pis siabro?."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s vydalaje ciabie sa svajho ?pisu siabro?."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Dadaj u adrasnuju knihu"
@@ -5690,6 +5708,51 @@ msgstr "Plugin pratako?u MSN"
 msgstr "Plugin pratako?u MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nie ?ja?lajecca pravilnaj hrupaj."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Niemah?yma dada? karystalnika na %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Niemah?yma zablakava? karystalnika na %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Niemah?yma da? dazvo? karystalniku na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Niemah?yma dada? %s, bo tvoj ?pis siabro? zapo?nieny."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nie ?ja?lajecca pravilnym kontam pa?partu."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servis ?asova niedastupny."
+
+msgid "Unable to rename group"
+msgstr "Niemah?yma ?miani? nazvu dla hrupy"
+
+msgid "Unable to delete group"
+msgstr "Niemah?yma vydali? hrupu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s dadaje ciabie ? svoj ?pis siabro?."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s vydalaje ciabie sa svajho ?pisu siabro?."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Niama takoha karystalnika: %s"
 
@@ -5721,6 +5784,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Novyja pa?tovyja paviedamle?ni"
 
@@ -5772,18 +5837,20 @@ msgstr "Pamy?ka pratako?u, kod %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Pamy?ka pratako?u, kod %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Tvoj parol sk?adajecca z %d znaka?, a heta bolej za mah?ymuju da??yniu "
 "parolu dla kontu MySpaceIM z %d znaka?. Skaraci svoj parol praz http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "i zno? pa?tary sprobu."
 
+msgid "Incorrect username or password"
+msgstr "Niapravilnyja nazva karystalnika albo parol"
+
 msgid "MySpaceIM Error"
 msgstr "Pamy?ka MySpaceIM"
 
@@ -6100,9 +6167,6 @@ msgstr "Ha?o?ny archi? kiepska skanfi
 msgid "Master archive is misconfigured"
 msgstr "Ha?o?ny archi? kiepska skanfihuravany"
 
-msgid "Incorrect username or password"
-msgstr "Niapravilnyja nazva karystalnika albo parol"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Niemah?yma pazna? host dla ?viedzienaj taboju nazvy karystalnika"
 
@@ -6320,6 +6384,28 @@ msgstr "Port servera"
 msgid "Server port"
 msgstr "Port servera"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Atrymany nie?akany adkaz HTTP ad servera."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Ty spa?u?a?sia j ad?u?a?sia nadta ?asta. Pa?akaj dziesia? chvilin i pa?tary "
+"zno?. Kali ty praciahnie? svaje sproby, tabie pryjdziecca pa?aka? ja??e bol?."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Pamy?ka zapytu znaku ?vachodu"
+
+msgid "Incorrect password."
+msgstr "Niapravilny parol."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Niemah?yma da?u?ycca da hutarki ? pakoi"
 
@@ -6624,14 +6710,31 @@ msgstr ""
 "pa?ynacca ? litary i ?trymliva? tolki litary, li?by j prabie?y, albo tolki "
 "li?by."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Ty mo?a? by? chutka ad?u?any. Pravier aktualna?? na %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Niemah?yma atryma? pravilny hash uvachodu dla AIM."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Ty mo?a? by? chutka ad?u?any. Pravier aktualna?? na %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "Niemah?yma atryma? pravilny hash uvachodu."
+
+msgid "Could Not Connect"
+msgstr "Niemah?yma spa?u?ycca"
+
+msgid "Received authorization"
+msgstr "Atrymanaja a?taryzacyja"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Niapravilnaja nazva."
 
-msgid "Incorrect password."
-msgstr "Niapravilny parol."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Tvoj kont dziejna ?sypleny."
@@ -6640,25 +6743,19 @@ msgstr "Servis AOL Instant Messenger'a ? msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Servis AOL Instant Messenger'a ?asova niedastupny."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Versija tvajho klijenta nadta staraja. Kali ?aska, abnavisia na %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Ty spa?u?a?sia j ad?u?a?sia nadta ?asta. Pa?akaj dziesia? chvilin i pa?tary "
 "zno?. Kali ty praciahnie? svaje sproby, tabie pryjdziecca pa?aka? ja??e bol?."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Versija tvajho klijenta nadta staraja. Kali ?aska, abnavisia na %s"
-
-msgid "Could Not Connect"
-msgstr "Niemah?yma spa?u?ycca"
-
-msgid "Received authorization"
-msgstr "Atrymanaja a?taryzacyja"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Akre?leny klu? SecurID niapravilny."
 
@@ -6674,20 +6771,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Ty mo?a? by? chutka ad?u?any. Pravier aktualna?? na %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Niemah?yma atryma? pravilny hash uvachodu dla AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Ty mo?a? by? chutka ad?u?any. Pravier aktualna?? na %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Niemah?yma atryma? pravilny hash uvachodu."
-
 msgid "Password sent"
 msgstr "Parol das?any"
 
@@ -7212,6 +7295,7 @@ msgstr "Akre?li ?viestki karystalnika 
 msgid "Set User Info (web)..."
 msgstr "Akre?li ?viestki karystalnika (u siecivie)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "?miani parol (u siecivie)"
 
@@ -7241,6 +7325,10 @@ msgstr "?ukaj siabra pavodle ?viestak"
 msgid "Search for Buddy by Information"
 msgstr "?ukaj siabra pavodle ?viestak"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Karystalnik nie ?vaj?o?"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9584,11 +9672,6 @@ msgstr "A?taryzuj damen"
 msgid "Auth Domain"
 msgstr "A?taryzuj damen"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s zapra?aje ciabie ? Web-kamernuju hutarku, jakaja pakul nie padtrymvajecca."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9613,6 +9696,44 @@ msgstr "Dada?nie siabra nie dazvolenaje
 msgid "Add buddy rejected"
 msgstr "Dada?nie siabra nie dazvolenaje"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Pry spa?u?e?ni z serveram atrymanyja niapravilnyja ?viestki."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Niapravilny parol"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Numar %d nieviadomaj pamy?ki. Naviedva?nie sajtu Yahoo! mo?a vypravi? hetuju "
+"prablemu."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Karystalnik nie isnuje"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Numar %d nieviadomaj pamy?ki. Naviedva?nie sajtu Yahoo! mo?a vypravi? hetuju "
+"prablemu."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Niapravilnyja nazva karystalnika albo parol"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9723,8 +9844,8 @@ msgstr "Pa?ni durnotu"
 msgid "Start Doodling"
 msgstr "Pa?ni durnotu"
 
-msgid "Activate which ID?"
-msgstr "Jaki ID aktyvizava??"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Da kaho da?u?ycca ? hutarcy?"
@@ -10525,8 +10646,9 @@ msgstr "Kali ?aska, aktualizuj patrebny
 msgid "Please update the necessary fields."
 msgstr "Kali ?aska, aktualizuj patrebnyja pali."
 
-msgid "Room _List"
-msgstr "?pis _pakoja?"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Kont"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10534,8 +10656,8 @@ msgstr ""
 msgstr ""
 "Akre?l adpaviednyja ?viestki ab hutarcy, u jakoj ty cho?a? pa?dzielni?a?.\n"
 
-msgid "_Account:"
-msgstr "_Kont:"
+msgid "Room _List"
+msgstr "?pis _pakoja?"
 
 msgid "_Block"
 msgstr "_Blakuj"
@@ -10976,6 +11098,112 @@ msgstr "/Siabry/Sartuj siabro?"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Siabry/Sartuj siabro?"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Fonavy koler"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Hetaja hrupa dadadzienaja ? tvoj ?pis siabro?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laoskaja"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Fonavy koler"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Razharni"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Abiary fonavy koler"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Zharni"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Abiary fonavy koler"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Paradkuj"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Spa?u?any"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Adyj?o?"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Ad?u?any"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tekst nastroju"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Das?anaje paviedamle?nie"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?miani ?viestki karystalnika dla %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servery SSL"
@@ -11483,6 +11711,10 @@ msgstr "Vuhorskaja"
 msgid "Hungarian"
 msgstr "Vuhorskaja"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumynskaja"
+
 msgid "Indonesian"
 msgstr "Indanezijskaja"
 
@@ -11581,6 +11813,9 @@ msgstr "?vedzkaja"
 msgid "Swedish"
 msgstr "?vedzkaja"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamilskaja"
 
@@ -12021,11 +12256,10 @@ msgstr "Zapi?y vyjavu"
 msgid "Save Image"
 msgstr "Zapi?y vyjavu"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Zapi?y vyjavu..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Pakazvaj asablivyja ??mie?ki"
 
@@ -12113,9 +12347,6 @@ msgstr "Vyhlad ?ryftu"
 msgid "Font Face"
 msgstr "Vyhlad ?ryftu"
 
-msgid "Background Color"
-msgstr "Fonavy koler"
-
 msgid "Foreground Color"
 msgstr "Koler tekstu"
 
@@ -12450,6 +12681,9 @@ msgstr "?yja za?epka"
 msgid "Pounce on Whom"
 msgstr "?yja za?epka"
 
+msgid "_Account:"
+msgstr "_Kont:"
+
 msgid "_Buddy name:"
 msgstr "Nazva _siabra:"
 
@@ -12560,9 +12794,18 @@ msgstr "Nieviadomaja padzieja dla za?ep
 msgid "Unknown.... Please report this!"
 msgstr "Nieviadomaja padzieja dla za?epki. Kali ?aska, adrapartuj ab hetym!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Pamy?ka raspakava?nia matyvu smaj?a?."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Pamy?ka raspakava?nia matyvu smaj?a?."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Pamy?ka raspakava?nia matyvu smaj?a?."
+
 msgid "Install Theme"
 msgstr "Zainstaluj maty?"
 
@@ -13133,6 +13376,10 @@ msgstr "Kira?nik sertyfikata?"
 msgstr "Kira?nik sertyfikata?"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Abiary siabra"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "U?yj hetuju siabro?skuju _ikonu dziela hetaha kontu:"
 
@@ -13358,6 +13605,78 @@ msgstr "Pakazvaje statystyku dastupna?c
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Pakazvaje statystyku dastupna?ci tvaich siabro?"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adras servera"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Akre?l server kanferencyj"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Abiary server kanferencyj dziela zapyta?"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online servisy"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Da?li ?pis siabro?"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Adychodzi?"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Kataloh loga?"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Vybar huku"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Pas?uha PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Apisa?nie"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?viestki ad znojdzienych pas?uhach"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Harta?:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Karystalnik nie isnuje"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server nie ??yvaje nivodzin z padtrymanych metada? a?taryzacyi"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?viestki ad znojdzienych pas?uhach"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Hety plugin u?yvajecca dziela debugava?nia servera? i klijenta? XMPP."
+
 msgid "Buddy is idle"
 msgstr "Siabra bia?dziejni?aje"
 
@@ -13863,12 +14182,6 @@ msgstr ""
 "- Pieravaro?vaje ?sie ?vachodnyja paviedamle?ni\n"
 "- Dasy?aje paviedamle?nie ludziam z tvajho ?pisu adrazu pa ichnym uvachodzie"
 
-msgid "Cursor Color"
-msgstr "Koler kursora"
-
-msgid "Secondary Cursor Color"
-msgstr "Druhi koler kursora"
-
 msgid "Hyperlink Color"
 msgstr "Koler hiperspasy?ki"
 
@@ -13879,6 +14192,10 @@ msgstr "Koler dla nazva? pad?vietlenyc
 msgid "Highlighted Message Name Color"
 msgstr "Koler dla nazva? pad?vietlenych paviedamle?nia?"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Koler infarmava?nia pra nabor tekstu"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Haryzantalny padzie? GtkTreeView"
 
@@ -13908,35 +14225,24 @@ msgstr "Maty? tekstavych skarota? GTK+
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Maty? tekstavych skarota? GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Kolery interfejsu"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Uklu?y infarmava?ni pra nabor tekstu"
 
-msgid "Widget Sizes"
-msgstr "Pamiery widgeta?"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kirava?nie matyvam GTK+ dla Pidgin'a"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Za?yni"
+
 msgid "Fonts"
 msgstr "?ryfty"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Faj?avaje pry?ad?dzie Gtkrc"
 
@@ -14081,12 +14387,119 @@ msgstr ""
 "Zamianiaje tekst u vychodnych paviedamle?niach zhodna z akre?lenymi "
 "karystalnikam pravi?ami."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Nie ?vaj?o?/uvaj??a"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Nie ?vaj?o?/uvaj??a"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Da?u?ysia da hutarki"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ihnaruj"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Hu?niej?aja"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "A?taryzacyja dadzienaja"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Pamy?ka"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "?viestki"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Dyjaloh zapytu"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Uzrovie? a?ciarohi"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status dla %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Lakalna?? pakoju hutarki"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Zapi?y ikonu"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kirava?nie matyvam GTK+ dla Pidgin'a"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kantaktnaja infarmacyja"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?pis siabro?"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?pis siabro?"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kirava?nie matyvam GTK+ dla Pidgin'a"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kirava?nie matyvam GTK+ dla Pidgin'a"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Siabro?ski ticker"
 
@@ -14291,6 +14704,21 @@ msgstr "Hety plugin u?yvajecca dziela d
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Hety plugin u?yvajecca dziela debugava?nia servera? i klijenta? XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Jaki ID aktyvizava??"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Koler kursora"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Druhi koler kursora"
+
+#~ msgid "Interface colors"
+#~ msgstr "Kolery interfejsu"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Pamiery widgeta?"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Usta? u paviedamle?nie"
@@ -14772,9 +15200,6 @@ msgstr "Hety plugin u?yvajecca dziela d
 #~ msgstr ""
 #~ "Tvaja pro?ba da?u?ycca da hrupy %d by?a zadavolenaja administrataram %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Hetaja hrupa dadadzienaja ? tvoj ?pis siabro?"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Ja pra?u da?u?e?nia"
 
@@ -14796,9 +15221,6 @@ msgstr "Hety plugin u?yvajecca dziela d
 #~ msgid "Enter your reason:"
 #~ msgstr "Akre?l pry?ynu:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Pamy?ka zapytu znaku ?vachodu"
-
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Niemah?yma ?vaj?ci. Pravier debugavy log."
 
============================================================
--- po/bg.po	7757e881de36ebb47ca26a2aa1ba6ced6d076d50
+++ po/bg.po	22f77bacb8997d4f776b2425f8240ac271c8c50f
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin-1.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-02-12 00:46+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <kaladan at gmail.com>\n"
 "Language-Team: Bulgarian <dict at fsa-bg.org>\n"
@@ -1843,6 +1843,8 @@ msgstr "%s ??????"
 msgid "+++ %s signed off"
 msgstr "%s ??????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????????? ??????"
 
@@ -2224,6 +2226,10 @@ msgstr "(%s) %s <??????????? 
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <??????????? ???????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?????? ??? ?????????????? ?? ????????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3216,6 +3222,11 @@ msgstr "???:"
 msgid "Chat _name:"
 msgstr "???:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "????????? ????????? ??? ???????."
+
 msgid "Chat error"
 msgstr "?????? ??? ?????????"
 
@@ -3264,6 +3275,10 @@ msgstr "?????????? ?? Gadu-G
 msgid "Gadu-Gadu User"
 msgstr "?????????? ?? Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???????? ????? ?? ??????????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "????????? ???????: %s"
@@ -3307,7 +3322,8 @@ msgstr "_??????:"
 msgid "_Password:"
 msgstr "_??????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "??????????????? ????? ? IRC ?? ???? ?? ???????? ?????????"
 
 #. 1. connect to server
@@ -3744,6 +3760,9 @@ msgstr "???????? ?? ?????
 msgid "Server does not use any supported authentication method"
 msgstr "???????? ?? ???????? ????? ????????? ????? ?? ?????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -4039,6 +4058,14 @@ msgstr "??? ?? ???????"
 msgid "Resource"
 msgstr "??? ?? ???????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???? ??? ??????? ?"
+
 msgid "Middle Name"
 msgstr "????? ???"
 
@@ -4210,10 +4237,19 @@ msgstr "??????? ?? ????"
 msgid "Find Rooms"
 msgstr "??????? ?? ????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "???? ????????? ???????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "???????? ?? ??????????"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "????????? ?????"
 
@@ -4234,7 +4270,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "????????? ????????? ??? ???????."
 
 #, c-format
@@ -4263,9 +4299,6 @@ msgstr "????????? ??????? msgid "Unregistration Failed"
 msgstr "????????? ???????????"
 
-msgid "Already Registered"
-msgstr "???? ??? ???????????"
-
 msgid "State"
 msgstr "?????????"
 
@@ -4279,6 +4312,9 @@ msgstr "????"
 msgid "Date"
 msgstr "????"
 
+msgid "Already Registered"
+msgstr "???? ??? ???????????"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "???????????"
@@ -4311,6 +4347,10 @@ msgstr "??????? ?? ??????
 msgstr "??????? ?? ?????? ??:"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "????????? ????????? ??? ???????."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "?????? ??? ??????? ??????? ??????????"
 
@@ -4686,13 +4726,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4756,6 +4796,9 @@ msgstr "???? ?? ??????? ?? msgid "File transfer proxies"
 msgstr "???? ?? ??????? ?? ???????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5160,6 +5203,10 @@ msgstr "????????? ?? ????
 msgid "Non-IM Contacts"
 msgstr "????????? ?? ???????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5533,66 +5580,29 @@ msgstr "????????? ??????? msgid "Windows Live ID authentication:Invalid response"
 msgstr "????????? ?????????????"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s ?? ? ??????? ?????."
-
-msgid "Unknown error."
-msgstr "????????? ??????:"
-
 #, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ???? ?? ?? ??????? %s (%s)"
-
-#, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ???? ?? ?? ??????? ????"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "????????? ??????"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "??????? ??? ????????? ?? ??????????? %s"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "??????? ??? ?????????? ?? ?????????? ? %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "??????? ??? ??????????? ?? ?????????? ? %s (%s)"
-
 #, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "?????? %s ?? ???? ?? ???? ???????."
+msgid "Unknown error (%d)"
+msgstr "????????? ??????"
 
-#, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ? ????????? ??? ?? ??????"
-
-msgid "Service Temporarily Unavailable."
-msgstr "???????? ???????? ?? ? ???????."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "??? ??????????? %hu ????????? ?? %s, ??? ???? ?? ???? ????? ??????."
 
-msgid "Unable to rename group"
-msgstr "??????? ?? ???? ?? ???? ????????????"
-
-msgid "Unable to delete group"
-msgstr "??????? ??? ??????????? ?? ???????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5665,6 +5675,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "????????? ??????:"
+
 msgid "Handshaking"
 msgstr "????????????"
 
@@ -5683,6 +5696,14 @@ msgstr "?????????? ?? ???
 msgid "Retrieving buddy list"
 msgstr "?????????? ?? ???????? ? ????????"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "???? ?? ?? ?????????"
 
@@ -5719,14 +5740,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "???????????? %s (%s) ???? ?? ?????? %s ? ??????? ? ?????????? ??."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "???????????? %s (%s) ???? ?? ?????? %s ? ??????? ? ?????????? ??."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "???????? ??? ?????????"
@@ -5760,6 +5773,51 @@ msgstr "????????? ?? ????
 msgstr "????????? ?? ????????? AIM/ICQ"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ?? ? ??????? ?????."
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ???? ?? ?? ??????? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "??????? ??? ?????????? ?? ?????????? ? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "??????? ??? ??????????? ?? ?????????? ? %s (%s)"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "?????? %s ?? ???? ?? ???? ???????."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ? ????????? ??? ?? ??????"
+
+msgid "Service Temporarily Unavailable."
+msgstr "???????? ???????? ?? ? ???????."
+
+msgid "Unable to rename group"
+msgstr "??????? ?? ???? ?? ???? ????????????"
+
+msgid "Unable to delete group"
+msgstr "??????? ??? ??????????? ?? ???????"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "???????????? %s (%s) ???? ?? ?????? %s ? ??????? ? ?????????? ??."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "???????????? %s (%s) ???? ?? ?????? %s ? ??????? ? ?????????? ??."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5793,6 +5851,8 @@ msgstr "?? ??? ???????? ?? msgstr "?? ??? ???????? ??? ???????."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "????????? ?? _?????????"
@@ -5842,12 +5902,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "?????????? ????????????? ??? ??? ??????."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6185,10 +6248,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "?????????? ????????????? ??? ??? ??????."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6399,6 +6458,29 @@ msgstr "????"
 msgstr "????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "?????????? ??????? ?? ???????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"???????? ? ????????? ?????? ?????. ????????? ????? ?????? ? ????????  "
+"??????. ??? ?????????? ? ??????? ?? ?? ??????? ????, ?? ?????? ?? ?????? ??? "
+"??-?????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?????? ??? ?????????????? ?? ????????"
+
+msgid "Incorrect password."
+msgstr "??????? ??????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "??????? ??? ???????????"
 
@@ -6693,15 +6775,34 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "???????? ??? ??????? ???? ??????????."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "?????? %s ?? ???? ?? ???? ????????."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "???????? ??? ??????? ???? ??????????."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "?????? %s ?? ???? ?? ???? ????????."
+
+msgid "Could Not Connect"
+msgstr "??????? ??? ???????????"
+
+msgid "Received authorization"
+msgstr "???????? ? ??????????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "????????? ????????????? ???"
 
-msgid "Incorrect password."
-msgstr "??????? ??????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "??????????? ???????? ?????."
@@ -6710,28 +6811,22 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"???????? ? ????????? ?????? ?????. ????????? ????? ?????? ? ????????  "
-"??????. ??? ?????????? ? ??????? ?? ?? ??????? ????, ?? ?????? ?? ?????? ??? "
-"??-?????."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "???????? ?? ??????????, ????? ?????????? ? ?????? ?????. ?????????????? ? ?? "
 "%s"
 
-msgid "Could Not Connect"
-msgstr "??????? ??? ???????????"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"???????? ? ????????? ?????? ?????. ????????? ????? ?????? ? ????????  "
+"??????. ??? ?????????? ? ??????? ?? ?? ??????? ????, ?? ?????? ?? ?????? ??? "
+"??-?????."
 
-msgid "Received authorization"
-msgstr "???????? ? ??????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6748,22 +6843,6 @@ msgstr "??"
 msgid "_OK"
 msgstr "??"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "???????? ??? ??????? ???? ??????????."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "?????? %s ?? ???? ?? ???? ????????."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "???????? ??? ??????? ???? ??????????."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "?????? %s ?? ???? ?? ???? ????????."
-
 msgid "Password sent"
 msgstr "???????? ? ?????????"
 
@@ -7263,6 +7342,7 @@ msgstr "???????? ????? ??
 msgid "Set User Info (web)..."
 msgstr "???????? ????? ?? ?????????? (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "????? ?? ???????? (URL)"
@@ -7298,6 +7378,10 @@ msgstr "??????? ?? ??????
 msgid "Search for Buddy by Information"
 msgstr "??????? ?? ?????????? ?? ???????? ?????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "???????????? ?? ? ??????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9655,10 +9739,6 @@ msgstr "???????????"
 msgid "Auth Domain"
 msgstr "???????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9684,6 +9764,40 @@ msgstr "????? ?? ????????
 msgid "Add buddy rejected"
 msgstr "????? ?? ???????? ?? ??????????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "???????? ????????? ??? ???????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "??????? ??????."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??????????? ?? ? ????????, ???? ?????? ? ?????????? ?? Yahoo!"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "???? ????? ??????????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??????????? ?? ? ????????, ???? ?????? ? ?????????? ?? Yahoo!"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "?????????? ????????????? ??? ??? ??????."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9798,9 +9912,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "?????????? ?? ??? ??????????????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?????????????? ??? ???? ? ?????"
@@ -10583,8 +10696,8 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "?????? ??? ????"
+msgid "A_ccount"
+msgstr "??????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10592,8 +10705,9 @@ msgstr ""
 msgstr ""
 "???????? ??????????? ????? ?? ?????????, ? ????? ?????? ?? ?? ????????.\n"
 
-msgid "_Account:"
-msgstr "_??????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "?????? ??? ????"
 
 msgid "_Block"
 msgstr "_?????????"
@@ -11068,6 +11182,113 @@ msgstr "/???????/????????
 msgid "/Buddies/Sort Buddies"
 msgstr "/???????/?????????? ?? ?????????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "???? ?? ????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "???????????? %s (%s) ???? ?? ?????? %s ? ??????? ? ?????????? ??."
+
+#, fuzzy
+msgid "Layout"
+msgstr "????????? ?? ?????? _?????????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???? ?? ????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "??????????_?"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????? ?? ???? ?? ????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_??????????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????? ?? ???? ?? ????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "???????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???? ??"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "????????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??????????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "??????????? ? ?????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "??????? ?? ??????? ?? ?????????? %s"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11601,6 +11822,10 @@ msgstr "????????"
 msgstr "????????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "????????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "??????????"
 
@@ -11706,6 +11931,9 @@ msgstr "???????"
 msgid "Swedish"
 msgstr "???????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "?????"
 
@@ -12153,11 +12381,9 @@ msgstr "????????? ?? ????
 msgid "Save Image"
 msgstr "????????? ?? ???????????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_????????? ?? ???????????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12252,10 +12478,6 @@ msgstr "?????????? ?? ???
 msgstr "?????????? ?? ???????"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "???? ?? ????"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "???? ?? ?????? ?? ?????? ????"
 
@@ -12570,6 +12792,9 @@ msgstr "????"
 msgid "Pounce on Whom"
 msgstr "????"
 
+msgid "_Account:"
+msgstr "_??????:"
+
 msgid "_Buddy name:"
 msgstr "_??? ?? ???????????:"
 
@@ -12685,9 +12910,16 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "??????? ??? ??????????? ?? ?????????????"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13285,6 +13517,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "????? ?? ???????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13514,6 +13750,76 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "??????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "???????? ?? ?????? ?? ???????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "????? ?? ???????? ??????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "???????? ??????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "????????? ?? ??????? ? ???????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "???????????? ??????? ? ????????? \"???? ??\""
+
+#, fuzzy
+msgid "Directory"
+msgstr "?????????? ?? ??????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ?? ?????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "????????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "???????? ??????? ?? ????????????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_???????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "???? ????? ??????????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???????? ?? ???????? ????? ????????? ????? ?? ?????????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "???????? ??????? ?? ????????????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "???????????? ? ? ????????? ,,???????????""
 
@@ -14026,12 +14332,6 @@ msgstr ""
 "- ?????? ?????? ??????? ????????\n"
 "- ??????? ????????? ?? ??????????? ?? ?????? ???? ??????? ??? ?? ??????."
 
-msgid "Cursor Color"
-msgstr "???? ?? ??????????"
-
-msgid "Secondary Cursor Color"
-msgstr "????? ???? ?? ??????????"
-
 msgid "Hyperlink Color"
 msgstr "???? ?? ????????"
 
@@ -14043,6 +14343,10 @@ msgstr "????????? ?? ????
 msgid "Highlighted Message Name Color"
 msgstr "????????? ?? ????????:"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "?????????? ?? ??????????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14075,35 +14379,24 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "??????? ?? ??????????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??????????? ?? ???? ?-????"
 
-msgid "Widget Sizes"
-msgstr "??????? ?? ????????????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin - ??????? ?? ?????????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "?????????"
+
 msgid "Fonts"
 msgstr "????????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin - ??????? ?? ?????????"
@@ -14252,12 +14545,119 @@ msgstr ""
 "?????? ????? ? ?????????? ?????????, ?????? ?????????? ?? ??????????? "
 "???????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "?? ??? ??????? ?"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "?? ??? ??????? ?"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "????????? ? ????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "??????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??-?????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????????? ??????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "??????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "???????? ??????????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "????????? ? ???????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "???? ?? ??????????????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "????????? ?? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "?????? ??? ?????????? ??????? ??? ??????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????????? ?? ?????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin - ??????? ?? ?????????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "????? ?? ??????????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????? ? ????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????? ? ????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin - ??????? ?? ?????????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin - ??????? ?? ?????????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "??????????? ?? ???????"
 
@@ -14473,6 +14873,22 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "?????????? ?? ??? ??????????????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "???? ?? ??????????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "????? ???? ?? ??????????"
+
+#~ msgid "Interface colors"
+#~ msgstr "??????? ?? ??????????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "??????? ?? ????????????????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "???????? ? ?????????"
 
@@ -14916,10 +15332,6 @@ msgstr ""
 #~ msgstr "??????????? ? %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "???????????? %s (%s) ???? ?? ?????? %s ? ??????? ? ?????????? ??."
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "?????? ??? ?????????????"
 
@@ -14928,10 +15340,6 @@ msgstr ""
 #~ msgstr "%s ? ??????? ?? ? ???????."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "?????? ??? ?????????????? ?? ????????"
-
-#, fuzzy
 #~ msgid "TCP Address"
 #~ msgstr "IP ?????"
 
@@ -15046,10 +15454,6 @@ msgstr ""
 #~ msgstr "_?????????"
 
 #, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "??????:"
-
-#, fuzzy
 #~ msgid ""
 #~ "%s was disconnected due to the following error:\n"
 #~ "%s"
============================================================
--- po/bn.po	24ca3327967b8fd03d91b1ba803c756c698a48d1
+++ po/bn.po	eae0bc8f3824e7fe53aef7003b74fd08ab549240
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-11-13 17:07+0600\n"
 "Last-Translator: Israt Jahan <israt at ankur.org.bd>\n"
 "Language-Team: Bengali <core at bengalinux.org>\n"
@@ -1846,6 +1846,8 @@ msgstr "+++ %s ??? ?????
 msgid "+++ %s signed off"
 msgstr "+++ %s ??? ??????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????? ??????"
 
@@ -2274,6 +2276,11 @@ msgstr "(%1s) %2s <AUTO-REPLY>: %3s\n"
 msgstr "(%1s) %2s <AUTO-REPLY>: %3s\n"
 
 # tithi
+#, fuzzy
+msgid "Error creating conference."
+msgstr "????? ?????? ??????"
+
+# tithi
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "???? %1s ??????? ?????, ?????? ?? ????????? %2s ?????????"
@@ -3278,6 +3285,11 @@ msgstr "?????? ??? (_n
 msgid "Chat _name:"
 msgstr "?????? ??? (_n):"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "????????? ???? ????? ??????? ???????"
+
 msgid "Chat error"
 msgstr "????? ??????"
 
@@ -3326,6 +3338,10 @@ msgstr "????-???? ??
 msgid "Gadu-Gadu User"
 msgstr "????-???? ???????????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??????? ??????"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "????? ???????: %s"
@@ -3369,7 +3385,8 @@ msgstr "?????????? (
 msgstr "?????????? (_P):"
 
 # tithi
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ?? ?????????? ????? ????? ???? ??? ???? ????"
 
 #. 1. connect to server
@@ -3874,6 +3891,10 @@ msgstr "??????? ????msgid "Server does not use any supported authentication method"
 msgstr "??????? ???? ??????? ?????????? ?????????? ??????? ??? ???"
 
+# tithi
+msgid "You require encryption, but it is not available on this server."
+msgstr "????? ????????? ????????, ?????? ??? ?? ??????????? ??????? ????"
+
 msgid "Invalid challenge from server"
 msgstr "??????? ???? ???? ?????????"
 
@@ -4172,6 +4193,14 @@ msgstr "?????"
 msgid "Resource"
 msgstr "?????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???? ?????"
+
 msgid "Middle Name"
 msgstr "???? ???"
 
@@ -4347,10 +4376,18 @@ msgstr "???? ??????"
 msgid "Find Rooms"
 msgstr "???? ??????"
 
-# tithi
-msgid "You require encryption, but it is not available on this server."
-msgstr "????? ????????? ????????, ?????? ??? ?? ??????????? ??????? ????"
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "???? ?????????? ??????????? ?????? ???????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??????"
+
 msgid "Ping timeout"
 msgstr "????? ????-???????? ?????"
 
@@ -4371,7 +4408,7 @@ msgstr "???? XMPP ID? ??? msgstr "???? XMPP ID? ?????? ?????? ???????? ???? ????"
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "???????? ????? ???? ?????? ???????"
 
 # tithi
@@ -4399,9 +4436,6 @@ msgstr "???????? ???msgid "Unregistration Failed"
 msgstr "???????? ?????? ??????"
 
-msgid "Already Registered"
-msgstr "???????? ????????"
-
 msgid "State"
 msgstr "?????"
 
@@ -4414,6 +4448,9 @@ msgstr "?????"
 msgid "Date"
 msgstr "?????"
 
+msgid "Already Registered"
+msgstr "???????? ????????"
+
 msgid "Unregister"
 msgstr "????????"
 
@@ -4441,6 +4478,10 @@ msgstr "??????? ????msgid "Change Registration"
 msgstr "??????? ???????? ????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "???????? ????? ???? ?????? ???????"
+
 msgid "Error unregistering account"
 msgstr "??????? ?????????? ???? ??????"
 
@@ -4855,17 +4896,19 @@ msgstr ""
 "??????? &lt;???????????&2gt; [????]: ???? ????????????? ???? ???? ??????? ?????"
 
 # tithi
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "??????? &1lt;???????????&2gt; &3lt;?????|???????|?????|??????|?????&4gt;:?????? "
 "????? ???? ???????????? ??????? ???????? ?????"
 
 # tithi
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "?????? &1lt;???????????&2gt; &3lt;??????????|????????????|????????|?????&4gt;: ????? "
 "???????????? ?????? ???????? ?????"
@@ -4939,6 +4982,9 @@ msgstr "???? ???????msgid "File transfer proxies"
 msgstr "???? ??????????? ???????"
 
+msgid "BOSH URL"
+msgstr ""
+
 # tithi
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -5374,6 +5420,11 @@ msgstr "IM ??? ??? ???
 msgstr "IM ??? ??? ???????????"
 
 # tithi
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ?????? ?????????? ???????? ??????????, ?? ???? ??????? ???"
+
+# tithi
 msgid "Nudge"
 msgstr "???????"
 
@@ -5745,63 +5796,26 @@ msgstr "??????? ????msgstr "??????? ??????  ???? ??????????:???? ?????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ???? ??? ????? ????"
-
-msgid "Unknown error."
-msgstr "????? ???????"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2s (%3s) ? %1s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ????? ?????? ?????? ????!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "????? ?????? (%d)"
 
 msgid "Unable to add user"
 msgstr "??????????? ??? ???? ????? ??"
 
-msgid "The following users are missing from your addressbook"
-msgstr "????? ?????? ?? ???? ????????? ????????????? ??????? ????"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%1s (%2s) ? ??????????? ??? ???? ????? ??"
+msgid "Unknown error (%d)"
+msgstr "????? ?????? (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%1s (%2s) ? ??????????? ????? ???? ????? ??"
+msgid "The following users are missing from your addressbook"
+msgstr "????? ?????? ?? ???? ????????? ????????????? ??????? ????"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%1s (%2s) ????????????? ?????? ?????? ???? ????? ??"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "????? ????? ?????? ????? ????? ????? %s ?? ??? ??? ?????? ???"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ??? ???????? ??????? ????"
-
-msgid "Service Temporarily Unavailable."
-msgstr "??????????? ???? ?????? ?????? ???"
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "?????? ???????? ???? ??? ?????? ?????? ??????"
 
-msgid "Unable to rename group"
-msgstr "????? ??????? ?????? ???? ????? ??"
-
-msgid "Unable to delete group"
-msgstr "????? ???? ????? ?????"
-
 # tithi
 #, c-format
 msgid ""
@@ -5893,6 +5907,9 @@ msgstr ""
 "??????????? ????? ?????? ?????-?????? ?????? ?????? ??? ??????? ??? ??????? ???? ??? "
 "??????? ?????? ?????"
 
+msgid "Unknown error."
+msgstr "????? ???????"
+
 # tithi
 msgid "Handshaking"
 msgstr "????????????"
@@ -5914,6 +5931,16 @@ msgstr "????? ??????msgid "Retrieving buddy list"
 msgstr "????? ?????? ?????? ????"
 
+# tithi
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ?????? ?????????? ???????? ??????????, ?? ???? ??????? ???"
+
+# tithi
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ?????? ?????????? ???????? ??????????, ?? ???? ??????? ???"
+
 msgid "Away From Computer"
 msgstr "????????? ???? ????"
 
@@ -5954,14 +5981,6 @@ msgstr "???? ????? ?
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "???? ????? ??????? ?????? ????? ????? ?????? ??? ?????? ??????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?????? ??? ????? ???????? ??? ???????"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ?????? ??? ????? ?????? ???? ?????? ??????"
-
 msgid "Delete Buddy from Address Book?"
 msgstr "??????? ?? ???? ?? ????? ???? ????? ????"
 
@@ -5992,6 +6011,51 @@ msgstr "MSN ???????? ?
 msgid "MSN Protocol Plugin"
 msgstr "MSN ???????? ???????"
 
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s ???? ??? ????? ????"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2s (%3s) ? %1s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%1s (%2s) ? ??????????? ??? ???? ????? ??"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%1s (%2s) ? ??????????? ????? ???? ????? ??"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%1s (%2s) ????????????? ?????? ?????? ???? ????? ??"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "????? ????? ?????? ????? ????? ????? %s ?? ??? ??? ?????? ???"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ??? ???????? ??????? ????"
+
+msgid "Service Temporarily Unavailable."
+msgstr "??????????? ???? ?????? ?????? ???"
+
+msgid "Unable to rename group"
+msgstr "????? ??????? ?????? ???? ????? ??"
+
+msgid "Unable to delete group"
+msgstr "????? ???? ????? ?????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?????? ??? ????? ???????? ??? ???????"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ?????? ??? ????? ?????? ???? ?????? ??????"
+
 # tithi
 #, c-format
 msgid "No such user: %s"
@@ -6025,6 +6089,8 @@ msgstr "????????? ??msgstr "????????? ???? ????? ????????? ?????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "???? ???? ??????????"
 
@@ -6080,17 +6146,19 @@ msgstr "??????? ????msgstr "??????? ??????, ??? %1d: %2s"
 
 # tithi
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s ????? ?????????? %d ???????????, MySpaceIM ?? ???? %d ?? ?????????? ???????? ??????? "
 "??????? ???????? ??????? ??? ????? ?????????? http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings? ?????????? ????????? ???? ??? ??????? ?????? ?????"
 
+msgid "Incorrect username or password"
+msgstr "??? ???????????? ??? ?? ??????????"
+
 # tithi
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM ??????"
@@ -6450,9 +6518,6 @@ msgstr "??????? ????msgid "Master archive is misconfigured"
 msgstr "??????? ??????? ???????-?????????"
 
-msgid "Incorrect username or password"
-msgstr "??? ???????????? ??? ?? ??????????"
-
 # tithi
 msgid "Could not recognize the host of the username you entered"
 msgstr "????? ????????? ????????????-????? ????? ?????? ???? ???? ??"
@@ -6679,6 +6744,30 @@ msgstr "????????? ??msgid "Server port"
 msgstr "????????? ?????"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "??????? ???? ??????????? ????????? ????? ???????"
+
+# tithi
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"???? ??? ???? ????? ????? ??? ????? ????????? ?????? ?? ????? ??????? ???? ??? "
+"??????? ?????? ????? ???? ??? ?????? ??????? ????? ???, ?????? ??? ???? ??????? "
+"???? ????"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s ????????? ??????"
+
+msgid "Incorrect password."
+msgstr "??? ???????????"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "?????? ???? ????? ??? ??????"
 
@@ -7025,14 +7114,32 @@ msgstr ""
 "???????????? ?????? ???? ??? ?-???? ?????? ????? ???, ?? ???? ???? ?????? ???? ??? "
 "??? ????????? ????, ?????? ??? ????? ???? ????, ?? ????????? ?????? ???? ?????"
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "???? ?????????? ????????? ????? ??????  ?????????? ???? %s ??????? ????."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "???? ??? AIM ???? ????? ???? ???????"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "???? ?????????? ????????? ????? ??????  ?????????? ???? %s ??????? ?????"
+
+msgid "Unable to get a valid login hash."
+msgstr "???? ??? ???? ????? ???? ???????"
+
+msgid "Could Not Connect"
+msgstr "????? ???? ???? ??"
+
+# tithi
+msgid "Received authorization"
+msgstr "????? ??????? ???????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "???? ???????????? ????"
 
-msgid "Incorrect password."
-msgstr "??? ???????????"
-
 # tithi
 #. Suspended account
 msgid "Your account is currently suspended."
@@ -7044,29 +7151,22 @@ msgstr "AOL ????????? 
 msgstr "AOL ????????? ?????????? ??????? ??????????? ?????????"
 
 # tithi
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "????? ??????? ?????? ??????? ??? ?????? ??????? ??? %s ? ??????? ????"
+
+# tithi
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "???? ??? ???? ????? ????? ??? ????? ????????? ?????? ?? ????? ??????? ???? ??? "
 "??????? ?????? ????? ???? ??? ?????? ??????? ????? ???, ?????? ??? ???? ??????? "
 "???? ????"
 
 # tithi
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "????? ??????? ?????? ??????? ??? ?????? ??????? ??? %s ? ??????? ????"
-
-msgid "Could Not Connect"
-msgstr "????? ???? ???? ??"
-
-# tithi
-msgid "Received authorization"
-msgstr "????? ??????? ???????"
-
-# tithi
 msgid "The SecurID key entered is invalid."
 msgstr "???? ??????-???? ?? ?????? ??? ??????"
 
@@ -7084,20 +7184,6 @@ msgstr "??? ??? (_O)"
 msgid "_OK"
 msgstr "??? ??? (_O)"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "???? ?????????? ????????? ????? ??????  ?????????? ???? %s ??????? ????."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "???? ??? AIM ???? ????? ???? ???????"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "???? ?????????? ????????? ????? ??????  ?????????? ???? %s ??????? ?????"
-
-msgid "Unable to get a valid login hash."
-msgstr "???? ??? ???? ????? ???? ???????"
-
 msgid "Password sent"
 msgstr "??????????? ?????? ??????"
 
@@ -7665,6 +7751,7 @@ msgstr "??????????? msgid "Set User Info (web)..."
 msgstr "??????????? ???? ???????? ???? (?????)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "?????????? ???????? ???? (?????)"
 
@@ -7700,6 +7787,10 @@ msgstr "???? ?????? 
 msgid "Search for Buddy by Information"
 msgstr "???? ?????? ???????? ??????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "??????????? ???? ???????? ???"
+
 # tithi
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -10267,11 +10358,6 @@ msgstr "??????? ????msgid "Auth Domain"
 msgstr "??????? ??????"
 
-# tithi
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ?????? ?????????? ???????? ??????????, ?? ???? ??????? ???"
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10300,7 +10386,43 @@ msgstr "????? ??? ??
 msgid "Add buddy rejected"
 msgstr "????? ??? ???????????? ?????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "????????? ???? ??????? ???????? ???? ?????? ????? ??????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "??? ????????????"
+
 # tithi
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "????? ?????? ??????? %d? ??????! ????? ????? ???? ???? ??? ??? ??? ??? ?????"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "??????????? ???????? ??"
+
+# tithi
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "????? ?????? ??????? %d? ??????! ????? ????? ???? ???? ??? ??? ??? ??? ?????"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??? ???????????? ??? ?? ??????????"
+
+# tithi
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10420,8 +10542,8 @@ msgstr "???????? ???msgid "Start Doodling"
 msgstr "???????? ??? ???? ????"
 
-msgid "Activate which ID?"
-msgstr "??? ???? ??????? ??? ????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "??? ???? ??????? ??? ???? ????"
@@ -11254,8 +11376,9 @@ msgstr "??????? ??? 
 msgid "Please update the necessary fields."
 msgstr "??????? ??? ??????????? ??????????? ???????? ?????"
 
-msgid "Room _List"
-msgstr "????? ?????? (_L)"
+#, fuzzy
+msgid "A_ccount"
+msgstr "???????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -11263,8 +11386,8 @@ msgstr ""
 msgstr ""
 "??????? ??? ???? ?? ??????? ??? ???? ??? ??? ???????? ????? ???? ?????? ?????\n"
 
-msgid "_Account:"
-msgstr "??????? (_A):"
+msgid "Room _List"
+msgstr "????? ?????? (_L)"
 
 msgid "_Block"
 msgstr "???? ???? (_B)"
@@ -11708,6 +11831,112 @@ msgstr "/???????/???
 msgid "/Buddies/Sort Buddies"
 msgstr "/???????/???????? ??????????? ?????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "?????????? ??"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+# tithi
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "?????????? ??"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "?????? ???? (_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "?????????? ?? ???????? ????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "?????? ????? (_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "?????????? ?? ???????? ????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "???????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "????? ???"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?????? "
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??? ???"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?????? ?????? ??????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ?? ???? ??????????? ???? ???????? ????"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ???????????"
@@ -12224,6 +12453,10 @@ msgstr "??????????"
 msgid "Hungarian"
 msgstr "??????????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "????????"
+
 msgid "Indonesian"
 msgstr "???????????"
 
@@ -12329,6 +12562,9 @@ msgstr "??????"
 msgid "Swedish"
 msgstr "??????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "?????"
 
@@ -12768,12 +13004,10 @@ msgstr "????? ??????msgid "Save Image"
 msgstr "????? ??????? ????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "????? ??????? ????... (_S)"
 
 # tithi
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "??????? ??????? ??? ????... (_A)"
 
@@ -12868,9 +13102,6 @@ msgstr "?????? ???"
 msgid "Font Face"
 msgstr "?????? ???"
 
-msgid "Background Color"
-msgstr "?????????? ??"
-
 msgid "Foreground Color"
 msgstr "??????????? ??"
 
@@ -13212,6 +13443,9 @@ msgstr "???? ?????? 
 msgid "Pounce on Whom"
 msgstr "???? ?????? ????"
 
+msgid "_Account:"
+msgstr "??????? (_A):"
+
 msgid "_Buddy name:"
 msgstr "?????? ??? (_B):"
 
@@ -13324,9 +13558,18 @@ msgstr "????? ??????msgid "Unknown.... Please report this!"
 msgstr "????? ?????? ??????? ??????? ??? ??? ??????? ????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "??????? ??? ???????? ???? ?????? ?????"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "??????? ??? ???????? ???? ?????? ?????"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "??????? ??? ???????? ???? ?????? ?????"
+
 # tithi
 msgid "Install Theme"
 msgstr "??? ???????? ????"
@@ -13911,6 +14154,10 @@ msgstr "??????? ????msgid "Custom Smiley Manager"
 msgstr "??????? ??????? ??????????"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "????? ???????? ????"
+
 # tithi
 msgid "Click to change your buddyicon for this account."
 msgstr "?? ????????? ???? ????? ?????-???? ???????? ???? ????? ?????"
@@ -14147,6 +14394,80 @@ msgstr "????? ??????msgid "Displays statistical information about your buddies' availability"
 msgstr "????? ???????? ?????????? ???????? ?????????? ????????? ???? ???????? ???"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "????????? ??????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "???? ????????? ??????? ?????? ????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??????????? ???? ???? ????????? ??????? ?????? ????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????? ????????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "????? ?????? ?????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "?????????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "?? ??????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "???? ????????"
+
+# tithi
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub ????"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "???? ?????????? ????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "???????? (_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "??????????? ???????? ??"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "??????? ???????? ?????? ??? ??"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "???? ?????????? ????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+# tithi
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "?? ????????? XMPP ??????? ?? ?????????? ????? ???? ???? ????????"
+
 msgid "Buddy is idle"
 msgstr "????? ???"
 
@@ -14668,12 +14989,6 @@ msgstr ""
 "- ??? ?? ??? ??? ????? ???\n"
 "- ????? ??????????? ??????? ???? ?? ????? ??? ??????? ???? ?????? ??????"
 
-msgid "Cursor Color"
-msgstr "????????? ??"
-
-msgid "Secondary Cursor Color"
-msgstr "??? ????????? ??"
-
 msgid "Hyperlink Color"
 msgstr "????????????? ??"
 
@@ -14683,6 +14998,10 @@ msgstr "??????????? msgid "Highlighted Message Name Color"
 msgstr "???????????? ??????? ????? ??"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "????????? ?? ???? ????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ???????? ??????"
 
@@ -14712,36 +15031,24 @@ msgstr "GTK+ ??? ?????? msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ??? ????????? ???"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "??????????? ??"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??????? ????????? ??????? ????"
 
-# tithi
-msgid "Widget Sizes"
-msgstr "????? ????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "????? GTK+ ??? ??????????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "????"
+
 msgid "Fonts"
 msgstr "????????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc ?????? ???????"
 
@@ -14883,12 +15190,121 @@ msgstr "??????????? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "???????????-??????????? ???? ??????? ???????? ??????????? ??? ??????????? ????"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???? ??? ????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "???? ??? ????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "??????? ??? ???"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???????? ????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "?????????? ????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+# tithi
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????????????? ????? ?????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "??????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "?????? ?????"
+
+# tithi
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??????? ????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s-?? ???? ??????"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "????? ????? ??????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "???? ???????? ????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "????? GTK+ ??? ??????????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "????????? ????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Buddy List"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "????? GTK+ ??? ??????????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "????? GTK+ ??? ??????????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "????? ???????????"
 
@@ -15104,6 +15520,22 @@ msgstr "?? ?????????msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "?? ????????? XMPP ??????? ?? ?????????? ????? ???? ???? ????????"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "??? ???? ??????? ??? ????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "????????? ??"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??? ????????? ??"
+
+#~ msgid "Interface colors"
+#~ msgstr "??????????? ??"
+
+# tithi
+#~ msgid "Widget Sizes"
+#~ msgstr "????? ????????"
+
 #~ msgid "Invite message"
 #~ msgstr "???????? ??????"
 
============================================================
--- po/bs.po	9e680c7db23c3b79a964235f0dedf030d7839d8e
+++ po/bs.po	c0192c9a289c7ba91495419e42fd0d3b73796be6
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2005-10-27 16:55-0400\n"
 "Last-Translator: Lejla Hadialic <lejlah at gmail.com>\n"
 "Language-Team: bs <LL at li.org>\n"
@@ -1850,6 +1850,8 @@ msgstr "%s odjavljen/a"
 msgid "+++ %s signed off"
 msgstr "%s odjavljen/a"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nepoznata gre?ka"
 
@@ -2239,6 +2241,10 @@ msgstr "(%s) %s<AUTO-ODGOVOR>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s<AUTO-ODGOVOR>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Gre?ka pri kreiranju konekcije"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3264,7 +3270,12 @@ msgstr "Prezime:"
 msgid "Chat _name:"
 msgstr "Prezime:"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "Nije moguce pingati server"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "Gre?ka prilikom citanja"
 
@@ -3321,6 +3332,10 @@ msgstr "Gadu-Gadu pretra?ivacki engine"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu pretra?ivacki engine"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Postavi korisnicki info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nepoznata komanda: %s"
@@ -3365,7 +3380,8 @@ msgstr "Lozinka:"
 msgid "_Password:"
 msgstr "Lozinka:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nadimci ne smiju sadr?avati whitespace"
 
 #. 1. connect to server
@@ -3853,6 +3869,9 @@ msgstr "Server ne koristi ni jednu metod
 msgid "Server does not use any supported authentication method"
 msgstr "Server ne koristi ni jednu metodu autentikacije"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Pogre?an upit od servera"
 
@@ -4151,6 +4170,14 @@ msgstr "Izvor"
 msgid "Resource"
 msgstr "Izvor"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Neulogovan"
+
 msgid "Middle Name"
 msgstr "Srednje ime"
 
@@ -4325,10 +4352,19 @@ msgstr "Tra?i sobe"
 msgid "Find Rooms"
 msgstr "Tra?i sobe"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Neslagajuci hostovi"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Uloga"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Obicni tekst"
 
@@ -4349,7 +4385,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Neuspjelo spajanje na server."
 
 #, c-format
@@ -4378,9 +4414,6 @@ msgstr "Registracija neuspjela"
 msgid "Unregistration Failed"
 msgstr "Registracija neuspjela"
 
-msgid "Already Registered"
-msgstr "Vec registrovan/a"
-
 msgid "State"
 msgstr "Dr?ava"
 
@@ -4394,6 +4427,9 @@ msgstr "Datum"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Vec registrovan/a"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Registruj se"
@@ -4426,6 +4462,10 @@ msgstr "Gre?ka pri registraciji"
 msgstr "Gre?ka pri registraciji"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Neuspjelo spajanje na server."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Gre?ka pri mjenjanju informacija o account-u"
 
@@ -4803,13 +4843,13 @@ msgid ""
 msgstr "ban &lt;user&gt; [soba]:  Banuj korisnika iz sobe."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4879,6 +4919,9 @@ msgstr "Port datotecnog transfera"
 msgid "File transfer proxies"
 msgstr "Port datotecnog transfera"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5292,6 +5335,10 @@ msgstr "Odstrani kontakt"
 msgid "Non-IM Contacts"
 msgstr "Odstrani kontakt"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5678,67 +5725,29 @@ msgstr "Neuspjela normalna autentikacija
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Neuspjela normalna autentikacija!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s nije validna grupa."
-
-msgid "Unknown error."
-msgstr "Nepoznata gre?ka."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s hoce da vam po?alje datoteku"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Nepoznata gre?ka"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Nije moguce banovati korisnika %s"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Nepoznata gre?ka"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nije moguce dodati korisnika na %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nije moguce blokirati korisnika na %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nije moguce dozvoliti korisnika na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nije mogao biti dodan, jer je Va?a lista prijatelja puna."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nije validan paso? account."
-
 #, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Servis trenutno nedostupan"
-
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Poruka nije mogla biti poslana, jer je korisnik offline:"
 
-msgid "Unable to rename group"
-msgstr "Nije moguce preimenovati grupu"
-
-msgid "Unable to delete group"
-msgstr "Nije moguce izbrisati grupu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5826,6 +5835,9 @@ msgstr ""
 "Va?a MSN lista prijatelja je trenutno nedostupna. Sacekajte i poku?ajte "
 "kasnije."
 
+msgid "Unknown error."
+msgstr "Nepoznata gre?ka."
+
 msgid "Handshaking"
 msgstr "Rukovanje"
 
@@ -5844,6 +5856,14 @@ msgstr "Povrat liste prijatelja"
 msgid "Retrieving buddy list"
 msgstr "Povrat liste prijatelja"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Udaljen od kompjutera"
 
@@ -5883,14 +5903,6 @@ msgstr "Poruka mo?da nije poslana, jer 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Poruka mo?da nije poslana, jer se pojavila nepoznata gre?ka:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Korisnik %s ?eli da doda %s na svoju listu prijatelja."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Korisnik %s ?eli da doda %s na svoju listu prijatelja."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Dodaj u adresar"
@@ -5924,6 +5936,52 @@ msgstr "AIM/ICQ protokol plugin"
 msgstr "AIM/ICQ protokol plugin"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nije validna grupa."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nije moguce dodati korisnika na %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nije moguce blokirati korisnika na %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nije moguce dozvoliti korisnika na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nije mogao biti dodan, jer je Va?a lista prijatelja puna."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nije validan paso? account."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Servis trenutno nedostupan"
+
+msgid "Unable to rename group"
+msgstr "Nije moguce preimenovati grupu"
+
+msgid "Unable to delete group"
+msgstr "Nije moguce izbrisati grupu"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Korisnik %s ?eli da doda %s na svoju listu prijatelja."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Korisnik %s ?eli da doda %s na svoju listu prijatelja."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5957,6 +6015,8 @@ msgstr "Gre?ka pri komunikaciji sa serv
 msgstr "Gre?ka pri komunikaciji sa serverom"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Nova poruka o odsutnosti"
@@ -6007,12 +6067,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Netacan nadimak ili lozinka."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6352,10 +6415,6 @@ msgstr "Glavna arhiva je lo?e konfiguri
 msgstr "Glavna arhiva je lo?e konfigurisana"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Netacan nadimak ili lozinka."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nije moguce prepoznati hosta korisnickog imena, koje ste unijeli"
 
@@ -6573,6 +6632,28 @@ msgstr "Port servera"
 msgstr "Port servera"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Pogre?an odgovor od servera."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Previ?e cesto ste uspostavljali i prekidali vezu. Pricekajte deset minuta i "
+"poku?ajte ponovo. Ako nastavite poku?avati, moracete sacekati jo? du?e."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Gre?ka pri kreiranju konekcije"
+
+msgid "Incorrect password."
+msgstr "Netacna lozinka."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Nemoguce spajanje"
 
@@ -6873,15 +6954,38 @@ msgstr ""
 "pogre?no. Imena moraju pocinjati sa slovima i sadr?avati samo slova, brojeve "
 "i razmake, ili sadr?avati samo brojeve."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Moguce da ce Va?a veza biti prekinuta ubrzo. Mo?da cete htjeti da koristite "
+"TOC, dok ovo ne bude popravljeno. Provjerite %s za noviju verziju."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin nije u mogucnosti da dobije validan AIM login hash."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Moguce da ce Va?a veza biti prekinuta ubrzo. Mo?da cete htjeti da koristite "
+"TOC, dok ovo ne bude popravljeno. Provjerite %s za noviju verziju."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin nije u mogucnosti da dobije validan login hash."
+
+msgid "Could Not Connect"
+msgstr "Nemoguce se spojiti"
+
+msgid "Received authorization"
+msgstr "Primljena autorizacija"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Pogre?an nadimak"
 
-msgid "Incorrect password."
-msgstr "Netacna lozinka."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Va? account je trenutno suspendovan."
@@ -6890,25 +6994,19 @@ msgstr "AOL Instant Messenger servis je 
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger servis je trenutno nedostupan."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Klijent verzija, koju koristite, je prestara. Nova verzija na %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Previ?e cesto ste uspostavljali i prekidali vezu. Pricekajte deset minuta i "
 "poku?ajte ponovo. Ako nastavite poku?avati, moracete sacekati jo? du?e."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Klijent verzija, koju koristite, je prestara. Nova verzija na %s"
-
-msgid "Could Not Connect"
-msgstr "Nemoguce se spojiti"
-
-msgid "Received authorization"
-msgstr "Primljena autorizacija"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Ukucani SecurID je pogre?an."
 
@@ -6925,26 +7023,6 @@ msgstr "OK"
 msgid "_OK"
 msgstr "OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Moguce da ce Va?a veza biti prekinuta ubrzo. Mo?da cete htjeti da koristite "
-"TOC, dok ovo ne bude popravljeno. Provjerite %s za noviju verziju."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin nije u mogucnosti da dobije validan AIM login hash."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Moguce da ce Va?a veza biti prekinuta ubrzo. Mo?da cete htjeti da koristite "
-"TOC, dok ovo ne bude popravljeno. Provjerite %s za noviju verziju."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin nije u mogucnosti da dobije validan login hash."
-
 msgid "Password sent"
 msgstr "Lozinka poslana"
 
@@ -7462,6 +7540,7 @@ msgstr "Postavi korisnicki info (URL)...
 msgid "Set User Info (web)..."
 msgstr "Postavi korisnicki info (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Promjeni lozinku (URL)"
@@ -7497,6 +7576,10 @@ msgstr "Tra?i prijatelja preko informac
 msgid "Search for Buddy by Information"
 msgstr "Tra?i prijatelja preko informacija"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Korisnik nije tu"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9927,10 +10010,6 @@ msgstr "Automatski"
 msgid "Auth Domain"
 msgstr "Automatski"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9957,6 +10036,44 @@ msgstr "Dodavanje prijatelja odbijeno"
 msgid "Add buddy rejected"
 msgstr "Dodavanje prijatelja odbijeno"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Nije moguce ostvariti SSL konekciju na server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Netacna lozinka."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Nepoznata gre?ka broj %d: Prijavljivanje na Yahoo! website mo?e ovo "
+"popraviti."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Korisnik ne postoji"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Nepoznata gre?ka broj %d: Prijavljivanje na Yahoo! website mo?e ovo "
+"popraviti."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Netacan nadimak ili lozinka."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10075,9 +10192,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Aktivirati koji ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kome se ?elite pridru?iti na chat?"
@@ -10896,8 +11012,8 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Lista soba"
+msgid "A_ccount"
+msgstr "Account:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10905,8 +11021,9 @@ msgstr ""
 msgstr ""
 "Upi?ite odgovarajuce informacije o chatu, kojem hocete da se prikljucite.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Lista soba"
 
 #, fuzzy
 msgid "_Block"
@@ -11399,6 +11516,117 @@ msgstr "/Prijatelji/Prika?i offline pri
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Prika?i offline prijatelje"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Pozadinska boja"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Da li ?elite da dodate ovog prijatelja na Va?u listu prijatelja?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Neulogovan"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Pozadinska boja"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Expander-velicina"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Odaberi pozadinsku boju"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Collapse"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Odaberi pozadinsku boju"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Kratica"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Pogledaj informacije o izabranom prijatelju"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Odsutan"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Pogledaj informacije o izabranom prijatelju"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Pogledaj informacije o izabranom prijatelju"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tekst"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Pogledaj informacije o izabranom prijatelju"
+
+msgid "Message Text"
+msgstr "Tekst poruke"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Tekst poruke"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Promijeni korisnicke informacije za %s"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11941,6 +12169,10 @@ msgstr "Madarski"
 msgstr "Madarski"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Rumunski"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Makedonski"
 
@@ -12046,6 +12278,9 @@ msgstr "?vedski"
 msgid "Swedish"
 msgstr "?vedski"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -12487,11 +12722,10 @@ msgstr "Spasi sliku"
 msgid "Save Image"
 msgstr "Spasi sliku"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Spasi sliku..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Poka?i korisnicke detalje"
 
@@ -12581,10 +12815,6 @@ msgstr "Oblik fonta"
 msgstr "Oblik fonta"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Pozadinska boja"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Boja fonta"
 
@@ -12911,6 +13141,9 @@ msgstr "Alarmiranje koga"
 msgid "Pounce on Whom"
 msgstr "Alarmiranje koga"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Ime prijatelja:"
 
@@ -13035,9 +13268,16 @@ msgstr "Nepoznat alarm-dogadaj. Molimo V
 msgid "Unknown.... Please report this!"
 msgstr "Nepoznat alarm-dogadaj. Molimo Vas prijavite ovo!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Neuspio poku?aj spa?avanja slike: %s\n"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13646,6 +13886,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Izaberite prijatelja"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13883,6 +14127,78 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Adresa servera"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Upi?ite server za konferenciju"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Odaberite konferencijski server za upit"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online servisi"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Po?alji listu prijatelja"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Pri odsutnosti"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Pretraga direktorija"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Izbor zvuka"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Opis:</b> Zastra?ujuce"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Postavi Dir informacije"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Pretra?ivac:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Korisnik ne postoji"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server ne koristi ni jednu metodu autentikacije"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Postavi Dir informacije"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Neaktivan prijatelj: "
 
@@ -14410,12 +14726,6 @@ msgstr ""
 "- Premje?ta sav dolazeci tekst\n"
 "- ?alje poruku ljudima na va?oj listi, odmah pri njihovoj prijavi"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Hiperlink boja"
@@ -14428,6 +14738,10 @@ msgstr "Po?alji poruku"
 msgid "Highlighted Message Name Color"
 msgstr "Po?alji poruku"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Uklanjanje notifikacija"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14462,37 +14776,24 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ignori?i b_oje"
+msgid "Disable Typing Notification Text"
+msgstr "Obavje?tenje o novom mail-u"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
 #, fuzzy
+msgid "Colors"
+msgstr "Zatvori"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "Accounti"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin kontrola datoteke"
@@ -14639,12 +14940,117 @@ msgstr ""
 "Mijenja tekst u odlazecoj poruci, prema prethodno definisanim pravilima od "
 "strane korisnika."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Neulogovani"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s je izlogovan/a."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Pridru?i se chatu"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignoriraj"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Punjenje"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizacija odobrena"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Gre?ka"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informacije"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Zahtjev nejasan"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Upozoravajuci nivo"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "URL liste chat sobe"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Spasi ikonicu"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informacije o account-u"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lista prijatelja"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista prijatelja"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin korisnik"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Prijatelj ticker"
 
@@ -14861,6 +15267,14 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktivirati koji ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ignori?i b_oje"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Ubaci sliku"
 
@@ -15355,18 +15769,10 @@ msgstr ""
 #~ msgstr "Korisnici na %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Da li ?elite da dodate ovog prijatelja na Va?u listu prijatelja?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Gre?ka pri operaciji nad datotekom"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Gre?ka pri kreiranju konekcije"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Nije moguce se prijaviti na AIM"
 
@@ -15492,10 +15898,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "Poruka:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Sakrij gre?ke pri prekidu veze"
 
@@ -15662,9 +16064,6 @@ msgstr ""
 #~ msgid " left the room (%s)."
 #~ msgstr " nije vi?e u sobi (%s)."
 
-#~ msgid "Expander Size"
-#~ msgstr "Expander-velicina"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Velicina expander arrow"
 
@@ -15837,13 +16236,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Opis:</b> Zastra?ujuce"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status</b>: Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15871,9 +16263,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Po?alji poruku izabranom prijatelju"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Pogledaj informacije o izabranom prijatelju"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -16177,9 +16566,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Kratki pregled"
 
-#~ msgid "Message Text"
-#~ msgstr "Tekst poruke"
-
 #~ msgid "Away Messages"
 #~ msgstr "Poruka pri odsutnosti"
 
@@ -16296,9 +16682,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Kriticna gre?ka u GG biblioteci\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Nije moguce pingati server"
-
 #~ msgid "Send as message"
 #~ msgstr "Po?alji kao poruku"
 
@@ -16407,9 +16790,6 @@ msgstr ""
 #~ msgid "Nick:"
 #~ msgstr "Nadimak:"
 
-#~ msgid "Pidgin User"
-#~ msgstr "Pidgin korisnik"
-
 #~ msgid "File Transfer Aborted"
 #~ msgstr "Transfer datoteke je obustavljen"
 
@@ -16736,9 +17116,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s ulogovan/a."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s je izlogovan/a."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
============================================================
--- po/ca.po	42bbebc4e4a60c35653894487de56a912b72d996
+++ po/ca.po	e0cb446f3dabe3db25dd7f18bd81bf21e8cb513e
@@ -33,7 +33,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-29 08:35+0200\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-06-29 08:37+0200\n"
 "Last-Translator: Josep Puigdemont i Casamaj? <josep.puigdemont at gmail.com>\n"
 "Language-Team: Catalan <tradgnome at softcatala.net>\n"
@@ -2215,6 +2215,10 @@ msgstr "(%s) %s <RESPOSTA-AUTOM?TICA>: 
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOM?TICA>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "S'ha produ?t un error en crear la connexi?"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Esteu emprant %s, per? aquest connector requereix %s."
@@ -5171,6 +5175,12 @@ msgstr "Contactes que no s?n de MI"
 msgid "Non-IM Contacts"
 msgstr "Contactes que no s?n de MI"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s us ha enviat una invitaci? a la seva c?mera web, per? aix? encara no est? "
+"implementat."
+
 msgid "Nudge"
 msgstr "Donar un cop de colze"
 
@@ -5647,6 +5657,18 @@ msgstr "S'est? recuperant la llista d'a
 msgid "Retrieving buddy list"
 msgstr "S'est? recuperant la llista d'amics"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s us ha enviat una invitaci? a la seva c?mera web, per? aix? encara no est? "
+"implementat."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s us ha enviat una invitaci? a la seva c?mera web, per? aix? encara no est? "
+"implementat."
+
 msgid "Away From Computer"
 msgstr "Lluny de l'ordinador"
 
@@ -6408,6 +6430,29 @@ msgstr "Port en el servidor"
 msgid "Server port"
 msgstr "Port en el servidor"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "S'ha rebut una resposta HTTP inesperada del servidor."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Heu estat connectant-vos i desconnectat-vos amb massa freq??ncia. Espereu "
+"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
+"encara m?s temps."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "S'ha produ?t un error en resoldre %s"
+
+msgid "Incorrect password."
+msgstr "La contrasenya no ?s correcta."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "No s'ha pogut entrar a la sala de xat"
 
@@ -6743,9 +6788,6 @@ msgstr "El nom d'usuari no ?s v?lid"
 msgid "Invalid username."
 msgstr "El nom d'usuari no ?s v?lid"
 
-msgid "Incorrect password."
-msgstr "La contrasenya no ?s correcta."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "El vostre compte est? actualment susp?s."
@@ -6755,15 +6797,6 @@ msgstr ""
 msgstr ""
 "El servei de missatges instantanis d'AOL no est? disponible temporalment."
 
-#. username connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Heu estat connectant-vos i desconnectat-vos amb massa freq??ncia. Espereu "
-"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
-"encara m?s temps."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "La versi? del client que useu ?s massa antiga, actualitzeu-la a %s"
@@ -9606,12 +9639,6 @@ msgstr "Domini Auth"
 msgid "Auth Domain"
 msgstr "Domini Auth"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s us ha enviat una invitaci? a la seva c?mera web, per? aix? encara no est? "
-"implementat."
-
 msgid "Your SMS was not delivered"
 msgstr "No s'ha enviat l'SMS"
 
@@ -11031,6 +11058,118 @@ msgstr "/Amics/Ordena els amics"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amics/Ordena els amics"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Color de fons"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lasi?"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Color de fons"
+
+#, fuzzy
+msgid "The background color of an expanded group"
+msgstr "Nom del color de fons"
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Mida de l'expansor"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Selecciona el color de fons"
+
+#, fuzzy
+msgid "The background color of a collapsed group"
+msgstr "El color de fons com a GdkColor"
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Redueix"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Selecciona el color de fons"
+
+#, fuzzy
+msgid "The background color of a contact or chat"
+msgstr "El color de fons com a GdkColor"
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Drecera"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "En l?nia"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Aconsegueix dades sobre l'amic seleccionat"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Absent"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Aconsegueix dades sobre l'amic seleccionat"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Fora de l?nia"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Aconsegueix dades sobre l'amic seleccionat"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Text sobre l'estat d'?nim"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Aconsegueix dades sobre l'amic seleccionat"
+
+msgid "Message Text"
+msgstr "Text del missatge"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Text del missatge"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Canvia la informaci? d'usuari de %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidors SSL"
@@ -12170,9 +12309,6 @@ msgstr "Tipus de lletra"
 msgid "Font Face"
 msgstr "Tipus de lletra"
 
-msgid "Background Color"
-msgstr "Color de fons"
-
 msgid "Foreground Color"
 msgstr "Color del text"
 
@@ -13429,6 +13565,80 @@ msgstr ""
 msgstr ""
 "Mostra informaci? estad?stica sobre la disponibilitat dels vostres amics"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adre?a del servidor"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Introdu?u un servidor de confer?ncies"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Seleccioneu a quin servidor de confer?ncies consultar"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Serveis en l?nia"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Envia la llista d'amics"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Passi a absent"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Directori dels registres"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Selecci? de sons"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Servei PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descripci?:</b> Xerraire"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Informaci? del servei de descoberta"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Navegador:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "L'usuari no existeix."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "El servidor no permet blocar"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Informaci? del servei de descoberta"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Aquest connector ?s ?til per a depurar servidors i clients XMPP."
+
 msgid "Buddy is idle"
 msgstr "L'amic est? inactiu"
 
@@ -14138,6 +14348,115 @@ msgstr ""
 "Substitueix el text dels missatges que s'envien emprant les regles que h?giu "
 "establert."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "No est? connectat"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ha sortit."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Entra a un xat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignora"
+
+#, fuzzy
+msgid "Founder"
+msgstr "M?s alt"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "S'ha donat l'autoritzaci?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informaci?"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Di?leg de sol?licitud"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Nivell d'av?s"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Estat per a %s"
+
+# FIXME: no poso localitzaci? perqu? l'usuari ho podria
+#        confondre amb "ubicaci?" (josep)
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Caracter?stiques locals de la sala de xat"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Canvia la icona"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Control de temes GTK+ del Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informaci? del contacte"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Tema de la llista d'amics"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Tema de la llista d'amics"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Control de temes GTK+ del Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Control de temes GTK+ del Pidgin"
+
 # FIXME (josep)
 #. *< type
 #. *< ui_requirement
@@ -15292,13 +15611,6 @@ msgstr "Aquest connector ?s ?til per a
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Descripci?:</b> Xerraire"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15620,21 +15932,12 @@ msgstr "Aquest connector ?s ?til per a
 #~ msgid "YCHT port"
 #~ msgstr "Port YCHT"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ha sortit."
-
 #~ msgid "Screen Name:"
 #~ msgstr "Nom d'usuari:"
 
-#~ msgid "Background color name"
-#~ msgstr "Nom del color de fons"
-
 #~ msgid "Background color as a string"
 #~ msgstr "El color de fons com a una cadena"
 
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "El color de fons com a GdkColor"
-
 #~ msgid "Background set"
 #~ msgstr "Estableix el color de fons"
 
@@ -15970,9 +16273,6 @@ msgstr "Aquest connector ?s ?til per a
 #~ msgid "Show transfer details"
 #~ msgstr "Mostra els detalls de la transfer?ncia"
 
-#~ msgid "Expander Size"
-#~ msgstr "Mida de l'expansor"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Mida de la fletxa d'expansi?"
 
@@ -16195,9 +16495,6 @@ msgstr "Aquest connector ?s ?til per a
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Envia un missatge a l'amic seleccionat"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Aconsegueix dades sobre l'amic seleccionat"
-
 #~ msgid "_Chat"
 #~ msgstr "_Xat"
 
@@ -16362,9 +16659,6 @@ msgstr "Aquest connector ?s ?til per a
 #~ msgid "New conversation _placement:"
 #~ msgstr "_Posicionament d'una nova conversa:"
 
-#~ msgid "Message Text"
-#~ msgstr "Text del missatge"
-
 #~ msgid "Away Messages"
 #~ msgstr "Missatges d'abs?ncia"
 
============================================================
--- po/ca at valencia.po	93aaa055cecee4527e4b1e9a475cabb6e8be8325
+++ po/ca at valencia.po	52a041dcdbda56b9b1762f9622d92b3d795c3f38
@@ -33,7 +33,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-01-05 20:36+0100\n"
 "Last-Translator: Josep Puigdemont i Casamaj? <josep.puigdemont at gmail.com>\n"
 "Language-Team: Catalan <tradgnome at softcatala.net>\n"
@@ -1811,6 +1811,8 @@ msgstr "+++ %s se n'ha anat"
 msgid "+++ %s signed off"
 msgstr "+++ %s se n'ha anat"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -2208,6 +2210,10 @@ msgstr "(%s) %s <RESPOSTA-AUTOM?TICA>: 
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOM?TICA>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "S'ha produ?t un error en crear la connexi?"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Esteu emprant %s, per? este connector requerix %s."
@@ -3189,6 +3195,11 @@ msgstr "_Nom del xat:"
 msgid "Chat _name:"
 msgstr "_Nom del xat:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "No s'ha pogut resoldre el nom de l'ordinador."
+
 msgid "Chat error"
 msgstr "Error en el xat"
 
@@ -3237,6 +3248,10 @@ msgstr "Usuari Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Usuari Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "S'est? obtenint el servidor"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orde desconeguda: %s"
@@ -3279,7 +3294,8 @@ msgstr "_Contrasenya:"
 msgid "_Password:"
 msgstr "_Contrasenya:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Els sobrenoms d'IRC no poden contindre espais en blanc"
 
 #. 1. connect to server
@@ -3754,6 +3770,9 @@ msgstr "No hi ha cap m?tode d'autentica
 msgid "Server does not use any supported authentication method"
 msgstr "No hi ha cap m?tode d'autenticaci? compatible amb este servidor"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Requeriu xifratge, per? no est? disponible en este servidor."
+
 msgid "Invalid challenge from server"
 msgstr "Repte del servidor inv?lid"
 
@@ -4037,6 +4056,14 @@ msgstr "Recurs"
 msgid "Resource"
 msgstr "Recurs"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Connectat"
+
 # Segons la viquip?dia
 msgid "Middle Name"
 msgstr "Nom del mig"
@@ -4205,9 +4232,18 @@ msgstr "Cerca sales"
 msgid "Find Rooms"
 msgstr "Cerca sales"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Requeriu xifratge, per? no est? disponible en este servidor."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?lies:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "No s'ha trobat cap usuari que coincidisca"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rol"
+
 msgid "Ping timeout"
 msgstr "Temps d'espera del ping"
 
@@ -4227,7 +4263,7 @@ msgstr "L'ID de l'XMPP no ?s v?lid. Ca
 msgstr "L'ID de l'XMPP no ?s v?lid. Cal especificar un domini."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "No s'ha pogut connectar al servidor."
 
 #, c-format
@@ -4254,9 +4290,6 @@ msgstr "No s'ha pogut cancel?lar el reg
 msgid "Unregistration Failed"
 msgstr "No s'ha pogut cancel?lar el registre"
 
-msgid "Already Registered"
-msgstr "Ja esteu registrat"
-
 msgid "State"
 msgstr "Estat"
 
@@ -4269,6 +4302,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Ja esteu registrat"
+
 msgid "Unregister"
 msgstr "Cancel?la el registre"
 
@@ -4296,6 +4332,10 @@ msgstr "Canvia el registre"
 msgid "Change Registration"
 msgstr "Canvia el registre"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "No s'ha pogut connectar al servidor."
+
 msgid "Error unregistering account"
 msgstr "S'ha produ?t un error en cancel?lar el registre"
 
@@ -4666,16 +4706,18 @@ msgstr "ban &lt;user&gt; [motiu]:  bande
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [motiu]:  bandeja de la sala un usuari."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;usuari&gt; &lt;owner|admin|member|outcast|none&gt;: establix "
 "l'afiliaci? de l'usuari a la sala."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;usuari&gt; &lt;moderator|participant|visitor|none&gt;: establix el "
 "rol d'un usuari en una sala."
@@ -4739,6 +4781,9 @@ msgstr "Servidors intermediari per a la 
 msgid "File transfer proxies"
 msgstr "Servidors intermediari per a la transfer?ncia de fitxers"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5139,6 +5184,12 @@ msgstr "Contactes que no s?n de MI"
 msgid "Non-IM Contacts"
 msgstr "Contactes que no s?n de MI"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s us ha enviat una invitaci? a la seua c?mera web, per? aix? encara no est? "
+"implementat."
+
 msgid "Nudge"
 msgstr "Donar un cop de colze"
 
@@ -5481,63 +5532,26 @@ msgstr "Autenticaci? amb el Windows Liv
 msgstr "Autenticaci? amb el Windows Live ID: la resposta no ?s v?lida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s no ?s un nom de grup v?lid"
-
-msgid "Unknown error."
-msgstr "Error desconegut."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s a %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s us ha donat un cop de colze!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Error desconegut (%d)"
 
 msgid "Unable to add user"
 msgstr "No s'ha pogut afegir l'usuari"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Manquen estos usuaris a la vostra llista d'amics"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Error desconegut (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "No s'ha pogut blocar l'usuari %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "Manquen estos usuaris a la vostra llista d'amics"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "No s'ha pogut permetre l'usuari %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "No s'ha pogut afegir %s perqu? la llista ?s plena."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s no ?s un compte de passaport v?lid."
-
-msgid "Service Temporarily Unavailable."
-msgstr "El servici no est? disponible temporalment."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "No s'ha enviat el missatge al m?bil perqu? era massa llarg."
 
-msgid "Unable to rename group"
-msgstr "No s'ha pogut canviar el nom del grup"
-
-msgid "Unable to delete group"
-msgstr "No s'ha pogut suprimir el grup"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5630,6 +5644,9 @@ msgstr ""
 "La llista d'amics MSN est? temporalment no disponible. Espereu i proveu-ho "
 "m?s tard."
 
+msgid "Unknown error."
+msgstr "Error desconegut."
+
 msgid "Handshaking"
 msgstr "S'est? comprovant la conformitat de connexi?"
 
@@ -5648,6 +5665,18 @@ msgstr "S'est? recuperant la llista d'a
 msgid "Retrieving buddy list"
 msgstr "S'est? recuperant la llista d'amics"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s us ha enviat una invitaci? a la seua c?mera web, per? aix? encara no est? "
+"implementat."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s us ha enviat una invitaci? a la seua c?mera web, per? aix? encara no est? "
+"implementat."
+
 msgid "Away From Computer"
 msgstr "Lluny de l'ordinador"
 
@@ -5695,14 +5724,6 @@ msgstr ""
 msgstr ""
 "No s'ha pogut enviar el missatge perqu? s'ha produ?t un error desconegut:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s us ha afegit a la seua llista d'amics."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s us ha suprimit de la seua llista d'amics."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Voleu suprimir l'amic de la llibreta d'adreces?"
 
@@ -5732,6 +5753,51 @@ msgstr "Connector per al protocol MSN"
 msgstr "Connector per al protocol MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s no ?s un nom de grup v?lid"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s a %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "No s'ha pogut afegir l'usuari a %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "No s'ha pogut blocar l'usuari %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "No s'ha pogut permetre l'usuari %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "No s'ha pogut afegir %s perqu? la llista ?s plena."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s no ?s un compte de passaport v?lid."
+
+msgid "Service Temporarily Unavailable."
+msgstr "El servici no est? disponible temporalment."
+
+msgid "Unable to rename group"
+msgstr "No s'ha pogut canviar el nom del grup"
+
+msgid "Unable to delete group"
+msgstr "No s'ha pogut suprimir el grup"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s us ha afegit a la seua llista d'amics."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s us ha suprimit de la seua llista d'amics."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Este usuari no existix: %s"
 
@@ -5761,6 +5827,8 @@ msgstr "S'ha perdut la connexi? amb el 
 msgstr "S'ha perdut la connexi? amb el servidor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Missatges de correu nous"
 
@@ -5810,17 +5878,19 @@ msgstr "S'ha produ?t un error en el pro
 msgid "Protocol error, code %d: %s"
 msgstr "S'ha produ?t un error en el protocol amb codi %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s La vostra contrasenya cont? %d car?cters, m?s del m?xim de %d que permet "
 "MySpaceIM. Escolliu una contrasenya m?s curta a http://profileedit.myspace."
 "com/index.cfm?fuseaction=accountSettings.changePassword i proveu-ho de nou."
 
+msgid "Incorrect username or password"
+msgstr "El sobrenom o la contrasenya no s?n correctes"
+
 msgid "MySpaceIM Error"
 msgstr "S'ha produ?t un error en el MySpaceIM"
 
@@ -6146,9 +6216,6 @@ msgstr "L'arxiu mestre est? desconfigur
 msgid "Master archive is misconfigured"
 msgstr "L'arxiu mestre est? desconfigurat"
 
-msgid "Incorrect username or password"
-msgstr "El sobrenom o la contrasenya no s?n correctes"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "No s'ha pogut recon?ixer l'ordinador del nom d'usuari que heu entrat"
 
@@ -6373,6 +6440,29 @@ msgstr "Port en el servidor"
 msgid "Server port"
 msgstr "Port en el servidor"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "S'ha rebut una resposta HTTP inesperada del servidor."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Heu estat connectant-vos i desconnectat-vos amb massa freq??ncia. Espereu "
+"deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
+"encara m?s temps."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "S'ha produ?t un error en resoldre %s"
+
+msgid "Incorrect password."
+msgstr "La contrasenya no ?s correcta."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "No s'ha pogut entrar a la sala de xat"
 
@@ -6677,14 +6767,36 @@ msgstr ""
 "comen?ar amb una lletra i contindre nom?s lletres, nombres o espais, o nom?s "
 "nombres."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Se us pot desconnectar d'ac? a poc temps. Comproveu si hi ha actualitzacions "
+"a %s."
+
+# FIXME: hash (josep)
+msgid "Unable to get a valid AIM login hash."
+msgstr "No s'ha pogut obtindre un hash d'AIM d'entrada v?lid."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Se us pot desconnectar d'ac? a poc temps. Comproveu si hi ha actualitzacions "
+"a %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "No s'ha pogut obtindre un hash d'entrada v?lid."
+
+msgid "Could Not Connect"
+msgstr "No s'ha pogut connectar"
+
+msgid "Received authorization"
+msgstr "S'ha rebut l'autoritzaci?"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "El nom d'usuari no ?s v?lid"
 
-msgid "Incorrect password."
-msgstr "La contrasenya no ?s correcta."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "El vostre compte est? actualment susp?s."
@@ -6694,26 +6806,20 @@ msgstr ""
 msgstr ""
 "El servici de missatges instantanis d'AOL no est? disponible temporalment."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "La versi? del client que useu ?s massa antiga, actualitzeu-la a %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Heu estat connectant-vos i desconnectat-vos amb massa freq??ncia. Espereu "
 "deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
 "encara m?s temps."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "La versi? del client que useu ?s massa antiga, actualitzeu-la a %s"
-
-msgid "Could Not Connect"
-msgstr "No s'ha pogut connectar"
-
-msgid "Received authorization"
-msgstr "S'ha rebut l'autoritzaci?"
-
 msgid "The SecurID key entered is invalid."
 msgstr "La clau SecurID que heu entrat no ?s v?lida."
 
@@ -6729,25 +6835,6 @@ msgstr "_D'acord"
 msgid "_OK"
 msgstr "_D'acord"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Se us pot desconnectar d'ac? a poc temps. Comproveu si hi ha actualitzacions "
-"a %s."
-
-# FIXME: hash (josep)
-msgid "Unable to get a valid AIM login hash."
-msgstr "No s'ha pogut obtindre un hash d'AIM d'entrada v?lid."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Se us pot desconnectar d'ac? a poc temps. Comproveu si hi ha actualitzacions "
-"a %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "No s'ha pogut obtindre un hash d'entrada v?lid."
-
 msgid "Password sent"
 msgstr "S'ha enviat la contrasenya"
 
@@ -7252,6 +7339,7 @@ msgstr "Establix informaci? d'usuari (w
 msgid "Set User Info (web)..."
 msgstr "Establix informaci? d'usuari (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Canvia la contrasenya (web)"
 
@@ -7281,6 +7369,10 @@ msgstr "Cerca un amic per la informaci?
 msgid "Search for Buddy by Information"
 msgstr "Cerca un amic per la informaci?"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "L'usuari no est? connectat"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9565,12 +9657,6 @@ msgstr "Domini Auth"
 msgid "Auth Domain"
 msgstr "Domini Auth"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s us ha enviat una invitaci? a la seua c?mera web, per? aix? encara no est? "
-"implementat."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9598,6 +9684,44 @@ msgstr "S'ha rebutjat afegir l'amic"
 msgid "Add buddy rejected"
 msgstr "S'ha rebutjat afegir l'amic"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "S'han rebut dades inv?lides a la connexi? amb el servidor."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "La contrasenya no ?s correcta"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"S'ha produ?t un error desconegut, n?mero %d. Aix? es pot solucionar entrant "
+"al web de Yahoo!"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "L'usuari no existix."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"S'ha produ?t un error desconegut, n?mero %d. Aix? es pot solucionar entrant "
+"al web de Yahoo!"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "El sobrenom o la contrasenya no s?n correctes"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9711,8 +9835,8 @@ msgstr "Comen?a a dibuixar"
 msgid "Start Doodling"
 msgstr "Comen?a a dibuixar"
 
-msgid "Activate which ID?"
-msgstr "Quin ID voleu activar?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "A qui us voleu unir al xat?"
@@ -10510,8 +10634,9 @@ msgstr "Actualitzeu els camps necessaris
 msgid "Please update the necessary fields."
 msgstr "Actualitzeu els camps necessaris."
 
-msgid "Room _List"
-msgstr "_Llista de sales"
+#, fuzzy
+msgid "A_ccount"
+msgstr "_Compte:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10519,8 +10644,8 @@ msgstr ""
 msgstr ""
 "Introdu?u la informaci? necess?ria sobre el xat al qual vulgueu entrar.\n"
 
-msgid "_Account:"
-msgstr "C_ompte:"
+msgid "Room _List"
+msgstr "_Llista de sales"
 
 msgid "_Block"
 msgstr "_Bloca"
@@ -10958,6 +11083,118 @@ msgstr "/Amics/Ordena els amics"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amics/Ordena els amics"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Color de fons"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lasi?"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Color de fons"
+
+#, fuzzy
+msgid "The background color of an expanded group"
+msgstr "Nom del color de fons"
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Mida de l'expansor"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Selecciona el color de fons"
+
+#, fuzzy
+msgid "The background color of a collapsed group"
+msgstr "El color de fons com a GdkColor"
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Redu?x"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Selecciona el color de fons"
+
+#, fuzzy
+msgid "The background color of a contact or chat"
+msgstr "El color de fons com a GdkColor"
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Drecera"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "En l?nia"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Aconsegueix dades sobre l'amic seleccionat"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Absent"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Aconsegueix dades sobre l'amic seleccionat"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Fora de l?nia"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Aconsegueix dades sobre l'amic seleccionat"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Text sobre l'estat d'?nim"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Aconsegueix dades sobre l'amic seleccionat"
+
+msgid "Message Text"
+msgstr "Text del missatge"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Text del missatge"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Canvia la informaci? d'usuari de %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidors SSL"
@@ -11466,6 +11703,10 @@ msgstr "Hongar?s"
 msgid "Hungarian"
 msgstr "Hongar?s"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Roman?s"
+
 msgid "Indonesian"
 msgstr "Indonesi"
 
@@ -11565,6 +11806,9 @@ msgstr "Suec"
 msgid "Swedish"
 msgstr "Suec"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "T?mil"
 
@@ -12002,11 +12246,9 @@ msgstr "Al?a imatge"
 msgid "Save Image"
 msgstr "Al?a imatge"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Al_?a la imatge..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Afig una emoticona personalitzada..."
 
@@ -12097,9 +12339,6 @@ msgstr "Tipus de lletra"
 msgid "Font Face"
 msgstr "Tipus de lletra"
 
-msgid "Background Color"
-msgstr "Color de fons"
-
 msgid "Foreground Color"
 msgstr "Color del text"
 
@@ -12436,6 +12675,9 @@ msgstr "Avisa dels Whom"
 msgid "Pounce on Whom"
 msgstr "Avisa dels Whom"
 
+msgid "_Account:"
+msgstr "C_ompte:"
+
 msgid "_Buddy name:"
 msgstr "_Nom de l'amic:"
 
@@ -12550,9 +12792,18 @@ msgstr "Esdeveniment d'av?s desconegut,
 msgid "Unknown.... Please report this!"
 msgstr "Esdeveniment d'av?s desconegut, informeu-nos-en."
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "No s'ha pogut desempaquetar el tema d'emoticones."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "No s'ha pogut desempaquetar el tema d'emoticones."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "No s'ha pogut desempaquetar el tema d'emoticones."
+
 msgid "Install Theme"
 msgstr "Instal?la el tema"
 
@@ -13117,6 +13368,10 @@ msgstr "Gestor d'emoticones personalitza
 msgid "Custom Smiley Manager"
 msgstr "Gestor d'emoticones personalitzades"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Selecciona"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Feu clic per canviar la icona d'amic d'este compte."
 
@@ -13345,6 +13600,80 @@ msgstr ""
 msgstr ""
 "Mostra informaci? estad?stica sobre la disponibilitat dels vostres amics"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adre?a del servidor"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Introdu?u un servidor de confer?ncies"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Seleccioneu a quin servidor de confer?ncies consultar"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Serveis en l?nia"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Envia la llista d'amics"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Passe a absent"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Directori dels registres"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Selecci? de sons"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Servici PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descripci?:</b> Xerraire"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Informaci? del servici de descoberta"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Navegador:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "L'usuari no existix."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "No hi ha cap m?tode d'autenticaci? compatible amb este servidor"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Informaci? del servici de descoberta"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Este connector ?s ?til per a depurar servidors i clients XMPP."
+
 msgid "Buddy is idle"
 msgstr "L'amic est? inactiu"
 
@@ -13856,12 +14185,6 @@ msgstr ""
 "- escriu a l'inrev?s tots els missatges rebuts\n"
 "- envia un missatge a tots els amics immediatament despr?s que es connecten"
 
-msgid "Cursor Color"
-msgstr "Color del cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Color secundari del cursor"
-
 msgid "Hyperlink Color"
 msgstr "Color dels hiperenlla?os"
 
@@ -13871,6 +14194,10 @@ msgstr "Nom del color per als missatges 
 msgid "Highlighted Message Name Color"
 msgstr "Nom del color per als missatges ressaltats"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Color per a les notificacions de quan s'escriu"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separaci? horitzontal del GtkTreeView"
 
@@ -13900,35 +14227,25 @@ msgstr "Tema de la drecera de text de GT
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de la drecera de text de GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Colors de la interf?cie"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Habilita les notificacions de que s'est? escrivint"
 
-msgid "Widget Sizes"
-msgstr "Grand?ries del giny"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Control de temes GTK+ del Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Tanca"
+
 msgid "Fonts"
 msgstr "Tipus de lletra"
 
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "Error miscel?lani"
+
 msgid "Gtkrc File Tools"
 msgstr "Eines de fitxer Gtkrc"
 
@@ -14071,6 +14388,115 @@ msgstr ""
 "Substituix el text dels missatges que s'envien emprant les regles que h?geu "
 "establit."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "No est? connectat"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ha sortit."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Entra a un xat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignora"
+
+#, fuzzy
+msgid "Founder"
+msgstr "M?s alt"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "S'ha donat l'autoritzaci?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informaci?"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Di?leg de sol?licitud"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Nivell d'av?s"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Estat per a %s"
+
+# FIXME: no poso localitzaci? perqu? l'usuari ho podria
+#        confondre amb "ubicaci?" (josep)
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Caracter?stiques locals de la sala de xat"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Canvia la icona"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Control de temes GTK+ del Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informaci? del contacte"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Llista d'amics"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Llista d'amics"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Control de temes GTK+ del Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Control de temes GTK+ del Pidgin"
+
 # FIXME (josep)
 #. *< type
 #. *< ui_requirement
@@ -14285,6 +14711,21 @@ msgstr "Este connector ?s ?til per a d
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este connector ?s ?til per a depurar servidors i clients XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Quin ID voleu activar?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Color del cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Color secundari del cursor"
+
+#~ msgid "Interface colors"
+#~ msgstr "Colors de la interf?cie"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Grand?ries del giny"
+
 #~ msgid "Invite message"
 #~ msgstr "Missatge d'invitaci?"
 
@@ -14764,9 +15205,6 @@ msgstr "Este connector ?s ?til per a d
 #~ "llista d'amics. Opcionalment podeu entrar un ?lies, o sobrenom, per a "
 #~ "l'amic. El sobrenom substituir? el nom d'usuari all? on sigui possible.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Compte:"
-
 #~ msgid "User has typed something and stopped"
 #~ msgstr "L'usuari ha escrit alguna cosa i s'ha aturat"
 
@@ -15208,13 +15646,6 @@ msgstr "Este connector ?s ?til per a d
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Descripci?:</b> Xerraire"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15536,21 +15967,12 @@ msgstr "Este connector ?s ?til per a d
 #~ msgid "YCHT port"
 #~ msgstr "Port YCHT"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ha sortit."
-
 #~ msgid "Screen Name:"
 #~ msgstr "Nom d'usuari:"
 
-#~ msgid "Background color name"
-#~ msgstr "Nom del color de fons"
-
 #~ msgid "Background color as a string"
 #~ msgstr "El color de fons com a una cadena"
 
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "El color de fons com a GdkColor"
-
 #~ msgid "Background set"
 #~ msgstr "Estableix el color de fons"
 
@@ -15886,9 +16308,6 @@ msgstr "Este connector ?s ?til per a d
 #~ msgid "Show transfer details"
 #~ msgstr "Mostra els detalls de la transfer?ncia"
 
-#~ msgid "Expander Size"
-#~ msgstr "Mida de l'expansor"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Mida de la fletxa d'expansi?"
 
@@ -16111,9 +16530,6 @@ msgstr "Este connector ?s ?til per a d
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Envia un missatge a l'amic seleccionat"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Aconsegueix dades sobre l'amic seleccionat"
-
 #~ msgid "_Chat"
 #~ msgstr "_Xat"
 
@@ -16278,9 +16694,6 @@ msgstr "Este connector ?s ?til per a d
 #~ msgid "New conversation _placement:"
 #~ msgstr "_Posicionament d'una nova conversa:"
 
-#~ msgid "Message Text"
-#~ msgstr "Text del missatge"
-
 #~ msgid "Away Messages"
 #~ msgstr "Missatges d'abs?ncia"
 
@@ -16311,9 +16724,6 @@ msgstr "Este connector ?s ?til per a d
 #~ msgid "Invisible for friends only"
 #~ msgstr "Nom?s invisible per als amics"
 
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "No s'ha pogut resoldre el nom de l'ordinador."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "S'ha produ?t un error en escriure al s?col."
 
@@ -16523,9 +16933,6 @@ msgstr "Este connector ?s ?til per a d
 #~ msgid "/Buddies/Log Out"
 #~ msgstr "/Amics/Desconnecta"
 
-#~ msgid "Miscellaneous error"
-#~ msgstr "Error miscel?lani"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr ""
 #~ "S'ha produ?t un error desconegut en intentar autoritzar amb el servidor "
============================================================
--- po/cs.po	eb66a0c36b71b0727675488ee584607786370b19
+++ po/cs.po	c860801768bcd0ed9510d5b36520b8c490d0aedc
@@ -9,7 +9,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-22 14:43+0100\n"
 "Last-Translator: David Vachulka <david at konstrukce-cad.com>\n"
 "Language-Team: Czech <cs at li.org>\n"
@@ -1763,6 +1763,8 @@ msgstr "+++ %s se odhl?sil"
 msgid "+++ %s signed off"
 msgstr "+++ %s se odhl?sil"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nezn?m? chyba"
 
@@ -2160,6 +2162,10 @@ msgstr "(%s) %s <AUTO-ODPOV??>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-ODPOV??>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Chyba vytv??en? spojen?"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Pou??v?te %s, ale tento z?suvn? modul vy?aduje %s."
@@ -3131,6 +3137,11 @@ msgstr "_N?zev chatu:"
 msgid "Chat _name:"
 msgstr "_N?zev chatu:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Nemohu se p?ipojit k serveru."
+
 msgid "Chat error"
 msgstr "Chyba chatu"
 
@@ -3179,6 +3190,10 @@ msgstr "U?ivatel Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "U?ivatel Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Z?sk?v?m server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nezn?m? p??kaz: %s"
@@ -3221,7 +3236,8 @@ msgstr "_Heslo:"
 msgid "_Password:"
 msgstr "_Heslo:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "P?ezd?vky IRC nemohou obsahovat mezery"
 
 #. 1. connect to server
@@ -3696,6 +3712,9 @@ msgstr "Server nepou??v? ??dnou pod
 msgid "Server does not use any supported authentication method"
 msgstr "Server nepou??v? ??dnou podporovanou metodu autentizace"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Vy?adujete ?ifrov?n?, ale to nen? na serveru dostupn?."
+
 msgid "Invalid challenge from server"
 msgstr "Neplatn? v?zva od serveru"
 
@@ -3965,6 +3984,14 @@ msgstr "Zdroj"
 msgid "Resource"
 msgstr "Zdroj"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "P?ihl??en"
+
 msgid "Middle Name"
 msgstr "Prost?edn? jm?no"
 
@@ -4131,9 +4158,18 @@ msgstr "Hledat m?stnosti"
 msgid "Find Rooms"
 msgstr "Hledat m?stnosti"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Vy?adujete ?ifrov?n?, ale to nen? na serveru dostupn?."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Nenalezen ??dn? odpov?daj?c? u?ivatel"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Role"
+
 msgid "Ping timeout"
 msgstr "Ping timeout"
 
@@ -4153,7 +4189,7 @@ msgstr "Neplatn? ID XMPP. Mus? b?t na
 msgstr "Neplatn? ID XMPP. Mus? b?t nastavena dom?na."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Nemohu se p?ipojit k serveru."
 
 #, c-format
@@ -4180,9 +4216,6 @@ msgstr "Zru?en? registrace selhalo"
 msgid "Unregistration Failed"
 msgstr "Zru?en? registrace selhalo"
 
-msgid "Already Registered"
-msgstr "Ji? zaregistrov?n"
-
 msgid "State"
 msgstr "St?t"
 
@@ -4195,6 +4228,9 @@ msgstr "Datum"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Ji? zaregistrov?n"
+
 msgid "Unregister"
 msgstr "Zru?it registraci"
 
@@ -4222,6 +4258,10 @@ msgstr "Zm?nit registraci"
 msgid "Change Registration"
 msgstr "Zm?nit registraci"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Nemohu se p?ipojit k serveru."
+
 msgid "Error unregistering account"
 msgstr "Chyba zru?en? registrace ??tu"
 
@@ -4584,16 +4624,18 @@ msgstr "ban &lt;u?ivatel&gt; [d?vod]: 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;u?ivatel&gt; [d?vod]: Zak?zat u?ivateli p??stup do m?stnosti."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;u?ivatel&gt; &lt;owner|admin|member|outcast|none&gt;: Nastavit "
 "u?ivatel?v vztah k m?stnosti."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;u?ivatel&gt; &lt;moderator|participant|visitor|none&gt;: Nastavit "
 "u?ivatelovu roli v m?stnosti."
@@ -4658,6 +4700,9 @@ msgstr "Proxy p?enosu soubor?"
 msgid "File transfer proxies"
 msgstr "Proxy p?enosu soubor?"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5053,6 +5098,10 @@ msgstr "Ne-IM kontakty"
 msgid "Non-IM Contacts"
 msgstr "Ne-IM kontakty"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s v?m poslal pozv?nku k WWW kame?e, co? je?t? nen? podporov?no."
+
 msgid "Nudge"
 msgstr "??ouchnut?"
 
@@ -5396,63 +5445,26 @@ msgstr "Windows Live ID autentizace: Nep
 msgstr "Windows Live ID autentizace: Neplatn? odpov??"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nen? platn? skupina."
-
-msgid "Unknown error."
-msgstr "Nezn?m? chyba."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s v?m pr?v? poslal ??ouchnut?!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Nezn?m? chyba (%d)"
 
 msgid "Unable to add user"
 msgstr "Nemohu p?idat u?ivatele"
 
-msgid "The following users are missing from your addressbook"
-msgstr "N?sleduj?c? u?ivatel? chyb? v adres??i"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nemohu p?idat u?ivatele do %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Nezn?m? chyba (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nemohu zablokovat u?ivatele na %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "N?sleduj?c? u?ivatel? chyb? v adres??i"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nemohu povolit u?ivatele na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nelze p?idat, proto?e v?? seznam kamar?d? je pln?."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nen? platn? ??et passport."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Slu?ba do?asn? nen? k dispozici."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Zpr?va na mobil nebyla odesl?na, proto?e byla p??li? dlouh?."
 
-msgid "Unable to rename group"
-msgstr "Nemohu p?ejmenovat skupinu"
-
-msgid "Unable to delete group"
-msgstr "Nemohu odstranit skupinu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5543,6 +5555,9 @@ msgstr ""
 "V?? seznam kamar?d? MSN do?asn? nen? k dispozici. Po?kejte pros?m a zkuste "
 "to znovu."
 
+msgid "Unknown error."
+msgstr "Nezn?m? chyba."
+
 msgid "Handshaking"
 msgstr "Vyjedn?v?m"
 
@@ -5561,6 +5576,14 @@ msgstr "Z?sk?v?m seznam kamar?d?"
 msgid "Retrieving buddy list"
 msgstr "Z?sk?v?m seznam kamar?d?"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s v?m poslal pozv?nku k WWW kame?e, co? je?t? nen? podporov?no."
+
+#, 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."
+
 msgid "Away From Computer"
 msgstr "Pry? od po??ta?e"
 
@@ -5599,14 +5622,6 @@ msgstr "Zpr?va mo?n? nebyla odesl?na
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Zpr?va mo?n? nebyla odesl?na, proto?e do?lo k nezn?m? chyb?:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s v?s p?idal do sv?ho seznamu kamar?d?."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s v?s odstranil ze sv?ho seznamu kamar?d?."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Smazat kamar?da z adres??e?"
 
@@ -5636,6 +5651,51 @@ msgstr "Z?suvn? modul protokolu MSN"
 msgstr "Z?suvn? modul protokolu MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nen? platn? skupina."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nemohu p?idat u?ivatele do %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nemohu zablokovat u?ivatele na %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nemohu povolit u?ivatele na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nelze p?idat, proto?e v?? seznam kamar?d? je pln?."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nen? platn? ??et passport."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Slu?ba do?asn? nen? k dispozici."
+
+msgid "Unable to rename group"
+msgstr "Nemohu p?ejmenovat skupinu"
+
+msgid "Unable to delete group"
+msgstr "Nemohu odstranit skupinu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s v?s p?idal do sv?ho seznamu kamar?d?."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s v?s odstranil ze sv?ho seznamu kamar?d?."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Takov? u?ivatel neexistuje: %s"
 
@@ -5664,6 +5724,8 @@ msgstr "Ztraceno spojen? se serverem"
 msgstr "Ztraceno spojen? se serverem"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Zpr?vy o nov? po?t?"
 
@@ -5715,17 +5777,19 @@ msgstr "Chyba protokolu, k?d %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Chyba protokolu, k?d %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s va?e heslo m? %d znak?, co? je v?ce ne? maximum %d pro MySpaceIM. Pros?m "
 "zkra?te va?e heslo na http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings. Zm?nte heslo a zkuste znovu."
 
+msgid "Incorrect username or password"
+msgstr "Nespr?vn? jm?no u?ivatele nebo heslo"
+
 msgid "MySpaceIM Error"
 msgstr "Chyba MySpaceIM"
 
@@ -6043,9 +6107,6 @@ msgstr "Hlavn? archiv nen? spr?vn? n
 msgid "Master archive is misconfigured"
 msgstr "Hlavn? archiv nen? spr?vn? nastaven"
 
-msgid "Incorrect username or password"
-msgstr "Nespr?vn? jm?no u?ivatele nebo heslo"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nemohu rozpoznat po??ta? ve jm?nu u?ivatele, kter? jste zadali"
 
@@ -6256,6 +6317,28 @@ msgstr "Port serveru"
 msgid "Server port"
 msgstr "Port serveru"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "P?ijata neo?ek?van? odpov?? HTTP od serveru."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"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."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Chyba p?i ??d?n? o p?ihla?ovac? token"
+
+msgid "Incorrect password."
+msgstr "Nespr?vn? heslo."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Nemohu se p?ipojit k chatu"
 
@@ -6557,14 +6640,32 @@ msgstr ""
 "p?smenem a obsahovat jen ??slice, p?smena a mezery, nebo obsahovat jen "
 "??slice."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Mo?n? budete brzo odpojen. Jestli?e se tak stane, hledejte aktualizace na %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nemohu z?skat platn? p?ihla?ovac? hash AIM."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Mo?n? budete brzo odpojen. Hledejte aktualizace na %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nemohu z?skat platn? p?ihla?ovac? hash."
+
+msgid "Could Not Connect"
+msgstr "Nemohu se p?ipojit"
+
+msgid "Received authorization"
+msgstr "P?ijata autorizace"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Neplatn? jm?no u?ivatele."
 
-msgid "Incorrect password."
-msgstr "Nespr?vn? heslo."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "V?? ??et je moment?ln? suspendov?n."
@@ -6573,26 +6674,20 @@ msgstr "Slu?ba AOL Instant Messenger je
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Slu?ba AOL Instant Messenger je do?asn? nedostupn?."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"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."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Verze klienta, kterou pou??v?te, je p??li? star?. Aktualizujte pros?m na %s"
 
-msgid "Could Not Connect"
-msgstr "Nemohu se p?ipojit"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"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 "Received authorization"
-msgstr "P?ijata autorizace"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Zadan? kl?? SecurID nen? platn?."
 
@@ -6608,21 +6703,6 @@ msgstr "_Budi?"
 msgid "_OK"
 msgstr "_Budi?"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Mo?n? budete brzo odpojen. Jestli?e se tak stane, hledejte aktualizace na %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nemohu z?skat platn? p?ihla?ovac? hash AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Mo?n? budete brzo odpojen. Hledejte aktualizace na %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nemohu z?skat platn? p?ihla?ovac? hash."
-
 msgid "Password sent"
 msgstr "Heslo odesl?no"
 
@@ -7149,6 +7229,7 @@ msgstr "Nastavit informace o u?ivateli 
 msgid "Set User Info (web)..."
 msgstr "Nastavit informace o u?ivateli (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Zm?nit heslo (web)"
 
@@ -7178,6 +7259,10 @@ msgstr "Hledat kamar?da podle informac? msgid "Search for Buddy by Information"
 msgstr "Hledat kamar?da podle informac?"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "U?ivatel nen? p?ihl??en"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9436,10 +9521,6 @@ msgstr "Dom?na autentizace"
 msgid "Auth Domain"
 msgstr "Dom?na autentizace"
 
-#, 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."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9466,6 +9547,40 @@ msgstr "P?id?n? kamar?da zam?tnuto"
 msgid "Add buddy rejected"
 msgstr "P?id?n? kamar?da zam?tnuto"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Na spojen? se serverem p?ijata neplatn? data."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Nespr?vn? heslo"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Nezn?m? chyba ??slo %d. P?ihl??en? se na WWW Yahoo! to mo?n? oprav?."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "U?ivatel neexistuje"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Nezn?m? chyba ??slo %d. P?ihl??en? se na WWW Yahoo! to mo?n? oprav?."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nespr?vn? jm?no u?ivatele nebo heslo"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9574,8 +9689,8 @@ msgstr "Za??t kreslit"
 msgid "Start Doodling"
 msgstr "Za??t kreslit"
 
-msgid "Activate which ID?"
-msgstr "Kter? ID aktivovat?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "P?ipojit koho k chatu?"
@@ -10368,8 +10483,9 @@ msgstr "Aktualizujte pros?m pot?ebn? 
 msgid "Please update the necessary fields."
 msgstr "Aktualizujte pros?m pot?ebn? pole."
 
-msgid "Room _List"
-msgstr "Seznam _m?stnost?"
+#, fuzzy
+msgid "A_ccount"
+msgstr "??et:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10378,8 +10494,8 @@ msgstr ""
 "Zadejte pros?m odpov?daj?c? informace o chatu, ke kter?mu se chcete "
 "p?ipojit.\n"
 
-msgid "_Account:"
-msgstr "_??et:"
+msgid "Room _List"
+msgstr "Seznam _m?stnost?"
 
 msgid "_Block"
 msgstr "_Blokovat"
@@ -10816,6 +10932,112 @@ msgstr "/Kamar?di/?adit kamar?dy"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kamar?di/?adit kamar?dy"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Barva pozad?"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Tato skupina byla p?id?na do va?eho seznamu kamar?d?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laon?tina"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Barva pozad?"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Rozbalit"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Vyberte barvu pozad?"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Sbalit"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Vyberte barvu pozad?"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Kl?vesov? zkratka"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "P?ipojen"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Pry?"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Odpojen"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Text n?lady"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Zpr?va odesl?na"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Zm?nit informace o u?ivateli %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL servery"
@@ -11317,6 +11539,10 @@ msgstr "Ma?ar?tina"
 msgid "Hungarian"
 msgstr "Ma?ar?tina"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumun?tina"
+
 msgid "Indonesian"
 msgstr "Indon??tina"
 
@@ -11414,6 +11640,9 @@ msgstr "?v?d?tina"
 msgid "Swedish"
 msgstr "?v?d?tina"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11841,11 +12070,9 @@ msgstr "Ulo?it obr?zek"
 msgid "Save Image"
 msgstr "Ulo?it obr?zek"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Ulo?it obr?zek..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_P?idat u?ivatelsk? smajl?ky..."
 
@@ -11934,9 +12161,6 @@ msgstr "?ez p?sma"
 msgid "Font Face"
 msgstr "?ez p?sma"
 
-msgid "Background Color"
-msgstr "Barva pozad?"
-
 msgid "Foreground Color"
 msgstr "Barva pop?ed?"
 
@@ -12263,6 +12487,9 @@ msgstr "Sledovat koho"
 msgid "Pounce on Whom"
 msgstr "Sledovat koho"
 
+msgid "_Account:"
+msgstr "_??et:"
+
 msgid "_Buddy name:"
 msgstr "_Jm?no kamar?da:"
 
@@ -12373,9 +12600,18 @@ msgstr "Nezn?m? ud?lost sledov?n?. 
 msgid "Unknown.... Please report this!"
 msgstr "Nezn?m? ud?lost sledov?n?. Oznamte to pros?m!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "T?ma smajl?k? nelze rozbalit."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "T?ma smajl?k? nelze rozbalit."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "T?ma smajl?k? nelze rozbalit."
+
 msgid "Install Theme"
 msgstr "Nainstalovat t?ma"
 
@@ -12936,6 +13172,10 @@ msgstr "Spr?vce smajl?k?"
 msgid "Custom Smiley Manager"
 msgstr "Spr?vce smajl?k?"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Vybrat kamar?da"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Zm?n? ikonu pro tento ??et."
 
@@ -13156,6 +13396,80 @@ msgstr "Zobraz? statistick? informace 
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Zobraz? statistick? informace o dostupnosti kamar?d?"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adresa serveru"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Zadejte server konference"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Zvolte server konference, kter?ho se pt?t"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Slu?by online"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Odeslat seznam kamar?d?"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Jde pry?"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Adres?? z?znam?"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "V?b?r zvuku"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub slu?ba"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Popis:</b> Vystra?en?"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Informace vyhled?n? slu?by"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Prohl??e?:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "U?ivatel neexistuje"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server nepodporuje blokov?n?"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Informace vyhled?n? slu?by"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Tento z?suvn? modul je u?ite?n? pro lad?n? server? nebo klient? XMPP."
+
 msgid "Buddy is idle"
 msgstr "Kamar?d je ne?inn?"
 
@@ -13652,12 +13966,6 @@ msgstr ""
 "- Obrac? v?echen p??choz? text\n"
 "- Ode?le zpr?vu lidem ve va?em seznamu okam?it?, kdy? se p?ihl?s?"
 
-msgid "Cursor Color"
-msgstr "Barva kurzoru"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekund?rn? barva kurzoru"
-
 msgid "Hyperlink Color"
 msgstr "Barva odkazu"
 
@@ -13667,6 +13975,10 @@ msgstr "Barva zv?razn?n? zpr?vy"
 msgid "Highlighted Message Name Color"
 msgstr "Barva zv?razn?n? zpr?vy"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Barva pro upozorn?n? na psan?"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Vodorovn? odd?len? GtkTreeView"
 
@@ -13696,35 +14008,24 @@ msgstr "T?ma GTK+ textu odkazu"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "T?ma GTK+ textu odkazu"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Barvy rozhran?"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Povolit upozorn?n? na psan?"
 
-msgid "Widget Sizes"
-msgstr "Velikosti widget?"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Ovl?d?n? t?matu GTK+ Pidginu"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Zav??t"
+
 msgid "Fonts"
 msgstr "P?sma"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "N?stroje souboru Gtkrc"
 
@@ -13864,12 +14165,119 @@ msgstr ""
 msgstr ""
 "Nahrazuje text v odchoz?ch zpr?v?ch podle u?ivatelem definovan?ch pravidel."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Nep?ihl??en."
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Nep?ihl??en."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "P?ipojit se k chatu"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorovat"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Hlasit?j??"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizace ud?lena"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Chyba "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informace"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Dialog po?adavku"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "?rove? varov?n?"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Stav pro %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Locale m?stnosti chatu"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Zm?nit ikonu"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Ovl?d?n? t?matu GTK+ Pidginu"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktn? informace"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Seznam kamar?d?"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Seznam kamar?d?"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Ovl?d?n? t?matu GTK+ Pidginu"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Ovl?d?n? t?matu GTK+ Pidginu"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Ticker kamar?d?"
 
@@ -14074,6 +14482,21 @@ msgstr "Tento z?suvn? modul je u?ite? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Tento z?suvn? modul je u?ite?n? pro lad?n? server? nebo klient? XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Kter? ID aktivovat?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Barva kurzoru"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekund?rn? barva kurzoru"
+
+#~ msgid "Interface colors"
+#~ msgstr "Barvy rozhran?"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Velikosti widget?"
+
 #~ msgid "Invite message"
 #~ msgstr "Zvac? zpr?va"
 
@@ -14509,9 +14932,6 @@ msgstr "Tento z?suvn? modul je u?ite? #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "V?? po?adavek vstoupit do skupiny %d byl schv?len spr?vcem %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Tato skupina byla p?id?na do va?eho seznamu kamar?d?"
-
 #~ msgid "I am applying to join"
 #~ msgstr "??d?m o p?id?n?"
 
@@ -14594,9 +15014,6 @@ msgstr "Tento z?suvn? modul je u?ite? #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(stahuji)</i>"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Chyba p?i ??d?n? o p?ihla?ovac? token"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP adresa"
 
@@ -14780,10 +15197,6 @@ msgstr "Tento z?suvn? modul je u?ite? #~ msgid "_Merge"
 #~ msgstr "Z_pr?va:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "??et:"
-
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Pr?v? jste odeslali ??ouchnut?!"
 
@@ -14906,13 +15319,6 @@ msgstr "Tento z?suvn? modul je u?ite? 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Popis:</b> Vystra?en?"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
============================================================
--- po/da.po	495efe624a463baf9c83fb8f1fc92793096eceb1
+++ po/da.po	47efac82d50093dcc5efdafc20cb5f57b0b89df1
@@ -25,7 +25,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-23 18:17+0100\n"
 "Last-Translator: Peter Bach <bach.peter at gmail.com>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -1783,6 +1783,8 @@ msgstr "+++ %s loggede ud"
 msgid "+++ %s signed off"
 msgstr "+++ %s loggede ud"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -2184,6 +2186,10 @@ msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Fejl ved oprettelse af forbindelse"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du bruger %s, men dette udvidelsesmodul kraever %s."
@@ -3154,6 +3160,11 @@ msgstr "Samtale_navn:"
 msgid "Chat _name:"
 msgstr "Samtale_navn:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Kunne ikke kontakte server."
+
 msgid "Chat error"
 msgstr "Fejl i samtale"
 
@@ -3202,6 +3213,10 @@ msgstr "Gadu-Gadu bruger"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu bruger"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Finder server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukendt kommando: %s"
@@ -3244,7 +3259,8 @@ msgstr "_Adgangskode:"
 msgid "_Password:"
 msgstr "_Adgangskode:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC navne m? ikke indeholde mellemrum og lignende"
 
 #. 1. connect to server
@@ -3715,6 +3731,9 @@ msgstr "Serveren bruger ikke nogle under
 msgid "Server does not use any supported authentication method"
 msgstr "Serveren bruger ikke nogle underst?ttede godkendelsesmetoder"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Du kraever kryptering, men det er ikke tilr?dighed p? denne server."
+
 msgid "Invalid challenge from server"
 msgstr "Ugyldigt svar fra server"
 
@@ -3985,6 +4004,14 @@ msgstr "Ressource"
 msgid "Resource"
 msgstr "Ressource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Logget ind"
+
 msgid "Middle Name"
 msgstr "Mellemnavn"
 
@@ -4151,9 +4178,18 @@ msgstr "Find rum"
 msgid "Find Rooms"
 msgstr "Find rum"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Du kraever kryptering, men det er ikke tilr?dighed p? denne server."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Ikke-matchende brugere fundet"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rolle"
+
 msgid "Ping timeout"
 msgstr "Ping tidsudl?b"
 
@@ -4173,7 +4209,7 @@ msgstr "Ugyldigt XMPP-id. Domaene skal a
 msgstr "Ugyldigt XMPP-id. Domaene skal angives."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Kunne ikke forbinde til server."
 
 #, c-format
@@ -4200,9 +4236,6 @@ msgstr "Afregistrering fejlede"
 msgid "Unregistration Failed"
 msgstr "Afregistrering fejlede"
 
-msgid "Already Registered"
-msgstr "Allerede registreret"
-
 msgid "State"
 msgstr "Landsdel"
 
@@ -4215,6 +4248,9 @@ msgstr "Dato"
 msgid "Date"
 msgstr "Dato"
 
+msgid "Already Registered"
+msgstr "Allerede registreret"
+
 msgid "Unregister"
 msgstr "Afregistr?r"
 
@@ -4242,6 +4278,10 @@ msgstr "AEndr registrering"
 msgid "Change Registration"
 msgstr "AEndr registrering"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Kunne ikke forbinde til server."
+
 msgid "Error unregistering account"
 msgstr "Fejl ved afregistrering af konto"
 
@@ -4606,16 +4646,18 @@ msgstr "ban &lt;user&gt; [reason]:  Udvi
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [reason]:  Udvis en bruger fra rummet."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;bruger&gt; &lt;owner|admin|member|outcast|none&gt;: Indstil en "
 "brugerstilknytning til rummet."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;bruger&gt; &lt;moderator|participant|visitor|none&gt;: Indstil en "
 "brugers rolle i rummet."
@@ -4679,6 +4721,9 @@ msgstr "Filoverf?rsel-proxyer"
 msgid "File transfer proxies"
 msgstr "Filoverf?rsel-proxyer"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5079,6 +5124,10 @@ msgstr "Ikke-besked kontakter"
 msgid "Non-IM Contacts"
 msgstr "Ikke-besked kontakter"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s har sendt dig en webcam invitation, hvilket ikke er underst?ttet."
+
 msgid "Nudge"
 msgstr "Flirt"
 
@@ -5423,63 +5472,26 @@ msgstr "Godkendelse af Windows Live-id:U
 msgstr "Godkendelse af Windows Live-id:Ugyldigt svar"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s er ikke en gyldig gruppe."
-
-msgid "Unknown error."
-msgstr "Ukendt fejl."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s p? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s sendte dig et vink!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Ukendt fejl (%d)"
 
 msgid "Unable to add user"
 msgstr "Kunne ikke tilf?je bruger"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Ukendt fejl (%d)"
+
 msgid "The following users are missing from your addressbook"
 msgstr "F?lgende brugere mangler i din adressebog"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kunne ikke tilf?je brugeren p? %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kunne ikke blokere bruger p? %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kunne ikke tillade bruger p? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s kunne ikke tilf?jes, fordi din venneliste er fuld."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s er ikke en gyldig passport-konto."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Tjeneste midlertidigt utilgaengelig."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilbesked blev ikke sendt, fordi den var for lang."
 
-msgid "Unable to rename group"
-msgstr "Kunne ikke omd?be gruppe"
-
-msgid "Unable to delete group"
-msgstr "Kunne ikke slette gruppe"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5566,6 +5578,9 @@ msgstr ""
 msgstr ""
 "Din MSN venneliste er midlertidigt utilgaengelig. Vent og f?rs?g igen senere."
 
+msgid "Unknown error."
+msgstr "Ukendt fejl."
+
 msgid "Handshaking"
 msgstr "Forhandler"
 
@@ -5584,6 +5599,14 @@ msgstr "Modtager venneliste"
 msgid "Retrieving buddy list"
 msgstr "Modtager venneliste"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s har sendt dig en webcam invitation, hvilket ikke er underst?ttet."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s har sendt dig en webcam invitation, hvilket ikke er underst?ttet."
+
 msgid "Away From Computer"
 msgstr "Vaek fra computeren"
 
@@ -5625,14 +5648,6 @@ msgstr "Besked kunne ikke sendes p? gru
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Besked kunne ikke sendes p? grund af en ukendt ?rsag:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s har tilf?jet dig til hans eller hendes venneliste."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s har fjernet dig fra hans eller hendes venneliste."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Slet ven fra adressebog?"
 
@@ -5662,6 +5677,51 @@ msgstr "MSN-protokoludvidelsesmodul"
 msgstr "MSN-protokoludvidelsesmodul"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s er ikke en gyldig gruppe."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s p? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kunne ikke tilf?je brugeren p? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kunne ikke blokere bruger p? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kunne ikke tillade bruger p? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s kunne ikke tilf?jes, fordi din venneliste er fuld."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s er ikke en gyldig passport-konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tjeneste midlertidigt utilgaengelig."
+
+msgid "Unable to rename group"
+msgstr "Kunne ikke omd?be gruppe"
+
+msgid "Unable to delete group"
+msgstr "Kunne ikke slette gruppe"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s har tilf?jet dig til hans eller hendes venneliste."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s har fjernet dig fra hans eller hendes venneliste."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Bruger findes ikke: %s"
 
@@ -5690,6 +5750,8 @@ msgstr "Mistede forbindelsen til server"
 msgstr "Mistede forbindelsen til server"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nye postbeskeder"
 
@@ -5738,17 +5800,19 @@ msgstr "Protokol fejlkode %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Protokol fejlkode %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Din adgangskode er %d karakterer og dermed st?rre end det forventede "
 "maksimum p? %d for MySpaceIM. Forkort din adgangskode p? http://profileedit."
 "myspace.com/index.cfm?fuseaction=accountSettings.changePassword og pr?v igen."
 
+msgid "Incorrect username or password"
+msgstr "Forkert brugernavn eller adgangskode"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fejl"
 
@@ -6066,9 +6130,6 @@ msgstr "Hoved-arkiv er konfigureret fork
 msgid "Master archive is misconfigured"
 msgstr "Hoved-arkiv er konfigureret forkert"
 
-msgid "Incorrect username or password"
-msgstr "Forkert brugernavn eller adgangskode"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kunne ikke genkende vaerten p? brugernavnet du indtastede"
 
@@ -6281,6 +6342,28 @@ msgstr "Server port"
 msgid "Server port"
 msgstr "Server port"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Modtog ugyldigt HTTP-svar fra server."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti "
+"minutter og pr?v s? igen, for ellers skal du bare vente endnu laengere."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Fejl ved oprettelse af forbindelse"
+
+msgid "Incorrect password."
+msgstr "Forkert adgangskode."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Kunne ikke tilslutte samtalerum"
 
@@ -6583,14 +6666,33 @@ msgstr ""
 "bogstav og kun indeholde bogstaver, tal eller mellemrum, eller kun indeholde "
 "tal."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Du vil m?ske blive frakoblet snart.  Hvis tilfaeldet, kontroll?r %s for "
+"opdateringer."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kunne ikke hente et gyldigt AIM-logindhash."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Du vil m?ske blive frakoblet snart. Kontroll?r %s for opdateringer."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kunne ikke hente et gyldigt loginhash."
+
+msgid "Could Not Connect"
+msgstr "Forbindelse fejlede"
+
+msgid "Received authorization"
+msgstr "Modtog godkendelse"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Ugyldigt brugernavn."
 
-msgid "Incorrect password."
-msgstr "Forkert adgangskode."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Din konto er ikke aktiv for ?jeblikket."
@@ -6599,25 +6701,19 @@ msgstr "AOL Instant Messenger tjenesten 
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger tjenesten er midlertidigt utilgaengelig."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Din klient er for gammel. Hent en opgradering p? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Du er logget ind og ud for mange gange indenfor et kort tidsrum. Vent ti "
 "minutter og pr?v s? igen, for ellers skal du bare vente endnu laengere."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Din klient er for gammel. Hent en opgradering p? %s"
-
-msgid "Could Not Connect"
-msgstr "Forbindelse fejlede"
-
-msgid "Received authorization"
-msgstr "Modtog godkendelse"
-
 msgid "The SecurID key entered is invalid."
 msgstr "SecurID-n?glen du indtastede er ugyldig."
 
@@ -6633,22 +6729,6 @@ msgstr "_O.k."
 msgid "_OK"
 msgstr "_O.k."
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Du vil m?ske blive frakoblet snart.  Hvis tilfaeldet, kontroll?r %s for "
-"opdateringer."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kunne ikke hente et gyldigt AIM-logindhash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Du vil m?ske blive frakoblet snart. Kontroll?r %s for opdateringer."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kunne ikke hente et gyldigt loginhash."
-
 msgid "Password sent"
 msgstr "Adgangskode sendt"
 
@@ -7162,6 +7242,7 @@ msgstr "Indstil brugeroplysninger (inter
 msgid "Set User Info (web)..."
 msgstr "Indstil brugeroplysninger (internet)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "AEndr adgangskode (internet)"
 
@@ -7191,6 +7272,10 @@ msgstr "S?g efter ven udfra oplysninger
 msgid "Search for Buddy by Information"
 msgstr "S?g efter ven udfra oplysninger"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Bruger er ikke logget ind"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9447,10 +9532,6 @@ msgstr "Autentificering domaene"
 msgid "Auth Domain"
 msgstr "Autentificering domaene"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s har sendt dig en webcam invitation, hvilket ikke er underst?ttet."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9479,6 +9560,44 @@ msgstr "Vennetilf?jelse naegtet"
 msgid "Add buddy rejected"
 msgstr "Vennetilf?jelse naegtet"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Modtog ugyldig data ved forbindelse med server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Forkert adgangskode"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ukendt fejl nummer %d. Pr?v at logge ind p? Yahoo!webstedet for at fixe "
+"dette."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Bruger eksisterer ikke"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ukendt fejl nummer %d. Pr?v at logge ind p? Yahoo!webstedet for at fixe "
+"dette."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Forkert brugernavn eller adgangskode"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9590,8 +9709,8 @@ msgstr "Start med at \"Doodle\""
 msgid "Start Doodling"
 msgstr "Start med at \"Doodle\""
 
-msgid "Activate which ID?"
-msgstr "Aktiv?r hvilket id?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Tilslut hvem i samtale?"
@@ -10373,8 +10492,9 @@ msgstr "Opdat?r de n?dvendige felter."
 msgid "Please update the necessary fields."
 msgstr "Opdat?r de n?dvendige felter."
 
-msgid "Room _List"
-msgstr "Rum_liste"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Konto:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10382,8 +10502,8 @@ msgstr ""
 msgstr ""
 "Indtast den n?dvendige information om den samtale du gerne vil tilslutte.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Rum_liste"
 
 msgid "_Block"
 msgstr "_Blok?r"
@@ -10822,6 +10942,112 @@ msgstr "/Venner/Sort?r venner"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Venner/Sort?r venner"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Baggrundsfarve"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Denne gruppe er blevet tilf?jet til din venneliste"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Baggrundsfarve"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Udvid"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Vaelg baggrundsfarve"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Fold sammen"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Vaelg baggrundsfarve"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Genvej"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Tilkoblet"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Fravaerende"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Afkoblet"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Hum?rtekst"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Besked sendt"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "AEndr brugeroplysninger for %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-servere"
@@ -11324,6 +11550,10 @@ msgstr "Ungarsk"
 msgid "Hungarian"
 msgstr "Ungarsk"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumaensk"
+
 msgid "Indonesian"
 msgstr "Indonesisk"
 
@@ -11421,6 +11651,9 @@ msgstr "Svensk"
 msgid "Swedish"
 msgstr "Svensk"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamilsk"
 
@@ -11847,11 +12080,9 @@ msgstr "Gem billede"
 msgid "Save Image"
 msgstr "Gem billede"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Gem billede..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Tilf?j tilpasset smiley..."
 
@@ -11941,9 +12172,6 @@ msgstr "Skrifttype-familie"
 msgid "Font Face"
 msgstr "Skrifttype-familie"
 
-msgid "Background Color"
-msgstr "Baggrundsfarve"
-
 msgid "Foreground Color"
 msgstr "Forgrundsfarve"
 
@@ -12274,6 +12502,9 @@ msgstr "Overv?g hvem"
 msgid "Pounce on Whom"
 msgstr "Overv?g hvem"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "_Vennenavn:"
 
@@ -12384,9 +12615,18 @@ msgstr "Ukendt haendelse ved overv?gnin
 msgid "Unknown.... Please report this!"
 msgstr "Ukendt haendelse ved overv?gning. Venligst rapport?r dette!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Smiley-tema kunne ikke udpakkes."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Smiley-tema kunne ikke udpakkes."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Smiley-tema kunne ikke udpakkes."
+
 msgid "Install Theme"
 msgstr "Install?r tema"
 
@@ -12946,6 +13186,10 @@ msgstr "Brugertilpasset h?ndtering af s
 msgid "Custom Smiley Manager"
 msgstr "Brugertilpasset h?ndtering af smiley"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Vaelg ven"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klik for at aendre dit venneikon til denne konto."
 
@@ -13167,6 +13411,82 @@ msgstr "Viser statistiske oplysninger om
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Viser statistiske oplysninger om dine venners tilgaengelighed"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Serveradresse"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Indtast en konference-server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Vaelg en konference-server at sl? op"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online tjenester"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send venneliste"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Bliver fravaerende"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Logmappe"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Lydvalg"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub-tjeneste"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Beskrivelse:</b> Skraemmende"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Besked ved tjenesteopdagelse"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Bruger eksisterer ikke"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server underst?tter ikke blokering"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Besked ved tjenesteopdagelse"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Dette udvidelsesmodul er nyttigt for fejls?gning af XMPP-servere eller "
+"klienter."
+
 msgid "Buddy is idle"
 msgstr "Ven er inaktiv"
 
@@ -13671,12 +13991,6 @@ msgstr ""
 "- Det skriver al indkommende tekst bagvendt\n"
 "- Det sender en besked til folk p? din venneliste straks n?r de logger p?"
 
-msgid "Cursor Color"
-msgstr "Mark?r farve"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekundaer mark?r farve"
-
 msgid "Hyperlink Color"
 msgstr "Farve p? henvisning"
 
@@ -13686,6 +14000,10 @@ msgstr "Farve som bruges til fremhaevede
 msgid "Highlighted Message Name Color"
 msgstr "Farve som bruges til fremhaevede beskednavne"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Farve p? p?mindelse af indtastning"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horisontal separering"
 
@@ -13715,35 +14033,24 @@ msgstr "GTK+ tekst genvejstema"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ tekst genvejstema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Graenseflade farver"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Aktiv?r p?mindelse om indtastning"
 
-msgid "Widget Sizes"
-msgstr "St?rrelse p? kontroller"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Temakontrol til Pidgin GTK+"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Luk"
+
 msgid "Fonts"
 msgstr "Skrifttyper"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-filvaerkt?jer"
 
@@ -13884,12 +14191,119 @@ msgstr "Erstatter tekst i udg?ende besk
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstatter tekst i udg?ende beskeder udfra bruger-definerede regler."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Ikke logget ind"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Ikke logget ind"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Tilslut en samtale"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignor?r"
+
+#, fuzzy
+msgid "Founder"
+msgstr "H?jere"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Godkendelse Givet"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Fejl "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Anmodnings dialog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Advarselsniveau"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status for %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Samtalerum tegnsaet"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "AEndr ikon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Temakontrol til Pidgin GTK+"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakt-oplysninger"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Venneliste"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Venneliste"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Temakontrol til Pidgin GTK+"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Temakontrol til Pidgin GTK+"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Horisontal venneliste"
 
@@ -14095,6 +14509,21 @@ msgstr ""
 "Dette udvidelsesmodul er nyttigt for fejls?gning af XMPP-servere eller "
 "klienter."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktiv?r hvilket id?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Mark?r farve"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekundaer mark?r farve"
+
+#~ msgid "Interface colors"
+#~ msgstr "Graenseflade farver"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "St?rrelse p? kontroller"
+
 #~ msgid "Invite message"
 #~ msgstr "Invitationsbesked"
 
@@ -14636,9 +15065,6 @@ msgstr ""
 #~ "Din foresp?rgsel om at tilslutte gruppen %d er blevet godkendt af "
 #~ "administrator %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Denne gruppe er blevet tilf?jet til din venneliste"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Jeg pr?ver at tilslutte"
 
@@ -14663,10 +15089,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "Angiv din grund:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Fejl ved oprettelse af forbindelse"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Kunne ikke logge ind, kontroll?r fejls?gningslog"
 
@@ -14798,10 +15220,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_Besked:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Konto:"
-
 #~ msgid "Toggle offline buddies"
 #~ msgstr "Afkoblet venner til/fra"
 
@@ -15218,13 +15636,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Beskrivelse:</b> Skraemmende"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
============================================================
--- po/de.po	1cda0e610832249a77789dccdc2a0f528e79281b
+++ po/de.po	e09baab41cc1a105945eb7c87425c849d65cb7b2
@@ -11,7 +11,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-28 11:42+0200\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-06-28 11:42+0200\n"
 "Last-Translator: Jochen Kemnade <jochenkemnade at web.de>\n"
 "Language-Team: Deutsch <de at li.org>\n"
@@ -1562,6 +1562,7 @@ msgstr "Verlauf-Plugin."
 msgid "Lastlog plugin."
 msgstr "Verlauf-Plugin."
 
+#, c-format
 msgid ""
 "\n"
 "Fetching TinyURL..."
@@ -1891,6 +1892,7 @@ msgstr ""
 "Fehler beim Lesen vom Aufl?sungsprozess:\n"
 "%s"
 
+#, c-format
 msgid "Resolver process exited without answering our request"
 msgstr "Aufl?sungsprozess hat sich beendet ohne die Anfrage zu beantworten"
 
@@ -2191,6 +2193,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Fehler beim Herstellen der Verbindung"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Sie benutzen %s, aber dieses Plugin ben?tigt %s."
@@ -4209,6 +4215,7 @@ msgstr "Fehler beim Lesen"
 msgid "Read Error"
 msgstr "Fehler beim Lesen"
 
+#, c-format
 msgid ""
 "Could not find alternative XMPP connection methods after failing to connect "
 "directly.\n"
@@ -4911,166 +4918,219 @@ msgstr ""
 "%s ist auf der lokalen Liste, aber nicht auf der Serverliste. M?chten Sie, "
 "dass der Buddy hinzugef?gt wird?"
 
+#, c-format
 msgid "Unable to parse message"
 msgstr "Kann die Nachricht nicht parsen"
 
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaxfehler (wahrscheinlich ein Client-Bug)"
 
+#, c-format
 msgid "Invalid email address"
 msgstr "Ung?ltige E-Mail-Adresse"
 
+#, c-format
 msgid "User does not exist"
 msgstr "Benutzer existiert nicht"
 
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Der Fully Qualified Domain Name fehlt"
 
+#, c-format
 msgid "Already logged in"
 msgstr "Schon angemeldet"
 
+#, c-format
 msgid "Invalid username"
 msgstr "Ung?ltiger Benutzername"
 
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Ung?ltiger Freundesname"
 
+#, c-format
 msgid "List full"
 msgstr "Liste voll"
 
+#, c-format
 msgid "Already there"
 msgstr "Schon da"
 
+#, c-format
 msgid "Not on list"
 msgstr "Nicht auf der Liste"
 
+#, c-format
 msgid "User is offline"
 msgstr "Benutzer ist offline"
 
+#, c-format
 msgid "Already in the mode"
 msgstr "Bereits in diesem Modus"
 
+#, c-format
 msgid "Already in opposite list"
 msgstr "Bereits in der ,,Gegenteil-Liste""
 
+#, c-format
 msgid "Too many groups"
 msgstr "Zu viele Gruppen"
 
+#, c-format
 msgid "Invalid group"
 msgstr "Ung?ltige Gruppe"
 
+#, c-format
 msgid "User not in group"
 msgstr "Benutzer ist nicht in der Gruppe"
 
+#, c-format
 msgid "Group name too long"
 msgstr "Name der Gruppe ist zu lang"
 
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kann die Gruppe ,,Null" nicht entfernen"
 
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr ""
 "Versuchte einen Benutzer zu einer nichtexistierenden Gruppe hinzuzuf?gen"
 
+#, c-format
 msgid "Switchboard failed"
 msgstr "Vermittlung gescheitert"
 
+#, c-format
 msgid "Notify transfer failed"
 msgstr "?bertragung der Benachrichtigung gescheitert"
 
+#, c-format
 msgid "Required fields missing"
 msgstr "Notwendige Felder fehlen"
 
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Zu viele Treffer zu einem FND"
 
+#, c-format
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Dienst momentan nicht verf?gbar"
 
+#, c-format
 msgid "Database server error"
 msgstr "Fehler des Datenbank-Servers"
 
+#, c-format
 msgid "Command disabled"
 msgstr "Kommando abgeschaltet"
 
+#, c-format
 msgid "File operation error"
 msgstr "Dateiverarbeitungsfehler"
 
+#, c-format
 msgid "Memory allocation error"
 msgstr "Fehler bei der Speicheranforderung"
 
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Falscher CHL-Wert zum Server gesendet"
 
+#, c-format
 msgid "Server busy"
 msgstr "Server besch?ftigt"
 
+#, c-format
 msgid "Server unavailable"
 msgstr "Server unerreichbar"
 
+#, c-format
 msgid "Peer notification server down"
 msgstr "Peer-Benachrichtigungsserver nicht erreichbar"
 
+#, c-format
 msgid "Database connect error"
 msgstr "Datenbank-Verbindungsfehler"
 
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server f?hrt runter (melden Sie sich ab)"
 
+#, c-format
 msgid "Error creating connection"
 msgstr "Fehler beim Herstellen der Verbindung"
 
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-Parameter sind entweder unbekannt oder nicht erlaubt"
 
+#, c-format
 msgid "Unable to write"
 msgstr "Schreiben nicht m?glich"
 
+#, c-format
 msgid "Session overload"
 msgstr "Sitzung ?berlastet"
 
+#, c-format
 msgid "User is too active"
 msgstr "Benutzer ist zu aktiv"
 
+#, c-format
 msgid "Too many sessions"
 msgstr "Zu viele Sitzungen"
 
+#, c-format
 msgid "Passport not verified"
 msgstr "Passport (MSN Benutzerausweis) wurde nicht ?berpr?ft"
 
+#, c-format
 msgid "Bad friend file"
 msgstr "Falsche Friends-Datei"
 
+#, c-format
 msgid "Not expected"
 msgstr "Nicht erwartet"
 
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Benutzernamen werden zu oft ge?ndert"
 
+#, c-format
 msgid "Server too busy"
 msgstr "Server ist zu besch?ftigt"
 
+#, c-format
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Nicht erlaubt im Offline-Modus"
 
+#, c-format
 msgid "Not accepting new users"
 msgstr "Akzeptiert keine neuen Benutzer"
 
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kinder-Passwort ohne die Zustimmung der Eltern"
 
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-Konto wurde noch nicht ?berpr?ft"
 
 msgid "Passport account suspended"
 msgstr "Passport-Konto gesperrt"
 
+#, c-format
 msgid "Bad ticket"
 msgstr "Falsches Ticket"
 
@@ -5088,6 +5148,11 @@ msgstr "Nicht-IM-Kontakte"
 msgid "Non-IM Contacts"
 msgstr "Nicht-IM-Kontakte"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterst?tzt wird."
+
 msgid "Nudge"
 msgstr "Anstossen"
 
@@ -5570,6 +5635,16 @@ msgstr "Abfragen der Buddy-Liste"
 msgid "Retrieving buddy list"
 msgstr "Abfragen der Buddy-Liste"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterst?tzt wird."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterst?tzt wird."
+
 msgid "Away From Computer"
 msgstr "Abwesend"
 
@@ -6329,6 +6404,29 @@ msgstr "Server-Port"
 msgid "Server port"
 msgstr "Server-Port"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Ung?ltige HTTP-Antwort vom Server empfangen."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Sie haben sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
+"versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, m?ssen Sie sogar "
+"noch l?nger warten."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Fehler beim Aufl?sen von %s"
+
+msgid "Incorrect password."
+msgstr "Falsches Passwort."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Konnte Chatraum nicht betreten"
 
@@ -6663,9 +6761,6 @@ msgstr "Ung?ltiger Benutzername."
 msgid "Invalid username."
 msgstr "Ung?ltiger Benutzername."
 
-msgid "Incorrect password."
-msgstr "Falsches Passwort."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
@@ -6674,15 +6769,6 @@ msgstr "Der AOL-Sofortnachrichtendienst 
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Der AOL-Sofortnachrichtendienst ist zur Zeit nicht erreichbar."
 
-#. username connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Sie haben sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
-"versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, m?ssen Sie sogar "
-"noch l?nger warten."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -8639,6 +8725,7 @@ msgstr "<br><b>Thema des Kanals:</b><br>
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Thema des Kanals:</b><br>%s"
 
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanal-Modi:</b> "
 
@@ -8663,6 +8750,7 @@ msgstr "Liste der ?ffentlichen Schl?ss
 msgid "Channel Public Keys List"
 msgstr "Liste der ?ffentlichen Schl?ssel des Kanals"
 
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9064,6 +9152,7 @@ msgstr "Ihre momentane Stimmung"
 msgid "Your Current Mood"
 msgstr "Ihre momentane Stimmung"
 
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
@@ -9449,37 +9538,47 @@ msgstr "Keine Serverstatistik verf?gbar
 msgid "No server statistics available"
 msgstr "Keine Serverstatistik verf?gbar"
 
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fehler: Unterschiedliche Version, aktualisieren Sie Ihren Client"
 
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Fehler: Die entfernte Seite vertraut Ihrem ?ffentlichen Schl?ssel nicht"
 
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 "Fehler: Entferntes Programm unterst?tzt nicht die vorgeschlagen KE-Gruppe"
 
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "Fehler: Entferntes Programm unterst?tzt die vorgeschlagene Cipher nicht"
 
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fehler: Entferntes Programm unterst?tzt die vorgeschlagene PKCS nicht"
 
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "Fehler: Entferntes Programm unterst?tzt die vorgeschlagen Hashfunktion nicht"
 
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fehler: Entferntes Programm unterst?tzt das vorgeschlagene HMAC nicht"
 
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Fehler: Falsche Signatur"
 
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Fehler: Ung?ltiger Cookie"
 
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Fehler: Authentifizierung fehlgeschlagen"
 
@@ -9547,11 +9646,6 @@ msgstr "Auth-Domain"
 msgid "Auth Domain"
 msgstr "Auth-Domain"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterst?tzt wird."
-
 msgid "Your SMS was not delivered"
 msgstr "Ihre SMS wurde nicht ausgeliefert"
 
@@ -10329,24 +10423,29 @@ msgstr " (%s)"
 msgstr " (%s)"
 
 #. 10053
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr ""
 "Die Verbindung wurde von einer anderen Software auf ihrem Computer "
 "unterbrochen."
 
 #. 10054
+#, c-format
 msgid "Remote host closed connection."
 msgstr "Der entfernte Host hat die Verbindung beendet."
 
 #. 10060
+#, c-format
 msgid "Connection timed out."
 msgstr "Verbindungsabbruch wegen Zeit?berschreitung."
 
 #. 10061
+#, c-format
 msgid "Connection refused."
 msgstr "Verbindung abgelehnt."
 
 #. 10048
+#, c-format
 msgid "Address already in use."
 msgstr "Adresse wird bereits benutzt."
 
@@ -10971,6 +11070,111 @@ msgstr "/Buddys/Buddys sortieren"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys sortieren"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Hintergrundfarbe"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laotisch"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Hintergrundfarbe"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "A_usklappen"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Hintergrundfarbe ausw?hlen"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Zusammenklappen"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Hintergrundfarbe ausw?hlen"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Verkn?pfter Text"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Abwesend"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Stimmungstext"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Nachricht gesendet"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?ndere die Benutzerinformation f?r %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-Server"
@@ -11628,6 +11832,7 @@ msgstr ""
 "gesch?tzt.  Die Datei 'COPYRIGHT' enth?lt die komplette Liste der "
 "Mitwirkenden.  Wir ?bernehmen keine Haftung f?r dieses Programm.<BR><BR>"
 
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
@@ -11635,6 +11840,7 @@ msgstr ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support at pidgin.im"
 "\">support at pidgin.im</A><BR/><BR/>"
@@ -11642,11 +11848,13 @@ msgstr ""
 "<FONT SIZE=\"4\">Hilfe per E-Mail:</FONT> <A HREF=\"mailto:support at pidgin.im"
 "\">support at pidgin.im</A><BR/><BR/>"
 
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC-Kanal:</FONT> #pidgin auf irc.freenode.net<BR><BR>"
 
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">XMPP-MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
 
@@ -12097,9 +12305,6 @@ msgstr "Schriftart"
 msgid "Font Face"
 msgstr "Schriftart"
 
-msgid "Background Color"
-msgstr "Hintergrundfarbe"
-
 msgid "Foreground Color"
 msgstr "Vordergrundfarbe"
 
@@ -12307,6 +12512,7 @@ msgstr "Pidgin"
 msgid "Pidgin"
 msgstr "Pidgin"
 
+#, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Wird geschlossen, da bereits ein anderer libpurple-Client l?uft\n"
 
@@ -12497,36 +12703,47 @@ msgstr "Alarm-Ziel"
 msgid "Pounce Target"
 msgstr "Alarm-Ziel"
 
+#, c-format
 msgid "Started typing"
 msgstr "Beginnt zu tippen"
 
+#, c-format
 msgid "Paused while typing"
 msgstr "Hat beim Tippen angehalten"
 
+#, c-format
 msgid "Signed on"
 msgstr "Hat sich anmeldet"
 
+#, c-format
 msgid "Returned from being idle"
 msgstr "Ist nicht mehr inaktiv"
 
+#, c-format
 msgid "Returned from being away"
 msgstr "Ist wieder anwesend"
 
+#, c-format
 msgid "Stopped typing"
 msgstr "Hat das Tippen gestoppt"
 
+#, c-format
 msgid "Signed off"
 msgstr "Hat sich abmeldet"
 
+#, c-format
 msgid "Became idle"
 msgstr "Wurde unt?tig"
 
+#, c-format
 msgid "Went away"
 msgstr "Ging hinaus"
 
+#, c-format
 msgid "Sent a message"
 msgstr "Eine Nachricht senden"
 
+#, c-format
 msgid "Unknown.... Please report this!"
 msgstr "Unbekannt.... Bitte berichten Sie dieses Problem!"
 
@@ -12536,6 +12753,10 @@ msgstr "Thema konnte nicht geladen werde
 msgid "Theme failed to load."
 msgstr "Thema konnte nicht geladen werden."
 
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Thema konnte nicht geladen werden."
+
 msgid "Install Theme"
 msgstr "Thema installieren"
 
@@ -12810,21 +13031,27 @@ msgstr "Klang-Auswahl"
 msgid "Sound Selection"
 msgstr "Klang-Auswahl"
 
+#, c-format
 msgid "Quietest"
 msgstr "Am leisesten"
 
+#, c-format
 msgid "Quieter"
 msgstr "Leiser"
 
+#, c-format
 msgid "Quiet"
 msgstr "Leise"
 
+#, c-format
 msgid "Loud"
 msgstr "Laut"
 
+#, c-format
 msgid "Louder"
 msgstr "Lauter"
 
+#, c-format
 msgid "Loudest"
 msgstr "Am lautesten"
 
@@ -13318,6 +13545,79 @@ msgstr "Statistische Informationen ?ber
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Statistische Informationen ?ber die Verf?gbarkeit Ihrer Buddys zeigen"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Server-Adresse"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Geben Sie einen Konferenzserver ein"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "W?hlen Sie einen Konferenz-Server zur Abfrage"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online-Dienste"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Buddy-Liste senden"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "hinausgeht"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Mitschnittverzeichnis"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Klang-Auswahl"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub-Dienst"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Beschreibung"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Information zur Dienstsuche"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Benutzer existiert nicht"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server unterst?tzt kein Blockieren"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Information zur Dienstsuche"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Dieses Plugin ist n?tzlich zur Fehlersuche in XMPP-Servern oder -Clients."
+
 msgid "Buddy is idle"
 msgstr "Buddy ist unt?tig"
 
@@ -13861,6 +14161,7 @@ msgstr "Farbe ausw?hlen"
 msgid "Select Color"
 msgstr "Farbe ausw?hlen"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "Schriftart w?hlen"
 
@@ -14031,12 +14332,120 @@ msgstr ""
 msgstr ""
 "Ersetzt Text in ausgehenden Nachrichten durch benutzerdefinierte Regeln."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Nicht angemeldet"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Nicht angemeldet"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Chat betreten"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorieren"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Lauter"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorisierung wurde gegeben"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Fehler "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Anfrage-Dialog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Warnstufe"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status f?r %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chatraum-Gebiet"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Icon ?ndern"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ Themenkontrolle"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakt-Info"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Buddy-Listen-Thema"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Buddy-Listen-Thema"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ Themenkontrolle"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ Themenkontrolle"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Buddy-Ticker"
 
@@ -14072,6 +14481,7 @@ msgstr "Zeitstempelformat-Optionen"
 msgid "Timestamp Format Options"
 msgstr "Zeitstempelformat-Optionen"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Erzwinge 24-Stunden Zeitformat"
 
============================================================
--- po/dz.po	2aa4737655dc43c34565ef66b4332d9bc5d194e4
+++ po/dz.po	57eb2ae16e334cfe3b615a4dc12286a71cc45315
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2006-11-09 17:11+0530\n"
 "Last-Translator: wangmo sherpa <rinwanshe at yahoo.com>\n"
 "Language-Team:  <pgeygel at dit.gov.bt>\n"
@@ -1834,6 +1834,8 @@ msgstr "+++ %s ?????????msgid "+++ %s signed off"
 msgstr "+++ %s ??????????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????????????????????"
 
@@ -2251,6 +2253,10 @@ msgstr "(%s) %s <???????-?msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <???????-??>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?????????????????????????????????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3230,6 +3236,11 @@ msgstr "?????? ?????msgid "Chat _name:"
 msgstr "?????? ?????:(_n)"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?????? ???????????????"
+
 msgid "Chat error"
 msgstr "?????????????"
 
@@ -3278,6 +3289,10 @@ msgstr "?????-????? 
 msgid "Gadu-Gadu User"
 msgstr "?????-????? ?????????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "????????????????????????????????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "??????????????????: %s"
@@ -3321,7 +3336,8 @@ msgstr "???????:"
 msgid "_Password:"
 msgstr "???????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "?????????? ???????????? ????????????????????????"
 
 #. 1. connect to server
@@ -3807,6 +3823,9 @@ msgstr "?????????? ?msgid "Server does not use any supported authentication method"
 msgstr "?????????? ????????????????????????????????????????????????  ??????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "????????? ????????????????????"
 
@@ -4106,6 +4125,14 @@ msgstr "?????????"
 msgid "Resource"
 msgstr "?????????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "????????????"
+
 msgid "Middle Name"
 msgstr "????????????"
 
@@ -4276,10 +4303,19 @@ msgstr "??????????? msgid "Find Rooms"
 msgstr "???????????????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "???????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "?????????????????????????????????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "???????"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "??????????????????"
 
@@ -4300,7 +4336,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "????????????????????????????????????"
 
 #, c-format
@@ -4329,9 +4365,6 @@ msgstr "??????????? msgid "Unregistration Failed"
 msgstr "????????????????????????????"
 
-msgid "Already Registered"
-msgstr "??????????? ???????????????"
-
 msgid "State"
 msgstr "?????????"
 
@@ -4344,6 +4377,9 @@ msgstr "?????????"
 msgid "Date"
 msgstr "?????????"
 
+msgid "Already Registered"
+msgstr "??????????? ???????????????"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "???????"
@@ -4376,6 +4412,10 @@ msgstr ": ??? ??????? msgstr ": ??? ???????????????????????(_s)"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "????????????????????????????????????"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "????????????????????????????????????? ???????"
 
@@ -4751,16 +4791,18 @@ msgstr "?????????? &
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "?????????? &lt;????????&gt; [??????]: ????????????????????????????????? "
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "??????????????? ???????;??????????????????; ??????????;???????|????????????|????????|??????????"
 "???????|?????????? ??????;: ??????????? ???????????????? ????????????????????????????????"
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "?????????????????;??????????????????; ??????????;???????????|????????????????|????????????"
 "???|????????????????;: ????????????? ?????????????????????????????????????(&I)(&g)(&I)(&g)"
@@ -4829,6 +4871,9 @@ msgstr "??????????? msgid "File transfer proxies"
 msgstr "??????????????????????????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5241,6 +5286,10 @@ msgstr "??????????? msgid "Non-IM Contacts"
 msgstr "??????????????????????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5605,65 +5654,28 @@ msgstr "??????????? msgstr "?????????????????????????????????????????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ??????????????????????????"
-
-msgid "Unknown error."
-msgstr "????????????????????"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ???? ???????? ???????????????????"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "????????????????????"
 
 msgid "Unable to add user"
 msgstr "?????????????????????????????"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "????????????????????"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "????????????????? ???????????????????????????????????????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s)???????????????????????????????????"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s)?????? ????????? ????????????"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s)?????? ????????? ??????????????????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ??????????????????????????? ??????????????????? ????????????????????????????????????"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ??????????????????????????????????"
-
-msgid "Service Temporarily Unavailable."
-msgstr "??????????????????????????????????????"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "???????????????????????????????????????????????? ?????????????? ???????????????:"
 
-msgid "Unable to rename group"
-msgstr "?????????????????????????????????????"
-
-msgid "Unable to delete group"
-msgstr "???????????????????????????????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5745,6 +5757,9 @@ msgstr ""
 "????????? ????????????? ?????????????????? ????????????? ????????????  ??????????????????????????"
 "????????????"
 
+msgid "Unknown error."
+msgstr "????????????????????"
+
 msgid "Handshaking"
 msgstr "????????????"
 
@@ -5763,6 +5778,14 @@ msgstr "??????????? msgid "Retrieving buddy list"
 msgstr "???????????????????????????????????????"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "??????????????????????"
 
@@ -5801,14 +5824,6 @@ msgstr "??????????? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????????????????????????????? ??????????????????? ????????????????????????????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr " %s ???? ??????????????????? ????????????????? ????? ????????????????"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ???? ???????????????????????????????????? ?????????????????????"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "?????????????????????????????"
@@ -5842,6 +5857,51 @@ msgstr "??????????/?msgstr "??????????/????????????  ????????????????? ?????????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ??????????????????????????"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s)???????????????????????????????????"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s)?????? ????????? ????????????"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s)?????? ????????? ??????????????????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ??????????????????????????? ??????????????????? ????????????????????????????????????"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ??????????????????????????????????"
+
+msgid "Service Temporarily Unavailable."
+msgstr "??????????????????????????????????????"
+
+msgid "Unable to rename group"
+msgstr "?????????????????????????????????????"
+
+msgid "Unable to delete group"
+msgstr "???????????????????????????????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr " %s ???? ??????????????????? ????????????????? ????? ????????????????"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ???? ???????????????????????????????????? ?????????????????????"
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5878,6 +5938,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "??????????????????????"
@@ -5927,12 +5989,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "?????????????  ?????????? ????? ???????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6275,10 +6340,6 @@ msgstr "??????????? msgstr "???????????????? ?????????????????????"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "?????????????  ?????????? ????? ???????"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "????????????????????????? ??????????????????? ????????????????????"
 
@@ -6493,6 +6554,28 @@ msgstr "?????? ?????msgstr "?????? ?????????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "????????? ?????????????????????????? ????????????"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?????  ????????????????? ?????????????????????????????  ???????????????????????????????? ??????"
+"????????????????  ???????????????????????????????????????????????? ????????????????????"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?????????????????????????????????"
+
+msgid "Incorrect password."
+msgstr "????????????????????"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "????????????"
 
@@ -6798,14 +6881,33 @@ msgstr ""
 "??????????? ??????????????? ????????????????????????? ??????????????  ?????????????? ????????"
 "?????????????????????????  ????? ??????????????????????????????????"
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "????? ???????????????????????????????? ?????????????????????????????? %s ?????????????"
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "?????????? ?????????????????????? ?????????????????????????????????"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "????? ???????????????????????????????? ?????????????????????????????? %s ?????????????"
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "?????????? ?????????????????????????????"
+
+msgid "Could Not Connect"
+msgstr "????????????"
+
+msgid "Received authorization"
+msgstr "???????????????????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "???????? ????????????????"
 
-msgid "Incorrect password."
-msgstr "????????????????????"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "????????? ???????????? ??????????????????"
@@ -6814,26 +6916,20 @@ msgstr "?????????? ?msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????????? ?????????? ???????????????????????????? ????????????? ????????????"
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"?????  ????????????????? ?????????????????????????????  ???????????????????????????????? ??????"
-"????????????????  ???????????????????????????????????????????????? ????????????????????"
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "??????????????????????????????????????????????????????? ?????????????    %s ??????????????????????"
 
-msgid "Could Not Connect"
-msgstr "????????????"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"?????  ????????????????? ?????????????????????????????  ???????????????????????????????? ??????"
+"????????????????  ???????????????????????????????????????????????? ????????????????????"
 
-msgid "Received authorization"
-msgstr "???????????????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???????????? ??????? ????????????????????? ???????????????"
 
@@ -6850,22 +6946,6 @@ msgstr "?????"
 msgid "_OK"
 msgstr "?????"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "????? ???????????????????????????????? ?????????????????????????????? %s ?????????????"
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "?????????? ?????????????????????? ?????????????????????????????????"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "????? ???????????????????????????????? ?????????????????????????????? %s ?????????????"
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "?????????? ?????????????????????????????"
-
 msgid "Password sent"
 msgstr "???????????????"
 
@@ -7386,6 +7466,7 @@ msgstr "??????????? msgid "Set User Info (web)..."
 msgstr "????????????????????????????????(?????????)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "?????????????????????????(?????????)"
@@ -7418,6 +7499,10 @@ msgstr "??????????? msgstr "??????????????????? ?????????????????? ?????????????"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "????????????????????????????????"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9770,10 +9855,6 @@ msgstr "??????????? msgid "Auth Domain"
 msgstr "???????????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9799,6 +9880,44 @@ msgstr "??????????? msgid "Add buddy rejected"
 msgstr "?????????????????????????????????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "??????????????????????????????? ??????????????????????????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????????????????????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"????????????? ????????? ??????? %d ? ????! ?????????????? ???????????????????????? ???????"
+"???????????????"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "?????????????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"????????????? ????????? ??????? %d ? ????! ?????????????? ???????????????????????? ???????"
+"???????????????"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "?????????????  ?????????? ????? ???????"
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9910,9 +10029,8 @@ msgstr "???????? ???msgid "Start Doodling"
 msgstr "???????? ??????????"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "??????????????????????????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?? ??????????????????????????"
@@ -10717,16 +10835,17 @@ msgstr "??????????? msgstr "????????????????????? ?????????????"
 
 #, fuzzy
-msgid "Room _List"
-msgstr "????????????????"
+msgid "A_ccount"
+msgstr "???????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "????? ????????????????????????????????????????????? ????????????????????????????????????\n"
 
-msgid "_Account:"
-msgstr "???????:(_A)"
+#, fuzzy
+msgid "Room _List"
+msgstr "????????????????"
 
 msgid "_Block"
 msgstr "???(_B)"
@@ -11198,6 +11317,117 @@ msgstr "/??????????/
 msgid "/Buddies/Sort Buddies"
 msgstr "/??????????/???????????????????????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "???????????????????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "????????????????????????? ??????????????????????????????????????????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "???????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???????????????????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "????????(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "???????????????????????????????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "??????(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "???????????????????????????????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "???????????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "????????"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "????????????????????????????????????????"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "????????????????????????????????????????"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??????????"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "????????????????????????????????????????"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "???????????"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "????????????????????????????????????????"
+
+msgid "Message Text"
+msgstr "?????????????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "?????????????????"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s????????????????????????????????????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11710,6 +11940,10 @@ msgstr "??????????? msgstr "????????????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "???????????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "????????????????"
 
@@ -11814,6 +12048,9 @@ msgstr "??????????"
 msgid "Swedish"
 msgstr "??????????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "??????"
 
@@ -12255,11 +12492,10 @@ msgstr "??????????? msgid "Save Image"
 msgstr "????????????????????????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "???????????????????????...(_S)"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "??????????? ??????????????????"
 
@@ -12352,10 +12588,6 @@ msgstr "?????????? ?msgstr "?????????? ?????????"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "???????????????????"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "???????????????????????????????"
 
@@ -12703,6 +12935,9 @@ msgstr "??????????? msgid "Pounce on Whom"
 msgstr "???????????????"
 
+msgid "_Account:"
+msgstr "???????:(_A)"
+
 msgid "_Buddy name:"
 msgstr "??????????????:(_B)"
 
@@ -12814,9 +13049,18 @@ msgstr "??????????? msgid "Unknown.... Please report this!"
 msgstr "????????????? ?????????? ???????? ?????????????????????????"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "???????????????????????????????????????????????"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "???????????????????????????????????????????????"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "???????????????????????????????????????????????"
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13408,6 +13652,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "???????????????????"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "???????????????????? ?????????????????????????????"
 
@@ -13640,6 +13888,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "?????????? ??????????????????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "???????????????????? ????????????????????????????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "????????????????????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "???????????????????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "????????????????(_w)"
+
+#, fuzzy
+msgid "Directory"
+msgstr "???? ????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????????????????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>??????????:</b>??????????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Dir ??????????????????????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "????????:(_B)"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "?????????????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "?????????? ????????????????????????????????????????????????  ??????????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Dir ??????????????????????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "????????????????????????:"
 
@@ -14157,12 +14477,6 @@ msgstr ""
 "-????????????????????????? ????????????????\n"
 "-????????????????????????????????????????????????????????????????????????????????????? "
 
-msgid "Cursor Color"
-msgstr "?????????????????"
-
-msgid "Secondary Cursor Color"
-msgstr "?????????????????????????????"
-
 msgid "Hyperlink Color"
 msgstr "?????????????????????????"
 
@@ -14174,6 +14488,10 @@ msgstr "??????????? msgid "Highlighted Message Name Color"
 msgstr "????????????????????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "??????????????????????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "????????? ?????????????????????????????????"
 
@@ -14203,35 +14521,24 @@ msgstr "?????????+??msgid "GTK+ Text Shortcut Theme"
 msgstr "?????????+?????????????????????????????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "???????????????????????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "????????????????????????????"
 
-msgid "Widget Sizes"
-msgstr "??????????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "???? ?????????+??????????????????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "???????"
+
 msgid "Fonts"
 msgstr "?????????????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "??????????????????????????"
@@ -14377,12 +14684,119 @@ msgstr ""
 "???????????????????????????????????????????????? ????????????????????????? ????????????????"
 "?????????"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???????????????????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ???????????????????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???????????????????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "?????????????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "???????? (???????????)"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????????????????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "????? ??"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "????????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??????????????????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ??????? ??????????"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "????????????? ???????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "?????????????????????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "???? ?????????+??????????????????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "??????????????????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????????????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????????????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "???? ?????????+??????????????????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "???? ?????????+??????????????????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "????????????????????????"
 
@@ -14594,6 +15008,22 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "??????????????????????????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "?????????????????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "?????????????????????????????"
+
+#~ msgid "Interface colors"
+#~ msgstr "???????????????????????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "??????????????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "???????????????"
 
@@ -15131,9 +15561,6 @@ msgstr ""
 #~ "??????? %d ?????????????????????????????????????????????????????? ???????????? %d ???? ???????"
 #~ "?????????????"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "????????????????????????? ??????????????????????????????????????????"
-
 #~ msgid "I am applying to join"
 #~ msgstr "?????????????????????????????????????"
 
@@ -15158,10 +15585,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "???????????????????????????????:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "?????????????????????????????????"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "????????????????????? ???????????????????????????????"
 
@@ -15293,10 +15716,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "??????????:(_M)"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "???????:"
-
 #~ msgid "Tag"
 #~ msgstr "????????"
 
@@ -15369,13 +15788,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>??????????:</b>??????????"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -16081,9 +16493,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "??????????????????????????????????????????"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "????????????????????????????????????????"
-
 #~ msgid "_Chat"
 #~ msgstr "?????(_C)"
 
@@ -16360,9 +16769,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "?????????"
 
-#~ msgid "Message Text"
-#~ msgstr "?????????????????"
-
 #~ msgid "Away Messages"
 #~ msgstr "?????????????????????"
 
@@ -16474,9 +16880,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "?????????????????????????????????????\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "?????? ???????????????"
-
 #~ msgid "Looking up GG server"
 #~ msgstr "???????????? ?????????"
 
@@ -16795,9 +17198,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s ?????????????????"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ???????????????????"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
============================================================
--- po/el.po	ad8b60af9378fb91c30da6280ab229be0fda1e3e
+++ po/el.po	454d317c15e294d7d35494f511f730e598c129ce
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin[el]\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-12-17 23:56+0200\n"
 "Last-Translator: Bouklis Panos <panos at echidna-band.com>\n"
 "Language-Team: Greek <i18ngr at lists.hellug.gr>\n"
@@ -1768,6 +1768,8 @@ msgstr "+++ %s ????????????"
 msgid "+++ %s signed off"
 msgstr "+++ %s ????????????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "??????? ??????"
 
@@ -2172,6 +2174,10 @@ msgstr "(%s) %s <????????-???
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????????-????????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?????? ??????????? ????????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "?????????????? ?? %s, ???? ???? ?? ???????? ??????? ?? %s."
@@ -3161,6 +3167,11 @@ msgstr "????? _?????????:"
 msgid "Chat _name:"
 msgstr "????? _?????????:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "??????? ? ??????? ?? ??? ???????????."
+
 msgid "Chat error"
 msgstr "?????? ?????????"
 
@@ -3209,6 +3220,10 @@ msgstr "??????? Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "??????? Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???? ???????????"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "??????? ??????: %s"
@@ -3251,7 +3266,8 @@ msgstr "_???????:"
 msgid "_Password:"
 msgstr "_???????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "?? ????????? IRC ??? ?????? ?? ????????? ????"
 
 #. 1. connect to server
@@ -3732,6 +3748,10 @@ msgstr "? ???????????? ??
 msgid "Server does not use any supported authentication method"
 msgstr "? ???????????? ?? ???????????? ????? ?????????????? ?????? ????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"????????? ?????????????, ???? ??? ????? ????????? ?? ????? ??? ???????????."
+
 msgid "Invalid challenge from server"
 msgstr "?? ?????? ???????? ??? ??? ???????????"
 
@@ -4002,6 +4022,14 @@ msgstr "????"
 msgid "Resource"
 msgstr "????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "????????????"
+
 msgid "Middle Name"
 msgstr "?????????"
 
@@ -4168,10 +4196,18 @@ msgstr "?????? ????????"
 msgid "Find Rooms"
 msgstr "?????? ????????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-"????????? ?????????????, ???? ??? ????? ????????? ?? ????? ??? ???????????."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??????? ??:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "?? ???????? ??????? ??? ?? ??????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "?????"
+
 msgid "Ping timeout"
 msgstr "????? ???????? ????? ??? ping"
 
@@ -4191,7 +4227,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "???????? ???????? ?? ??? ???????????."
 
 #, c-format
@@ -4218,9 +4254,6 @@ msgstr "???????? ???????? msgid "Unregistration Failed"
 msgstr "???????? ?????????"
 
-msgid "Already Registered"
-msgstr "??? ?????????????"
-
 msgid "State"
 msgstr "????????"
 
@@ -4233,6 +4266,9 @@ msgstr "??????????"
 msgid "Date"
 msgstr "??????????"
 
+msgid "Already Registered"
+msgstr "??? ?????????????"
+
 msgid "Unregister"
 msgstr ""
 
@@ -4264,6 +4300,10 @@ msgstr "?????? ?????????? msgid "Change Registration"
 msgstr "?????? ???????????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "???????? ???????? ?? ??? ???????????."
+
 msgid "Error unregistering account"
 msgstr "?????? ???? ??? ???????? ??? ??????????? ??? ???????????"
 
@@ -4629,13 +4669,14 @@ msgid ""
 "ban &lt;???????&gt; [?????]:  ?????????? ??????? ???? ?????? ??? ???????."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;???????&gt; &lt;moderator|participant|visitor|none&gt;: ?????? ?? "
 "???? ???? ?????? ??? ???????."
@@ -4701,6 +4742,9 @@ msgstr "?????????????? ?? msgid "File transfer proxies"
 msgstr "?????????????? ????????? ???????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5099,6 +5143,11 @@ msgstr "?????? ??-?????? ? msgid "Non-IM Contacts"
 msgstr "?????? ??-?????? ?????????"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s ??? ??????? ????????? ?? ??????, ???? ?? ????? ??? ????????????? ?????."
+
 msgid "Nudge"
 msgstr ""
 
@@ -5443,63 +5492,26 @@ msgstr "??????? Windows Live ID:? msgstr "??????? Windows Live ID:?? ?????? ????????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ??? ????? ?????? ?????."
-
-msgid "Unknown error."
-msgstr "??????? ??????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "??????? ?????? (%d)"
 
 msgid "Unable to add user"
 msgstr "???????? ????????? ??????"
 
-msgid "The following users are missing from your addressbook"
-msgstr "?? ????????? ??????? ??????? ??? ?? ?????? ?????? ???"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "???????? ????????? ?????? ?? %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "??????? ?????? (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "???????? ??????????? ?????? ?? %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "?? ????????? ??????? ??????? ??? ?? ?????? ?????? ???"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "??????? ?? ????????? ? ??????? ?? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ??? ???? ?????? ?? ????????? ?????? ? ????? ????? ????? ??????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ??? ????? ???? ??????? ??????????? ???????????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "???????? ????????? ?? ?????????."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "?? ?????? ??????? ?? ???????? ?????? ???? ???? ??????."
 
-msgid "Unable to rename group"
-msgstr "???????? ???????????? ??????"
-
-msgid "Unable to delete group"
-msgstr "???????? ????????? ??????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5588,6 +5600,9 @@ msgstr ""
 "? ????? ????? ??? ??? MSN ????? ????????? ?? ?????????. ??????????? "
 "?????????? ??? ???????????????."
 
+msgid "Unknown error."
+msgstr "??????? ??????."
+
 msgid "Handshaking"
 msgstr "??????? ????????"
 
@@ -5606,6 +5621,16 @@ msgstr "???? ?????? ?????
 msgid "Retrieving buddy list"
 msgstr "???? ?????? ?????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s ??? ??????? ????????? ?? ??????, ???? ?? ????? ??? ????????????? ?????."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s ??? ??????? ????????? ?? ??????, ???? ?? ????? ??? ????????????? ?????."
+
 msgid "Away From Computer"
 msgstr "?????? ??? ??? ??????????"
 
@@ -5649,14 +5674,6 @@ msgstr "?? ?????? ?????? ? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?? ?????? ?????? ?? ?? ???????? ?????? ?????? ??? ??????? ??????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ??? ????????? ??? ????? ????? ???."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ??? ???????? ??? ?? ????? ????? ???."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "???????? ????? ??? ?? ?????? ???????????;"
 
@@ -5686,6 +5703,51 @@ msgstr "???????? ???????? msgstr "???????? ??????????? MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ??? ????? ?????? ?????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "???????? ????????? ?????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "???????? ??????????? ?????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "??????? ?? ????????? ? ??????? ?? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ??? ???? ?????? ?? ????????? ?????? ? ????? ????? ????? ??????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ??? ????? ???? ??????? ??????????? ???????????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "???????? ????????? ?? ?????????."
+
+msgid "Unable to rename group"
+msgstr "???????? ???????????? ??????"
+
+msgid "Unable to delete group"
+msgstr "???????? ????????? ??????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ??? ????????? ??? ????? ????? ???."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ??? ???????? ??? ?? ????? ????? ???."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "??? ??????? ??????? ???????: %s"
 
@@ -5714,6 +5776,8 @@ msgstr "? ??????? ?? ??? ?
 msgstr "? ??????? ?? ??? ??????????? ??????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "??? ????????????"
 
@@ -5762,18 +5826,20 @@ msgstr "?????? ?????????? msgid "Protocol error, code %d: %s"
 msgstr "?????? ???????????, ??????? %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s ? ?????? ??? ????? %d ??????????, ??????????? ??? ?? ??????? ???????????? "
 "????? ??? %d ??? ?? MySpaceIM. ??????????? ????????? ??? ?????? ??? ??? "
 "http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
 "changePassword ??? ????????? ????."
 
+msgid "Incorrect username or password"
+msgstr "?????????? ????? ?????? ? ???????."
+
 msgid "MySpaceIM Error"
 msgstr "?????? MySpaceIM"
 
@@ -6091,9 +6157,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr "?????????? ????? ?????? ? ???????."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 "??? ???? ?????? ? ?????????? ??? ????????? ?????????? ??????????? ?????? ??? "
@@ -6318,6 +6381,29 @@ msgstr "???? ???????????"
 msgid "Server port"
 msgstr "???? ???????????"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "??????? ?????????? ??????????? HTTP ??? ??? ???????????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"???????????? ??? ??????????????? ???? ???????. ?????????? ???? ????? ??? "
+"???????????????. ?? ?????????? ?? ???????????, ?? ?????? ?? ?????????? ????? "
+"???????????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?????? ??????? ??? %s"
+
+msgid "Incorrect password."
+msgstr "??????????? ???????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "??? ???? ?????? ? ??????? ??? ??????? ?????????"
 
@@ -6624,14 +6710,31 @@ msgstr ""
 "????????? ???????????? ????????????, ???? ?? ???????? ?? ??? ?????? ??? ?? "
 "????????? ???? ????????, ???????? ??? ????, ???? ?? ????????? ???? ????????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "?????????????? ???? ???????.  ??????? ?? %s ??? ????????????."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "???????? ????? ???? ??????? hash ??????? ??? AIM."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "?????????????? ???? ???????.  ??????? ?? %s ??? ????????????."
+
+msgid "Unable to get a valid login hash."
+msgstr "???????? ????? ???? ??????? hash ???????."
+
+msgid "Could Not Connect"
+msgstr "??? ???? ?????? ? ???????"
+
+msgid "Received authorization"
+msgstr "??????? ???????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "?? ?????? ????? ??????."
 
-msgid "Incorrect password."
-msgstr "??????????? ???????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "? ??????????? ??? ????? ???? ?? ????? ?? ????????."
@@ -6640,28 +6743,22 @@ msgstr "? ???????? AOL Instant 
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "? ???????? AOL Instant Messenger ????? ????????? ?? ?????????."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"???????????? ??? ??????????????? ???? ???????. ?????????? ???? ????? ??? "
-"???????????????. ?? ?????????? ?? ???????????, ?? ?????? ?? ?????????? ????? "
-"???????????."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "? ?????? ?????? ??? ?????????????? ????? ???? ?????. ??????????? ??????????? "
 "?? %s"
 
-msgid "Could Not Connect"
-msgstr "??? ???? ?????? ? ???????"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"???????????? ??? ??????????????? ???? ???????. ?????????? ???? ????? ??? "
+"???????????????. ?? ?????????? ?? ???????????, ?? ?????? ?? ?????????? ????? "
+"???????????."
 
-msgid "Received authorization"
-msgstr "??????? ???????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "?? SecurID ??? ??????????????? ????? ??????????."
 
@@ -6677,20 +6774,6 @@ msgstr "_???????"
 msgid "_OK"
 msgstr "_???????"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "?????????????? ???? ???????.  ??????? ?? %s ??? ????????????."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "???????? ????? ???? ??????? hash ??????? ??? AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "?????????????? ???? ???????.  ??????? ?? %s ??? ????????????."
-
-msgid "Unable to get a valid login hash."
-msgstr "???????? ????? ???? ??????? hash ???????."
-
 msgid "Password sent"
 msgstr "??????? ????????"
 
@@ -7209,6 +7292,7 @@ msgstr "??????? ????????? msgid "Set User Info (web)..."
 msgstr "??????? ??????????? ?????? (?????????)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "?????? ??????? (?????????)"
 
@@ -7238,6 +7322,10 @@ msgstr "????????? ????? ?
 msgid "Search for Buddy by Information"
 msgstr "????????? ????? ?? ???????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "? ??????? ??? ????? ????????????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9510,11 +9598,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s ??? ??????? ????????? ?? ??????, ???? ?? ????? ??? ????????????? ?????."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9541,6 +9624,44 @@ msgstr "? ???????? ????? ? msgid "Add buddy rejected"
 msgstr "? ???????? ????? ???????????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "???????? ?? ?????? ???????? ???? ?? ??????? ?? ??? ???????????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "??????????? ???????."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"??????? ?????? ?? ?????? %d. ?? ?????????? ???? ?????????? ??? Yahoo! ???? "
+"?????????."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "? ??????? ??? ???????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"??????? ?????? ?? ?????? %d. ?? ?????????? ???? ?????????? ??? Yahoo! ???? "
+"?????????."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "?????????? ????? ?????? ? ???????."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9656,8 +9777,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "???????????? ??????? ID;"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "????????? ??? ???????? ?? ?????;"
@@ -10435,8 +10556,9 @@ msgstr "??????????? ????? msgid "Please update the necessary fields."
 msgstr "??????????? ????????? ?? ?????????? ?????."
 
-msgid "Room _List"
-msgstr "_????? ????????"
+#, fuzzy
+msgid "A_ccount"
+msgstr "_???????????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10445,8 +10567,8 @@ msgstr ""
 "??????????? ???????? ??? ?????????? ??????????? ??????? ?? ?? ???????? ??? "
 "?????? ?? ????????????.\n"
 
-msgid "_Account:"
-msgstr "_???????????:"
+msgid "Room _List"
+msgstr "_????? ????????"
 
 msgid "_Block"
 msgstr "_???????????"
@@ -10887,6 +11009,112 @@ msgstr "/?????/??????????
 msgid "/Buddies/Sort Buddies"
 msgstr "/?????/?????????? ?????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "????? ???????????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "???? ? ????? ?????????? ??? ????? ????? ???"
+
+#, fuzzy
+msgid "Layout"
+msgstr "??????????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????? ???????????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_????????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??????? ???????? ???????????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_????????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??????? ???????? ???????????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "??????????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "????????????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "????? ???????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??????? ????????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "???????? ??????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?????? ??????????? ?????? ??? %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "???????????? SSL"
@@ -11391,6 +11619,10 @@ msgstr "????????"
 msgid "Hungarian"
 msgstr "????????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "?????????"
+
 msgid "Indonesian"
 msgstr "???????????"
 
@@ -11489,6 +11721,9 @@ msgstr "????????"
 msgid "Swedish"
 msgstr "????????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr ""
 
@@ -11923,11 +12158,9 @@ msgstr "?????????? ?????? msgid "Save Image"
 msgstr "?????????? ???????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_?????????? ???????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "?_??????? ?????????????? ?????????.."
 
@@ -12017,9 +12250,6 @@ msgstr "????? ??????????? msgid "Font Face"
 msgstr "????? ??????????????"
 
-msgid "Background Color"
-msgstr "????? ???????????"
-
 msgid "Foreground Color"
 msgstr "????? ??????????"
 
@@ -12346,6 +12576,9 @@ msgstr "???????? ??"
 msgid "Pounce on Whom"
 msgstr "???????? ??"
 
+msgid "_Account:"
+msgstr "_???????????:"
+
 msgid "_Buddy name:"
 msgstr "_????? ?????:"
 
@@ -12456,7 +12689,15 @@ msgstr "??????? ??????? ?
 msgid "Unknown.... Please report this!"
 msgstr "??????? ??????? ?????????. ??????????? ????????? ??!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "?? GStreamer ??????? ?? ?????????????."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "???????? ?????????? ???????"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -13027,6 +13268,10 @@ msgstr "???????????? ???? msgid "Custom Smiley Manager"
 msgstr "???????????? ?????????????? ?????????"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "??????? ?????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "????? ???? ??? ?? ???????? ??? ?????? ????? ??? ???? ?? ??????????."
 
@@ -13253,6 +13498,79 @@ msgstr ""
 msgstr ""
 "????????? ??????????? ??????????? ??????? ?? ?? ????????????? ??? ????? ???"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "????????? ???????????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??????? ?? ??????????? ??????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "???????? ??? ??????????? ?????????? ??? ?????? ?? ???????? ???????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "????????? ?? ???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "???????? ?????? ?????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??????? ????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "????????? ??????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "??????? ????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?????????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "????????? ??????????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_??????????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "? ??????? ??? ???????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "? ???????????? ?? ???????????? ????? ?????????????? ?????? ????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "????????? ????????? XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"???? ?? ???????? ????? ??????? ??? ??? ????????????? ???????????? ??? "
+"??????? XMPP."
+
 msgid "Buddy is idle"
 msgstr "? ????? ????? ?????????"
 
@@ -13772,12 +14090,6 @@ msgstr ""
 "- ??????????? ?? ??????????? ???????\n"
 "- ??????? ??? ?????? ??? ????? ??? ?????? ??? ????? ?????????"
 
-msgid "Cursor Color"
-msgstr "????? ?????? ?????????"
-
-msgid "Secondary Cursor Color"
-msgstr "?????????? ????? ?????? ?????????"
-
 msgid "Hyperlink Color"
 msgstr "????? ?????????????"
 
@@ -13787,6 +14099,10 @@ msgstr "????? ???????? ??
 msgid "Highlighted Message Name Color"
 msgstr "????? ???????? ?????????? ?????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "????? ??????????? ??????????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13816,35 +14132,24 @@ msgstr "???? ???????? ???
 msgid "GTK+ Text Shortcut Theme"
 msgstr "???? ???????? ??????????? GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "??????? ?????????????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "???????????? ??????????? ??????????????"
 
-msgid "Widget Sizes"
-msgstr "?????? ????????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "??????? ??????? Pidgin GTK+"
 
+#, fuzzy
+msgid "Colors"
+msgstr "????????"
+
 msgid "Fonts"
 msgstr "??????????????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "???????? ??????? Gtkrc"
 
@@ -13990,12 +14295,119 @@ msgstr ""
 "??????????? ?? ??????? ??? ?????????? ???????? ??????? ?? ?????????? ??? ??? "
 "?????? ???????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???????????????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "???????????????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "????????? ?? ????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??????????? ?????????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "?????? "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "???????????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "???????? ?????????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??????? ??????????????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "????????? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "??????????? ???????? ?????????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "??????? ??????? Pidgin GTK+"
+
+#, fuzzy
+msgid "Contact"
+msgstr "??????????? ????????????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????? ?????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????? ?????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "??????? ??????? Pidgin GTK+"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "??????? ??????? Pidgin GTK+"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "???????? ?????"
 
@@ -14202,6 +14614,21 @@ msgstr ""
 "???? ?? ???????? ????? ??????? ??? ??? ????????????? ???????????? ??? "
 "??????? XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "???????????? ??????? ID;"
+
+#~ msgid "Cursor Color"
+#~ msgstr "????? ?????? ?????????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "?????????? ????? ?????? ?????????"
+
+#~ msgid "Interface colors"
+#~ msgstr "??????? ?????????????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "?????? ????????????"
+
 #~ msgid "Invite message"
 #~ msgstr "?????? ??????????"
 
@@ -14595,9 +15022,6 @@ msgstr ""
 #~ msgid "developer"
 #~ msgstr "????????? ?????????"
 
-#~ msgid "XMPP developer"
-#~ msgstr "????????? ????????? XMPP"
-
 #~ msgid "Artists"
 #~ msgstr "???????????"
 
@@ -14680,9 +15104,6 @@ msgstr ""
 #~ "?? ?????? ??? ?? ???????????? ???? ????? %d ????????? ??? ?? ??????????? %"
 #~ "d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "???? ? ????? ?????????? ??? ????? ????? ???"
-
 #~ msgid "I am applying to join"
 #~ msgstr "???? ?????? ??? ?????????"
 
@@ -14742,9 +15163,6 @@ msgstr ""
 #~ "????? ??????? ? ??? ?????????. ?? ??? ?? ????? ??????? ?? ??????????? ??? "
 #~ "???? ??? ???????? ??????????? ????? ???? ????? ??????.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_???????????:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "??_?????????? ?????:"
 
============================================================
--- po/en_AU.po	d70a4655d38ee52d9553db3bb2a0a43dea7d340c
+++ po/en_AU.po	5fc79511e80f43d5b4b28ff3723d43a67c88c377
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2005-01-19 07:55+1100\n"
 "Last-Translator: Peter (Bleeter) Lawler <trans at six-by-nine.com.au>\n"
 "Language-Team: English/AU <trans at six-by-nine.com.au>\n"
@@ -1865,6 +1865,8 @@ msgstr "%s signed off"
 msgid "+++ %s signed off"
 msgstr "%s signed off"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -2254,6 +2256,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Error creating connection"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3282,7 +3288,12 @@ msgstr "Last name:"
 msgid "Chat _name:"
 msgstr "Last name:"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "Unable to ping server"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "Read error"
 
@@ -3340,6 +3351,10 @@ msgstr "Gadu-Gadu Search Engine"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Search Engine"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Set User Info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
@@ -3384,7 +3399,8 @@ msgstr "_Password:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
 #. 1. connect to server
@@ -3870,6 +3886,9 @@ msgstr "Server does not use any supporte
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
@@ -4169,6 +4188,14 @@ msgstr "Resource"
 msgid "Resource"
 msgstr "Resource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Logged out"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4343,10 +4370,19 @@ msgstr "Find Rooms"
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Non-matching Hosts"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Role"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Plain text"
 
@@ -4366,7 +4402,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Unable to connect to server."
 
 #, c-format
@@ -4395,9 +4431,6 @@ msgstr "Registration Failed"
 msgid "Unregistration Failed"
 msgstr "Registration Failed"
 
-msgid "Already Registered"
-msgstr "Already Registered"
-
 msgid "State"
 msgstr "State"
 
@@ -4411,6 +4444,9 @@ msgstr "Date"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Already Registered"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Register"
@@ -4442,6 +4478,10 @@ msgstr "Registration Error"
 msgstr "Registration Error"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Unable to connect to server."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Error Changing Account Info"
 
@@ -4816,13 +4856,13 @@ msgid ""
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4890,6 +4930,9 @@ msgstr "File transfer port"
 msgid "File transfer proxies"
 msgstr "File transfer port"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5300,6 +5343,10 @@ msgstr "Remove Contact"
 msgid "Non-IM Contacts"
 msgstr "Remove Contact"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5686,67 +5733,29 @@ msgstr "Normal authentication failed!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid group."
-
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s on %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s wants to send you a file"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Unknown error"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Unable to ban user %s"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Unknown error"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Unable to add user on %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Unable to block user on %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Unable to permit user on %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s could not be added because your buddy list is full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is not a valid passport account."
-
 #, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Service Temporarily Unavailable"
-
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Message could not be sent because the user is offline:"
 
-msgid "Unable to rename group"
-msgstr "Unable to rename group"
-
-msgid "Unable to delete group"
-msgstr "Unable to delete group"
-
 #, fuzzy, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5847,6 +5856,9 @@ msgstr ""
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
+msgid "Unknown error."
+msgstr "Unknown error."
+
 msgid "Handshaking"
 msgstr "Handshaking"
 
@@ -5865,6 +5877,14 @@ msgstr "Retrieving buddy list"
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
@@ -5903,14 +5923,6 @@ msgstr "Message may have not been sent b
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Add to Address Book"
@@ -5943,6 +5955,52 @@ msgstr "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid group."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s on %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user on %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to block user on %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to permit user on %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s could not be added because your buddy list is full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid passport account."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Service Temporarily Unavailable"
+
+msgid "Unable to rename group"
+msgstr "Unable to rename group"
+
+msgid "Unable to delete group"
+msgstr "Unable to delete group"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5977,6 +6035,8 @@ msgstr "You were disconnected from the s
 msgstr "You were disconnected from the server."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "New away message"
@@ -6027,12 +6087,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Incorrect nickname or password."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6373,10 +6436,6 @@ msgstr "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Incorrect nickname or password."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognise the host of the username you entered"
 
@@ -6593,6 +6652,28 @@ msgstr "Server port"
 msgstr "Server port"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Invalid response from server."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Error creating connection"
+
+msgid "Incorrect password."
+msgstr "Incorrect password."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
 
@@ -6893,15 +6974,38 @@ msgstr ""
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin was unable to get a valid AIM login hash."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin was unable to get a valid login hash."
+
+msgid "Could Not Connect"
+msgstr "Could Not Connect"
+
+msgid "Received authorization"
+msgstr "Received authorisation"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Invalid Username"
 
-msgid "Incorrect password."
-msgstr "Incorrect password."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
@@ -6910,25 +7014,19 @@ msgstr "The AOL Instant Messenger servic
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "The client version you are using is too old. Please upgrade at %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "The client version you are using is too old. Please upgrade at %s"
-
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-msgid "Received authorization"
-msgstr "Received authorisation"
-
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
@@ -6945,26 +7043,6 @@ msgstr "OK"
 msgid "_OK"
 msgstr "OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin was unable to get a valid AIM login hash."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin was unable to get a valid login hash."
-
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -7483,6 +7561,7 @@ msgstr "Set User Info (URL)..."
 msgid "Set User Info (web)..."
 msgstr "Set User Info (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Change Password (URL)"
@@ -7518,6 +7597,10 @@ msgstr "Search for Buddy by Information"
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "User is not logged in"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9947,10 +10030,6 @@ msgstr "Automatic"
 msgid "Auth Domain"
 msgstr "Automatic"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9976,6 +10055,40 @@ msgstr "Add buddy rejected"
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Unable to make SSL connection to server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Incorrect password."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "User does not exist"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Incorrect nickname or password."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10090,9 +10203,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Active which ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
@@ -10909,8 +11021,8 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Room List"
+msgid "A_ccount"
+msgstr "Account:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10919,8 +11031,9 @@ msgstr ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Room List"
 
 #, fuzzy
 msgid "_Block"
@@ -11415,6 +11528,117 @@ msgstr "/Buddies/Show Offline Buddies"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Background colour"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Do you want to add this buddy to your buddy list?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Logged out"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Background colour"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expand"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Collapse"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Shortcuts"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Away"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mood"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Get information on the selected buddy"
+
+msgid "Message Text"
+msgstr "Message Text"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Message Text"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Change user information for %s"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11961,6 +12185,10 @@ msgstr "Hungarian"
 msgstr "Hungarian"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Macedonian"
 
@@ -12067,6 +12295,9 @@ msgstr "Swedish"
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -12511,11 +12742,9 @@ msgstr "Save Image"
 msgid "Save Image"
 msgstr "Save Image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12606,10 +12835,6 @@ msgstr "Font Face"
 msgstr "Font Face"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Background colour"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Foreground font colour"
 
@@ -12934,6 +13159,9 @@ msgstr "Pounce Who"
 msgid "Pounce on Whom"
 msgstr "Pounce Who"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
@@ -13058,9 +13286,16 @@ msgstr "Unknown pounce event. Please rep
 msgid "Unknown.... Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Failed to store image: %s\n"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13669,6 +13904,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Select Buddy"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13907,6 +14146,78 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Server address"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Enter a Conference Server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Select a conference server to query"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online Services"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send Buddy List"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "When away"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Search for:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sound Selection"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description:</b> Spooky"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Set Dir Info"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "User does not exist"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Set Dir Info"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Buddy is idle:"
 
@@ -14432,12 +14743,6 @@ msgstr ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Hyperlink colour"
@@ -14450,6 +14755,10 @@ msgstr "Send Message"
 msgid "Highlighted Message Name Color"
 msgstr "Send Message"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Notification Removal"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14484,37 +14793,25 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ignore c_olours"
+msgid "Disable Typing Notification Text"
+msgstr "New mail notifications"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin File Control"
 
 #, fuzzy
+msgid "Colors"
+msgstr "Close"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "Accounts"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin File Control"
@@ -14658,12 +14955,119 @@ msgstr "Replaces text in outgoing messag
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Not logged in"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s logged out."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Join a Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignore"
+
+#, fuzzy
+msgid "Founder"
+msgstr "hour"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Authorisation Given"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Request ambiguous"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Warning Level"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chat Room List Url"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Save Icon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Buddy List"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin File Control"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin File Control"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
@@ -14882,6 +15286,14 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Active which ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ignore c_olours"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "(1 message)"
 
@@ -15375,10 +15787,6 @@ msgstr ""
 #~ msgstr "Users on %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Do you want to add this buddy to your buddy list?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "File operation error"
 
@@ -15387,10 +15795,6 @@ msgstr ""
 #~ msgstr "%s not currently logged in."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Error creating connection"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Unable to login to AIM"
 
@@ -15516,10 +15920,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Hide Disconnect Errors"
 
@@ -15680,13 +16080,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -16347,9 +16740,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Send a message to the selected buddy"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Get information on the selected buddy"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -16558,9 +16948,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Summary"
 
-#~ msgid "Message Text"
-#~ msgstr "Message Text"
-
 #~ msgid "Away Messages"
 #~ msgstr "Away Messages"
 
@@ -16659,9 +17046,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Critical error in GG library\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Unable to ping server"
-
 #~ msgid "Send as message"
 #~ msgstr "Send as message"
 
@@ -16872,9 +17256,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s logged in."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s logged out."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
============================================================
--- po/en_CA.po	27b650ae3fe56315ca99755b3dab4dba63af25cc
+++ po/en_CA.po	63d97bc0c9dbc2402abb3243e41fc29534f8396f
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2005-03-17 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw at gnome.org>\n"
 "Language-Team: Canadian English <adamw at gnome.org>\n"
@@ -1865,6 +1865,8 @@ msgstr "%s signed off"
 msgid "+++ %s signed off"
 msgstr "%s signed off"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -2254,6 +2256,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Error creating connection"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3282,7 +3288,12 @@ msgstr "Last name:"
 msgid "Chat _name:"
 msgstr "Last name:"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "Unable to ping server"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "Read error"
 
@@ -3340,6 +3351,10 @@ msgstr "Gadu-Gadu Search Engine"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Search Engine"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Set User Info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
@@ -3384,7 +3399,8 @@ msgstr "_Password:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
 #. 1. connect to server
@@ -3872,6 +3888,9 @@ msgstr "Server does not use any supporte
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
@@ -4171,6 +4190,14 @@ msgstr "Resource"
 msgid "Resource"
 msgstr "Resource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Logged out"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4345,10 +4372,19 @@ msgstr "Find Rooms"
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Non-matching Hosts"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Role"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Plain text"
 
@@ -4368,7 +4404,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Failed to connect to server."
 
 #, c-format
@@ -4397,9 +4433,6 @@ msgstr "Registration Failed"
 msgid "Unregistration Failed"
 msgstr "Registration Failed"
 
-msgid "Already Registered"
-msgstr "Already Registered"
-
 msgid "State"
 msgstr "Province/Territory"
 
@@ -4413,6 +4446,9 @@ msgstr "Date"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Already Registered"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Register"
@@ -4444,6 +4480,10 @@ msgstr "Registration Error"
 msgstr "Registration Error"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Failed to connect to server."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Error Changing Account Info"
 
@@ -4818,13 +4858,13 @@ msgid ""
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4892,6 +4932,9 @@ msgstr "File transfer port"
 msgid "File transfer proxies"
 msgstr "File transfer port"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5302,6 +5345,10 @@ msgstr "Remove Contact"
 msgid "Non-IM Contacts"
 msgstr "Remove Contact"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5687,67 +5734,29 @@ msgstr "Normal authentication failed!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid group."
-
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s on %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s wants to send you a file"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Unknown error"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Unable to ban user %s"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Unknown error"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Unable to add user on %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Unable to block user on %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Unable to permit user on %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s could not be added because your buddy list is full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is not a valid passport account."
-
 #, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Service Temporarily Unavailable"
-
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Message could not be sent because the user is offline:"
 
-msgid "Unable to rename group"
-msgstr "Unable to rename group"
-
-msgid "Unable to delete group"
-msgstr "Unable to delete group"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5837,6 +5846,9 @@ msgstr ""
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
+msgid "Unknown error."
+msgstr "Unknown error."
+
 msgid "Handshaking"
 msgstr "Handshaking"
 
@@ -5855,6 +5867,14 @@ msgstr "Retrieving buddy list"
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
@@ -5893,14 +5913,6 @@ msgstr "Message may have not been sent b
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Add to Address Book"
@@ -5933,6 +5945,52 @@ msgstr "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid group."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s on %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user on %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to block user on %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to permit user on %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s could not be added because your buddy list is full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid passport account."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Service Temporarily Unavailable"
+
+msgid "Unable to rename group"
+msgstr "Unable to rename group"
+
+msgid "Unable to delete group"
+msgstr "Unable to delete group"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5967,6 +6025,8 @@ msgstr "You were disconnected from the s
 msgstr "You were disconnected from the server."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "New away message"
@@ -6017,12 +6077,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Incorrect nickname or password."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6363,10 +6426,6 @@ msgstr "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Incorrect nickname or password."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognize the host of the username you entered"
 
@@ -6583,6 +6642,28 @@ msgstr "Server port"
 msgstr "Server port"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Invalid response from server."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Error creating connection"
+
+msgid "Incorrect password."
+msgstr "Incorrect password."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
 
@@ -6883,15 +6964,38 @@ msgstr ""
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin was unable to get a valid AIM login hash."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin was unable to get a valid login hash."
+
+msgid "Could Not Connect"
+msgstr "Could Not Connect"
+
+msgid "Received authorization"
+msgstr "Received authorization"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Invalid Username"
 
-msgid "Incorrect password."
-msgstr "Incorrect password."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
@@ -6900,25 +7004,19 @@ msgstr "The AOL Instant Messenger servic
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "The client version you are using is too old. Please upgrade at %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "The client version you are using is too old. Please upgrade at %s"
-
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-msgid "Received authorization"
-msgstr "Received authorization"
-
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
@@ -6935,26 +7033,6 @@ msgstr "OK"
 msgid "_OK"
 msgstr "OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin was unable to get a valid AIM login hash."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin was unable to get a valid login hash."
-
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -7471,6 +7549,7 @@ msgstr "Set User Info (URL)..."
 msgid "Set User Info (web)..."
 msgstr "Set User Info (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Change Password (URL)"
@@ -7506,6 +7585,10 @@ msgstr "Search for Buddy by Information"
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "User is not logged in"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9935,10 +10018,6 @@ msgstr "Automatic"
 msgid "Auth Domain"
 msgstr "Automatic"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9964,6 +10043,40 @@ msgstr "Add buddy rejected"
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Unable to make SSL connection to server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Incorrect password."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "User does not exist"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Incorrect nickname or password."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10078,9 +10191,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Active which ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
@@ -10897,8 +11009,8 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Room List"
+msgid "A_ccount"
+msgstr "Account:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10907,8 +11019,9 @@ msgstr ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Room List"
 
 #, fuzzy
 msgid "_Block"
@@ -11403,6 +11516,117 @@ msgstr "/Buddies/Show Offline Buddies"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Background colour"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Do you want to add this buddy to your buddy list?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Logged out"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Background colour"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expand"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Collapse"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Shortcuts"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Away"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mood"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Get information on the selected buddy"
+
+msgid "Message Text"
+msgstr "Message Text"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Message Text"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Change user information for %s"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11949,6 +12173,10 @@ msgstr "Hungarian"
 msgstr "Hungarian"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Macedonian"
 
@@ -12055,6 +12283,9 @@ msgstr "Swedish"
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -12499,11 +12730,9 @@ msgstr "Save Image"
 msgid "Save Image"
 msgstr "Save Image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12594,10 +12823,6 @@ msgstr "Font Face"
 msgstr "Font Face"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Background colour"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Foreground font colour"
 
@@ -12922,6 +13147,9 @@ msgstr "Pounce Who"
 msgid "Pounce on Whom"
 msgstr "Pounce Who"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
@@ -13046,9 +13274,16 @@ msgstr "Unknown pounce event. Please rep
 msgid "Unknown.... Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Failed to store image: %s\n"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13657,6 +13892,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Select Buddy"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13895,6 +14134,78 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Server address"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Enter a Conference Server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Select a conference server to query"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online Services"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send Buddy List"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "When away"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Search for:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sound Selection"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description:</b> Spooky"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Set Dir Info"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "User does not exist"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Set Dir Info"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Buddy is idle:"
 
@@ -14420,12 +14731,6 @@ msgstr ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Hyperlink colour"
@@ -14438,6 +14743,10 @@ msgstr "Send Message"
 msgid "Highlighted Message Name Color"
 msgstr "Send Message"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Notification Removal"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14472,37 +14781,25 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ignore c_olours"
+msgid "Disable Typing Notification Text"
+msgstr "New mail notifications"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin File Control"
 
 #, fuzzy
+msgid "Colors"
+msgstr "Close"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "Accounts"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin File Control"
@@ -14646,12 +14943,119 @@ msgstr "Replaces text in outgoing messag
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Not logged in"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s logged out."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Join a Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignore"
+
+#, fuzzy
+msgid "Founder"
+msgstr "hour"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Authorization Given"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Request ambiguous"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Warning Level"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chat Room List Url"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Save Icon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Buddy List"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin File Control"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin File Control"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
@@ -14870,6 +15274,14 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Active which ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ignore c_olours"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "(1 message)"
 
@@ -15363,10 +15775,6 @@ msgstr ""
 #~ msgstr "Users on %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Do you want to add this buddy to your buddy list?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "File operation error"
 
@@ -15375,10 +15783,6 @@ msgstr ""
 #~ msgstr "%s not currently logged in."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Error creating connection"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Unable to login to AIM"
 
@@ -15504,10 +15908,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Hide Disconnect Errors"
 
@@ -15663,13 +16063,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -16329,9 +16722,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Send a message to the selected buddy"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Get information on the selected buddy"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -16540,9 +16930,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Summary"
 
-#~ msgid "Message Text"
-#~ msgstr "Message Text"
-
 #~ msgid "Away Messages"
 #~ msgstr "Away Messages"
 
@@ -16641,9 +17028,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Critical error in GG library\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Unable to ping server"
-
 #~ msgid "Send as message"
 #~ msgstr "Send as message"
 
@@ -16854,9 +17238,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s logged in."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s logged out."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
============================================================
--- po/en_GB.po	bb0892b1280e237163825d55055f9fa6146cc5de
+++ po/en_GB.po	2f06e445d2d604dcc3336a4f3661eed718594b17
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <luke at lukeross.name>\n"
 "Language-Team:  <en_GB at li.org>\n"
@@ -1761,6 +1761,8 @@ msgstr "+++ %s signed off"
 msgid "+++ %s signed off"
 msgstr "+++ %s signed off"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -2162,6 +2164,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Error creating connection"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "You are using %s, but this plugin requires %s."
@@ -3134,6 +3140,11 @@ msgstr "Chat _name:"
 msgid "Chat _name:"
 msgstr "Chat _name:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Unable to connect to server."
+
 msgid "Chat error"
 msgstr "Chat error"
 
@@ -3182,6 +3193,10 @@ msgstr "Gadu-Gadu User"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu User"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Set User Info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
@@ -3224,7 +3239,8 @@ msgstr "_Password:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
 #. 1. connect to server
@@ -3695,6 +3711,9 @@ msgstr "Server does not use any supporte
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "You require encryption, but it is not available on this server."
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
@@ -3965,6 +3984,14 @@ msgstr "Resource"
 msgid "Resource"
 msgstr "Resource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Logged In"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4131,9 +4158,18 @@ msgstr "Find Rooms"
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "You require encryption, but it is not available on this server."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "No matching users found"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Role"
+
 msgid "Ping timeout"
 msgstr "Ping timeout"
 
@@ -4153,7 +4189,7 @@ msgstr "Invalid XMPP ID. Domain must be 
 msgstr "Invalid XMPP ID. Domain must be set."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Failed to connect to server."
 
 #, c-format
@@ -4180,9 +4216,6 @@ msgstr "Unregistration Failed"
 msgid "Unregistration Failed"
 msgstr "Unregistration Failed"
 
-msgid "Already Registered"
-msgstr "Already Registered"
-
 msgid "State"
 msgstr "County/State"
 
@@ -4195,6 +4228,9 @@ msgstr "Date"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Already Registered"
+
 msgid "Unregister"
 msgstr "Unregister"
 
@@ -4223,6 +4259,10 @@ msgstr "Change Registration"
 msgid "Change Registration"
 msgstr "Change Registration"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Failed to connect to server."
+
 msgid "Error unregistering account"
 msgstr "Error unregistering account"
 
@@ -4586,16 +4626,18 @@ msgstr "ban &lt;user&gt; [reason]:  Ban 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [reason]:  Ban a user from the room."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4658,6 +4700,9 @@ msgstr "File transfer proxies"
 msgid "File transfer proxies"
 msgstr "File transfer proxies"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5060,6 +5105,10 @@ msgstr "Remove Contact"
 msgid "Non-IM Contacts"
 msgstr "Remove Contact"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s has sent you a webcam invitation, which is not yet supported."
+
 msgid "Nudge"
 msgstr "Nudge"
 
@@ -5410,65 +5459,28 @@ msgstr "Windows Live ID authentication: 
 msgstr "Windows Live ID authentication: Unable to connect"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid group."
-
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s on %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s just sent you a Nudge!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Unknown error (%d)"
 
 msgid "Unable to add user"
 msgstr "Unable to add user"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Unknown error (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "The following are the results of your search"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Unable to add user on %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Unable to block user on %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Unable to permit user on %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s could not be added because your buddy list is full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is not a valid passport account."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Service Temporarily Unavailable."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Message was not sent because you are not signed on."
 
-msgid "Unable to rename group"
-msgstr "Unable to rename group"
-
-msgid "Unable to delete group"
-msgstr "Unable to delete group"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5558,6 +5570,9 @@ msgstr ""
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
+msgid "Unknown error."
+msgstr "Unknown error."
+
 msgid "Handshaking"
 msgstr "Handshaking"
 
@@ -5576,6 +5591,14 @@ msgstr "Retrieving buddy list"
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s has sent you a webcam invitation, which is not yet supported."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s has sent you a webcam invitation, which is not yet supported."
+
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
@@ -5615,14 +5638,6 @@ msgstr "Message may have not been sent b
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s has added you to his or her buddy list."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s has removed you from his or her buddy list."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Add to Address Book"
@@ -5654,6 +5669,51 @@ msgstr "MSN Protocol Plug-in"
 msgstr "MSN Protocol Plug-in"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid group."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s on %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user on %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to block user on %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to permit user on %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s could not be added because your buddy list is full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid passport account."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Service Temporarily Unavailable."
+
+msgid "Unable to rename group"
+msgstr "Unable to rename group"
+
+msgid "Unable to delete group"
+msgstr "Unable to delete group"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s has added you to his or her buddy list."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s has removed you from his or her buddy list."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "No such user: %s"
 
@@ -5685,6 +5745,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "New mail messages"
 
@@ -5733,18 +5795,20 @@ msgstr "Protocol error, code %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol error, code %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Your password is %d characters, greater than the expected maximum length "
 "of %d for MySpaceIM. Please shorten your password at http://profileedit."
 "myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
 "again."
 
+msgid "Incorrect username or password"
+msgstr "Incorrect username or password"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM Error"
 
@@ -6060,9 +6124,6 @@ msgstr "Master archive is misconfigured"
 msgid "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
-msgid "Incorrect username or password"
-msgstr "Incorrect username or password"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognise the host of the username you entered"
 
@@ -6277,6 +6338,28 @@ msgstr "Server port"
 msgid "Server port"
 msgstr "Server port"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Received unexpected HTTP response from server."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Error requesting login token"
+
+msgid "Incorrect password."
+msgstr "Incorrect password."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Could not join chat room"
 
@@ -6578,14 +6661,31 @@ msgstr ""
 "Usernames must be a valid email address, or start with a letter and contain "
 "only letters, numbers and spaces, or contain only numbers."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "You may be disconnected shortly.  Check %s for updates."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Unable to get a valid AIM login hash."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "You may be disconnected shortly.  Check %s for updates."
+
+msgid "Unable to get a valid login hash."
+msgstr "Unable to get a valid login hash."
+
+msgid "Could Not Connect"
+msgstr "Could Not Connect"
+
+msgid "Received authorization"
+msgstr "Received authorisation"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Invalid username."
 
-msgid "Incorrect password."
-msgstr "Incorrect password."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
@@ -6594,25 +6694,19 @@ msgstr "The AOL Instant Messenger servic
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "The client version you are using is too old. Please upgrade at %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "The client version you are using is too old. Please upgrade at %s"
-
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-msgid "Received authorization"
-msgstr "Received authorisation"
-
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
@@ -6628,20 +6722,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "You may be disconnected shortly.  Check %s for updates."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Unable to get a valid AIM login hash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "You may be disconnected shortly.  Check %s for updates."
-
-msgid "Unable to get a valid login hash."
-msgstr "Unable to get a valid login hash."
-
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -7143,6 +7223,7 @@ msgstr "Set User Info (web)..."
 msgid "Set User Info (web)..."
 msgstr "Set User Info (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Change Password (web)"
 
@@ -7172,6 +7253,10 @@ msgstr "Search for Buddy by Information"
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "User is not logged in"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9505,10 +9590,6 @@ msgstr "Auth Domain"
 msgid "Auth Domain"
 msgstr "Auth Domain"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s has sent you a webcam invitation, which is not yet supported."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9534,6 +9615,40 @@ msgstr "Add buddy rejected"
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Received invalid data on connection with server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Incorrect password"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "User does not exist"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Incorrect username or password"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9643,8 +9758,8 @@ msgstr "Start Doodling"
 msgid "Start Doodling"
 msgstr "Start Doodling"
 
-msgid "Activate which ID?"
-msgstr "Activate which ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
@@ -10432,8 +10547,9 @@ msgstr "Please update the necessary fiel
 msgid "Please update the necessary fields."
 msgstr "Please update the necessary fields."
 
-msgid "Room _List"
-msgstr "Room _List"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Account"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10442,8 +10558,8 @@ msgstr ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+msgid "Room _List"
+msgstr "Room _List"
 
 msgid "_Block"
 msgstr "_Block"
@@ -10884,6 +11000,112 @@ msgstr "/Buddies/Sort Buddies"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Sort Buddies"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Background Colour"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "This group has been added to your buddy list"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Background Colour"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expand"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Collapse"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Sort"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Away"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mood Text"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Message sent"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Change user information for %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Servers"
@@ -11388,6 +11610,10 @@ msgstr "Hungarian"
 msgid "Hungarian"
 msgstr "Hungarian"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
 msgid "Indonesian"
 msgstr "Indonesian"
 
@@ -11486,6 +11712,9 @@ msgstr "Swedish"
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11926,11 +12155,10 @@ msgstr "Save Image"
 msgid "Save Image"
 msgstr "Save Image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Show custom smileys"
 
@@ -12018,9 +12246,6 @@ msgstr "Font Face"
 msgid "Font Face"
 msgstr "Font Face"
 
-msgid "Background Color"
-msgstr "Background Colour"
-
 msgid "Foreground Color"
 msgstr "Foreground Colour"
 
@@ -12355,6 +12580,9 @@ msgstr "Pounce on Whom"
 msgid "Pounce on Whom"
 msgstr "Pounce on Whom"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
@@ -12465,9 +12693,18 @@ msgstr "Unknown pounce event. Please rep
 msgid "Unknown.... Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Smiley theme failed to unpack."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Smiley theme failed to unpack."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Smiley theme failed to unpack."
+
 msgid "Install Theme"
 msgstr "Install Theme"
 
@@ -13038,6 +13275,10 @@ msgstr "Certificate Manager"
 msgstr "Certificate Manager"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Select Buddy"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Use this buddy _icon for this account:"
 
@@ -13264,6 +13505,78 @@ msgstr "Displays statistical information
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Displays statistical information about your buddies' availability"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Server address"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Enter a Conference Server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Select a conference server to query"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online Services"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send Buddy List"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Goes away"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Log Directory"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sound Selection"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub Service"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Description"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Service Discovery Info"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "User does not exist"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Service Discovery Info"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "This plugin is useful for debugging XMPP servers or clients."
+
 msgid "Buddy is idle"
 msgstr "Buddy is idle"
 
@@ -13765,12 +14078,6 @@ msgstr ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-msgid "Cursor Color"
-msgstr "Cursor Colour"
-
-msgid "Secondary Cursor Color"
-msgstr "Secondary Cursor Colour"
-
 msgid "Hyperlink Color"
 msgstr "Hyperlink Colour"
 
@@ -13781,6 +14088,10 @@ msgstr "Highlighted Messages Name Colour
 msgid "Highlighted Message Name Color"
 msgstr "Highlighted Messages Name Colour"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Typing notification colour"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView Horizontal Separation"
 
@@ -13810,35 +14121,24 @@ msgstr "GTK+ Text Shortcut Theme"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Text Shortcut Theme"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Interface colours"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Enable typing notification"
 
-msgid "Widget Sizes"
-msgstr "Widget Sizes"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ Theme Control"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Close"
+
 msgid "Fonts"
 msgstr "Fonts"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc File Tools"
 
@@ -13979,12 +14279,119 @@ msgstr "Replaces text in outgoing messag
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Not logged in"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Not logged in"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Join a Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignore"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Louder"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Authorisation Given"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Request Dialog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Warning Level"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status for %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chat room locale"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Save Icon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ Theme Control"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Contact Info"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Buddy List"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ Theme Control"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ Theme Control"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
@@ -14188,6 +14595,21 @@ msgstr "This plugin is useful for debugg
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "This plugin is useful for debugging XMPP servers or clients."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Activate which ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Cursor Colour"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Secondary Cursor Colour"
+
+#~ msgid "Interface colors"
+#~ msgstr "Interface colours"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget Sizes"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Insert in message"
@@ -14659,9 +15081,6 @@ msgstr "This plugin is useful for debugg
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Your request to join group %d has been approved by admin %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "This group has been added to your buddy list"
-
 #~ msgid "I am applying to join"
 #~ msgstr "I am applying to join"
 
@@ -14683,9 +15102,6 @@ msgstr "This plugin is useful for debugg
 #~ msgid "Enter your reason:"
 #~ msgstr "Enter your reason:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Error requesting login token"
-
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Unable to login. Check debug log"
 
============================================================
--- po/eo.po	f8f73215d05b4a9ead0b86c5f5bfb0721a2671f6
+++ po/eo.po	847858eb01d2c200d2b4fc5fee6c20202f1236e1
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-03-02 13:39+0100\n"
 "Last-Translator: St?phane Fillod <f8cfe at free.fr>\n"
 "Language-Team: Esperanto <kde-i18n-eo at kde.org>\n"
@@ -1723,6 +1723,8 @@ msgstr "+++ %s malsalutis"
 msgid "+++ %s signed off"
 msgstr "+++ %s malsalutis"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nekonata eraro"
 
@@ -2111,6 +2113,10 @@ msgstr "(%s) %s <A?TO-RESPONDO>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <A?TO-RESPONDO>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Eraro kreante konekto"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3049,6 +3055,11 @@ msgstr "Babilejo _nomo:"
 msgid "Chat _name:"
 msgstr "Babilejo _nomo:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Ne eblas alinomigi grupon"
+
 msgid "Chat error"
 msgstr "Babileraro"
 
@@ -3097,6 +3108,10 @@ msgstr "Gadu-Gadu Uzanto"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Uzanto"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Difinu Uzanto-Informon..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nekonata komando: %s"
@@ -3139,7 +3154,8 @@ msgstr "_Pasvorto:"
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC karesnomoj ne enhaveblas blankan spacon"
 
 #. 1. connect to server
@@ -3574,6 +3590,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3839,6 +3858,14 @@ msgstr "Rimedo"
 msgid "Resource"
 msgstr "Rimedo"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Ensalutita"
+
 msgid "Middle Name"
 msgstr "Meza Nomo"
 
@@ -4003,9 +4030,18 @@ msgstr "Trovu Babilejojn"
 msgid "Find Rooms"
 msgstr "Trovu Babilejojn"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alinomo:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Neniu protokolo trovita"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rolo"
+
 msgid "Ping timeout"
 msgstr ""
 
@@ -4025,7 +4061,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Malsukcesis konekti servilon."
 
 #, c-format
@@ -4052,9 +4088,6 @@ msgstr "Malregistrado Malsukcesis"
 msgid "Unregistration Failed"
 msgstr "Malregistrado Malsukcesis"
 
-msgid "Already Registered"
-msgstr "Jam Registrita"
-
 msgid "State"
 msgstr "?ato"
 
@@ -4067,6 +4100,9 @@ msgstr "Dato"
 msgid "Date"
 msgstr "Dato"
 
+msgid "Already Registered"
+msgstr "Jam Registrita"
+
 msgid "Unregister"
 msgstr "Forregistru"
 
@@ -4095,6 +4131,10 @@ msgstr "?an?u Registradon"
 msgid "Change Registration"
 msgstr "?an?u Registradon"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Malsukcesis konekti servilon."
+
 msgid "Error unregistering account"
 msgstr "Eraro forregistrante konton"
 
@@ -4458,13 +4498,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4524,6 +4564,9 @@ msgstr "Dosieral?uto prokuriloj"
 msgid "File transfer proxies"
 msgstr "Dosieral?uto prokuriloj"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4919,6 +4962,10 @@ msgstr "Forigu Kontakton"
 msgid "Non-IM Contacts"
 msgstr "Forigu Kontakton"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5260,64 +5307,27 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ne estas valida grupo."
-
-msgid "Unknown error."
-msgstr "Nekonata eraro."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s en %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ?us sendis al vi Zumon!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Nekonata eraro (%d)"
 
 msgid "Unable to add user"
 msgstr ""
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Nekonata eraro (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "La jenaj estas la rezultoj de via ser?o"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Ne eblas aldoni uzanto en %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ne eblas bloki uzanton ?e %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Ne eblas permezi uzanton ?e %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ne aldoneblas ?ar via kunullisto plenumas."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ne etas valida pasporto konto."
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr "Ne eblas alinomigi grupon"
-
-msgid "Unable to delete group"
-msgstr "Ne eblas forigi grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5388,6 +5398,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "Nekonata eraro."
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5406,6 +5419,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5442,14 +5463,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s aldonis vin en sia kunul listo."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s forigis vin el sia kunul listo."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Aldonu al adresaro"
@@ -5482,6 +5495,51 @@ msgstr "MSN Protokol-Kroma?o"
 msgstr "MSN Protokol-Kroma?o"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ne estas valida grupo."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s en %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Ne eblas aldoni uzanto en %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ne eblas bloki uzanton ?e %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Ne eblas permezi uzanton ?e %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ne aldoneblas ?ar via kunullisto plenumas."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ne etas valida pasporto konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr "Ne eblas alinomigi grupon"
+
+msgid "Unable to delete group"
+msgstr "Ne eblas forigi grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s aldonis vin en sia kunul listo."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s forigis vin el sia kunul listo."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5513,6 +5571,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Novaj retmesa?oj"
 
@@ -5559,12 +5619,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Misa ekrannomo a? pasvorto"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -5878,10 +5941,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "Misa ekrannomo a? pasvorto"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6085,6 +6144,26 @@ msgstr "Servilo pordo"
 msgid "Server port"
 msgstr "Servilo pordo"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Ricevis neatendita HTTP respondo de servilo."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Eraro lan?ante %s"
+
+msgid "Incorrect password."
+msgstr "Misa pasvorto."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Ne povis ali?i babilejon"
 
@@ -6377,15 +6456,32 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Ne eblas obteni validan AIM-an profilon."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr "Ne Povas Konekti"
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Malvalida Uzantonomo"
 
-msgid "Incorrect password."
-msgstr "Misa pasvorto."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6394,21 +6490,14 @@ msgstr "La AOL Tujmesa?ilo servo estas 
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "La AOL Tujmesa?ilo servo estas provizore nedisponebla."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr "Ne Povas Konekti"
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
 msgid "The SecurID key entered is invalid."
@@ -6426,20 +6515,6 @@ msgstr "_Da?rigu"
 msgid "_OK"
 msgstr "_Da?rigu"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Ne eblas obteni validan AIM-an profilon."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr "Pasvorto sendita"
 
@@ -6893,6 +6968,7 @@ msgstr "Difinu Uzanto-Informon (URL)..."
 msgid "Set User Info (web)..."
 msgstr "Difinu Uzanto-Informon (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "?an?u Pasvorton (URL)"
@@ -6924,6 +7000,10 @@ msgstr "Ser?u Kunulon la? Informo..."
 msgid "Search for Buddy by Information"
 msgstr "Ser?u Kunulon la? Informo..."
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Uzanto ne estas ensalutita"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9154,10 +9234,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9181,6 +9257,37 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Misa pasvorto"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Uzanto ne ekzistas"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Misa ekrannomo a? pasvorto"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9283,8 +9390,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "?altu kiun ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kiun kuni?i en babilejo?"
@@ -10030,8 +10137,9 @@ msgstr "Bonvolu Aktualigi la necesajn ka
 msgid "Please update the necessary fields."
 msgstr "Bonvolu Aktualigi la necesajn kampojn."
 
-msgid "Room _List"
-msgstr "Babilejoj _Listo"
+#, fuzzy
+msgid "A_ccount"
+msgstr "_Konto:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10039,8 +10147,8 @@ msgstr ""
 msgstr ""
 "B.v enigi la konvenan informon pri la babilejo kiun vi deziras ali?i.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Babilejoj _Listo"
 
 msgid "_Block"
 msgstr "_Bloku"
@@ -10478,6 +10586,111 @@ msgstr "/Kunuloj/Ordigu Kunulojn"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kunuloj/Ordigu Kunulojn"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Malanta?a Koloro"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "La?a"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Malanta?a Koloro"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Etendu"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Elektu Malanta?an Koloron"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Maletendu"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Elektu Malanta?an Koloron"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Ordigi"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Enrete"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Fora"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Senkonekta"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Agorda Teksto"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mesa?o sendita"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?an?u uzanto-informon de %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Serviloj"
@@ -10983,6 +11196,10 @@ msgstr "Hungara"
 msgid "Hungarian"
 msgstr "Hungara"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumana"
+
 msgid "Indonesian"
 msgstr "Indonezia"
 
@@ -11081,6 +11298,9 @@ msgstr "Sveda"
 msgid "Swedish"
 msgstr "Sveda"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamila"
 
@@ -11519,11 +11739,10 @@ msgstr "Konservu Bildon"
 msgid "Save Image"
 msgstr "Konservu Bildon"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Konservi Bildon..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Montru personajn ridmienojn"
 
@@ -11611,9 +11830,6 @@ msgstr "Tiparo Aspekto"
 msgid "Font Face"
 msgstr "Tiparo Aspekto"
 
-msgid "Background Color"
-msgstr "Malanta?a Koloro"
-
 msgid "Foreground Color"
 msgstr "Anta?a Koloro"
 
@@ -11929,6 +12145,9 @@ msgstr "Atentigi Kiun"
 msgid "Pounce on Whom"
 msgstr "Atentigi Kiun"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "K_unul nomo:"
 
@@ -12039,7 +12258,15 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "GStreamer malsukcesis ekon."
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Malsukcesis ?argi bildon"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -12610,6 +12837,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Elektu Kunulon"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Uzu tiun kunul p_iktogramon por tiu konto:"
 
@@ -12828,6 +13059,75 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Servilo adreso"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Enigu Konferencan Servilon"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Elektu konferencan servilon petendan"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Trovu kunulojn"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Sendu Kunulliston"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Fori?as"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Protokolo Dosierujo"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sono Elekto"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Priskibo"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Servico Malkovrado Informo"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Retumilo:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Uzanto ne ekzistas"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Servico Malkovrado Informo"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "Kunul senokupas"
 
@@ -13318,12 +13618,6 @@ msgstr ""
 "- ?i inversigas ?iajn enirantan tekston\n"
 "- ?i sendas mesa?on al homoj en via listo tuj kiam ili ensalutas"
 
-msgid "Cursor Color"
-msgstr "Kursoro Koloro"
-
-msgid "Secondary Cursor Color"
-msgstr "Dua Kursoro Koloro"
-
 msgid "Hyperlink Color"
 msgstr "Ligilo Koloro"
 
@@ -13334,6 +13628,10 @@ msgstr "Emfazitaj Mesa?oj Nomo Koloro"
 msgid "Highlighted Message Name Color"
 msgstr "Emfazitaj Mesa?oj Nomo Koloro"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Avizo Forigo"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13363,35 +13661,24 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Interfaco koloroj"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Nova retpo?t-avizoj"
 
-msgid "Widget Sizes"
-msgstr "Fenestra?o Grandecoj"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pi?in GTK+ Etoso Kontrolo"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Fermu"
+
 msgid "Fonts"
 msgstr "Tiparoj"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13529,12 +13816,119 @@ msgstr "Anstata?igu tekston en eliranta
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Anstata?igu tekston en elirantaj mesa?oj la? uzantodfinitaj reguloj."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Ne ensalutita"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Ne ensalutita"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Ali?u Babilejon"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignoru"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Pli La?te"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opero"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Permeso Donita"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Eraro "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informo"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Peto Dialogujo"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Averto"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Stato por %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Babilejo loka?aro"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Konservu Piktogramon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pi?in GTK+ Etoso Kontrolo"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakto Informo"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Kunullisto"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Kunullisto"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pi?in GTK+ Etoso Kontrolo"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pi?in GTK+ Etoso Kontrolo"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Kunul Tiktakilo"
 
@@ -13733,6 +14127,21 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Activate which ID?"
+#~ msgstr "?altu kiun ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kursoro Koloro"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Dua Kursoro Koloro"
+
+#~ msgid "Interface colors"
+#~ msgstr "Interfaco koloroj"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Fenestra?o Grandecoj"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Enmetu en mesa?on"
@@ -14045,9 +14454,6 @@ msgstr ""
 #~ "kunullisto. Vi povas la? deziro enigi alinomon, a? karesnomon, pri la "
 #~ "kunul. La alinomo estos vidigita anstata? la erkrana nomo la? kaze.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Konto:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "_Ekrannomo:"
 
============================================================
--- po/es.po	a18c1b5a29e5b817962615fdd1708328e4c1c6da
+++ po/es.po	541a2543efa861e50ab82991a8ccdd01550ffc2f
@@ -52,7 +52,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-01-05 00:05+0100\n"
 "Last-Translator: Javier Fern?ndez-Sanguino <jfs at debian.org>\n"
 "Language-Team:  Spanish team <es at li.org>\n"
@@ -1834,6 +1834,8 @@ msgstr "+++ %s se ha desconectado"
 msgid "+++ %s signed off"
 msgstr "+++ %s se ha desconectado"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2239,6 +2241,10 @@ msgstr "(%s) %s <RESPUESTA AUTOM?TICA>:
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOM?TICA>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Error al crear la conexi?n"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Est? utilizando %s, pero este complemento requiere %s."
@@ -3228,6 +3234,11 @@ msgstr "_Nombre de chat:"
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "No se pudo resolver el nombre del servidor."
+
 msgid "Chat error"
 msgstr "Error de chat"
 
@@ -3276,6 +3287,10 @@ msgstr "Usuario de Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Obteniendo el servidor"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Orden desconocida: %s"
@@ -3318,7 +3333,8 @@ msgstr "Contra_se?a:"
 msgid "_Password:"
 msgstr "Contra_se?a:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
 #. 1. connect to server
@@ -3796,6 +3812,9 @@ msgstr "El servidor no usa un m?todo de
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un m?todo de autenticaci?n conocido"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Necesita cifrado, pero no est? disponible esa opci?n en este servidor."
+
 msgid "Invalid challenge from server"
 msgstr "Desaf?o inv?lido del servidor"
 
@@ -4067,6 +4086,14 @@ msgstr "Recurso"
 msgid "Resource"
 msgstr "Recurso"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Conectado"
+
 msgid "Middle Name"
 msgstr "Nombre medio"
 
@@ -4235,9 +4262,18 @@ msgstr "Buscar salas"
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Necesita cifrado, pero no est? disponible esa opci?n en este servidor."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Apodo:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "No se encontraron usuarios que coincidan"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rol"
+
 msgid "Ping timeout"
 msgstr "Tiempo de expiraci?n del ping"
 
@@ -4257,7 +4293,7 @@ msgstr "XMPP ID inv?lido. Debe establec
 msgstr "XMPP ID inv?lido. Debe establecerse el dominio."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "No se pudo conectar al servidor."
 
 #, c-format
@@ -4284,9 +4320,6 @@ msgstr "Fall? el deregistro"
 msgid "Unregistration Failed"
 msgstr "Fall? el deregistro"
 
-msgid "Already Registered"
-msgstr "Ya est? registrado"
-
 msgid "State"
 msgstr "Estado"
 
@@ -4299,6 +4332,9 @@ msgstr "Fecha"
 msgid "Date"
 msgstr "Fecha"
 
+msgid "Already Registered"
+msgstr "Ya est? registrado"
+
 msgid "Unregister"
 msgstr "Deregistrar"
 
@@ -4330,6 +4366,10 @@ msgstr "Cambiar registro"
 msgid "Change Registration"
 msgstr "Cambiar registro"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "No se pudo conectar al servidor."
+
 msgid "Error unregistering account"
 msgstr "Error al deregistrar la cuenta"
 
@@ -4696,16 +4736,18 @@ msgstr "ban &lt;usuario&gt; [raz?n]:  E
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [raz?n]:  Echar a un usuario de la sala."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: definir "
 "la afiliaci?n de un usuario a la sala."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
 "rol de un usuario en la sala."
@@ -4770,6 +4812,9 @@ msgstr "Pasarelas de transferencia de ar
 msgid "File transfer proxies"
 msgstr "Pasarelas de transferencia de archivos"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5174,6 +5219,12 @@ msgstr "Contacto no MI"
 msgid "Non-IM Contacts"
 msgstr "Contacto no MI"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s le ha enviado una invitaci?n para utilizar la webcam, algo a?n no "
+"soportado."
+
 msgid "Nudge"
 msgstr "Codazo"
 
@@ -5522,63 +5573,26 @@ msgstr "Autenticaci?n Windows Live ID: 
 msgstr "Autenticaci?n Windows Live ID: Respuestas inv?lida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s no es un nombre de grupo v?lido."
-
-msgid "Unknown error."
-msgstr "Error desconocido."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s en %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "?%s le acaba de dar un codazo!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Error desconocido (%d)"
 
 msgid "Unable to add user"
 msgstr "No puede a?adir al usuario"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Error desconocido (%d)"
+
 msgid "The following users are missing from your addressbook"
 msgstr "Los usuarios indicados a continuaci?n no est?n en su agenda"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "No se pudo a?adir al usuario a %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "No puede expulsar al usuario en %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "No se pudo invitar al usuario a %s (%s)."
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "No se pudo a?adir a %s porque su lista de amigos est? llena."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s no es un nombre de cuenta <<passport>> v?lida."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Servicio no disponible temporalmente."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "No se pudo enviar el mensaje al m?vil porque es demasiado largo."
 
-msgid "Unable to rename group"
-msgstr "No se pudo cambiar el nombre del grupo"
-
-msgid "Unable to delete group"
-msgstr "No se pudo borrar el grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5672,6 +5686,9 @@ msgstr ""
 "Su lista de amigos MSN est? indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo m?s tarde."
 
+msgid "Unknown error."
+msgstr "Error desconocido."
+
 msgid "Handshaking"
 msgstr "Negociaci?n"
 
@@ -5690,6 +5707,18 @@ msgstr "Recuperando lista de amigos"
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s le ha enviado una invitaci?n para utilizar la webcam, algo a?n no "
+"soportado."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s le ha enviado una invitaci?n para utilizar la webcam, algo a?n no "
+"soportado."
+
 msgid "Away From Computer"
 msgstr "Ausente"
 
@@ -5732,14 +5761,6 @@ msgstr "No se pudo enviar el mensaje por
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "El usuario %s lo ha a?adido a su lista de amigos."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "El usuario %s lo ha quitado de su lista de amigos."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "?Desea borrar al amigo de su agenda?"
 
@@ -5769,6 +5790,51 @@ msgstr "Complemento de protocolo MSN"
 msgstr "Complemento de protocolo MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s no es un nombre de grupo v?lido."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s en %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "No se pudo a?adir al usuario a %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "No puede expulsar al usuario en %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "No se pudo invitar al usuario a %s (%s)."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "No se pudo a?adir a %s porque su lista de amigos est? llena."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s no es un nombre de cuenta <<passport>> v?lida."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servicio no disponible temporalmente."
+
+msgid "Unable to rename group"
+msgstr "No se pudo cambiar el nombre del grupo"
+
+msgid "Unable to delete group"
+msgstr "No se pudo borrar el grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "El usuario %s lo ha a?adido a su lista de amigos."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "El usuario %s lo ha quitado de su lista de amigos."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "No existe el usuario: %s"
 
@@ -5797,6 +5863,8 @@ msgstr "Se ha perdido la conexi?n con e
 msgstr "Se ha perdido la conexi?n con el servidor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Mensajes de correo nuevos"
 
@@ -5845,18 +5913,20 @@ msgstr "Error de pr?tocolo, c?digo %d:
 msgid "Protocol error, code %d: %s"
 msgstr "Error de pr?tocolo, c?digo %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s, su contrase?a es de %d caracteres, esto es m?s de la longitud m?xima "
 "esperada (%d) para MySpaceIM. Reduzca el tama?o de su contrase?a en <<http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword>> "
 "e int?ntelo de nuevo."
 
+msgid "Incorrect username or password"
+msgstr "Nombre de usuario o contrase?a incorrecta"
+
 msgid "MySpaceIM Error"
 msgstr "Error MySpaceIM"
 
@@ -6174,9 +6244,6 @@ msgstr "El archivo maestro no est? bien
 msgid "Master archive is misconfigured"
 msgstr "El archivo maestro no est? bien configurado"
 
-msgid "Incorrect username or password"
-msgstr "Nombre de usuario o contrase?a incorrecta"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "No se reconoci? el servidor del nombre de usuario que introdujo"
 
@@ -6395,6 +6462,29 @@ msgstr "Puerto del servidor"
 msgid "Server port"
 msgstr "Puerto del servidor"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Se recibi? una respuesta HTTP del servidor que no se esperaba."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Se ha conectado y desconectado demasiadas veces. Espere diez minutos e "
+"int?ntelo de nuevo. Si sigue intent?ndolo, necesitar? esperar incluso m?s "
+"tiempo."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Error al solicitar un testigo de conexi?n"
+
+msgid "Incorrect password."
+msgstr "Contrase?a incorrecta."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "No se pudo conectar a la sala de chat"
 
@@ -6699,14 +6789,31 @@ msgstr ""
 "v?lidas, o empezar con una letra y s?lo pueden contener letras, n?meros y "
 "espacios, o contener s?lo n?meros."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Quiz? sea desconectado en breve.  Compruebe %s para novedades."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "No se pudo obtener un <<hash>> de conexi?n a AIM v?lido."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Quiz? sea desconectado en breve.  Compruebe %s para novedades."
+
+msgid "Unable to get a valid login hash."
+msgstr "No se pudo un <<hash>> de conexi?n v?lido."
+
+msgid "Could Not Connect"
+msgstr "No se pudo conectar"
+
+msgid "Received authorization"
+msgstr "Se recibi? la autorizaci?n"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Nombre de usuario no v?lido."
 
-msgid "Incorrect password."
-msgstr "Contrase?a incorrecta."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Su cuenta est? deshabilitada actualmente."
@@ -6716,28 +6823,22 @@ msgstr ""
 msgstr ""
 "El servicio de Mensajer?a Instant?neo AOL est? temporalmente no disponible."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Se ha conectado y desconectado demasiadas veces. Espere diez minutos e "
-"int?ntelo de nuevo. Si sigue intent?ndolo, necesitar? esperar incluso m?s "
-"tiempo."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versi?n del cliente que usa es demasiado antigua. Por favor, actual?cela "
 "en %s"
 
-msgid "Could Not Connect"
-msgstr "No se pudo conectar"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"Se ha conectado y desconectado demasiadas veces. Espere diez minutos e "
+"int?ntelo de nuevo. Si sigue intent?ndolo, necesitar? esperar incluso m?s "
+"tiempo."
 
-msgid "Received authorization"
-msgstr "Se recibi? la autorizaci?n"
-
 msgid "The SecurID key entered is invalid."
 msgstr "La clave SecurID que se ha introducido no es v?lida."
 
@@ -6753,20 +6854,6 @@ msgstr "_Aceptar"
 msgid "_OK"
 msgstr "_Aceptar"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Quiz? sea desconectado en breve.  Compruebe %s para novedades."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "No se pudo obtener un <<hash>> de conexi?n a AIM v?lido."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Quiz? sea desconectado en breve.  Compruebe %s para novedades."
-
-msgid "Unable to get a valid login hash."
-msgstr "No se pudo un <<hash>> de conexi?n v?lido."
-
 msgid "Password sent"
 msgstr "Contrase?a enviada"
 
@@ -7281,6 +7368,7 @@ msgstr "Establecer su informaci?n de us
 msgid "Set User Info (web)..."
 msgstr "Establecer su informaci?n de usuario (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Cambiar su contrase?a (web)"
 
@@ -7310,6 +7398,10 @@ msgstr "Buscar un amigo a trav?s de su 
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a trav?s de su informaci?n"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "El usuario no est? conectado"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9594,12 +9686,6 @@ msgstr "Dominio de autenticaci?n"
 msgid "Auth Domain"
 msgstr "Dominio de autenticaci?n"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s le ha enviado una invitaci?n para utilizar la webcam, algo a?n no "
-"soportado."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9627,6 +9713,44 @@ msgstr "Se rechaz? la adici?n del amig
 msgid "Add buddy rejected"
 msgstr "Se rechaz? la adici?n del amigo"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Se recibieron datos inv?lidos al conectarse al servidor."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Contrase?a incorrecta"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Error desconocido n?mero %d. Si se conecta al servidor de web de Yahoo! es "
+"posible que ?sto se arregle."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "El usuario no existe"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Error desconocido n?mero %d. Si se conecta al servidor de web de Yahoo! es "
+"posible que ?sto se arregle."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nombre de usuario o contrase?a incorrecta"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9741,8 +9865,8 @@ msgstr "Comenzar una sesi?n de Doodle"
 msgid "Start Doodling"
 msgstr "Comenzar una sesi?n de Doodle"
 
-msgid "Activate which ID?"
-msgstr "?Qu? ID quiere activar?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?Con qui?n quiere juntarse en un chat?"
@@ -10527,16 +10651,17 @@ msgstr "Por favor, actualice los campos 
 msgid "Please update the necessary fields."
 msgstr "Por favor, actualice los campos necesarios."
 
-msgid "Room _List"
-msgstr "_Lista de salas"
+#, fuzzy
+msgid "A_ccount"
+msgstr "_Cuenta:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduzca la informaci?n apropiada del chat al que desear?a unirse.\n"
 
-msgid "_Account:"
-msgstr "_Cuenta:"
+msgid "Room _List"
+msgstr "_Lista de salas"
 
 msgid "_Block"
 msgstr "_Bloquear"
@@ -10974,6 +11099,119 @@ msgstr "/Amigos/Ordenar amigos"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Color del fondo"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Se ha a?adido este grupo a su lista de amigos."
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laosiano"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Color del fondo"
+
+#, fuzzy
+msgid "The background color of an expanded group"
+msgstr "Nombre del color de fondo"
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expandir"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Seleccionar el color de fondo"
+
+#, fuzzy
+msgid "The background color of a collapsed group"
+msgstr "Color de fondo como un GdkColor"
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Contraer"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Seleccionar el color de fondo"
+
+#, fuzzy
+msgid "The background color of a contact or chat"
+msgstr "Color de fondo como un GdkColor"
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Atajo de teclado"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Conectado"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Obtener informaci?n sobre el amigo seleccionado"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Ausente"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Obtener informaci?n sobre el amigo seleccionado"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Desconectado"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Obtener informaci?n sobre el amigo seleccionado"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Inactivo "
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Obtener informaci?n sobre el amigo seleccionado"
+
+msgid "Message Text"
+msgstr "Texto de los mensajes"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Texto de los mensajes"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Cambiar la informaci?n del usuario %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"
@@ -11476,6 +11714,10 @@ msgstr "H?ngaro"
 msgid "Hungarian"
 msgstr "H?ngaro"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumano"
+
 msgid "Indonesian"
 msgstr "Indonesio"
 
@@ -11574,6 +11816,9 @@ msgstr "Sueco"
 msgid "Swedish"
 msgstr "Sueco"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -12004,11 +12249,9 @@ msgstr "Guardar imagen"
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Guardar imagen..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_A?adir emoticonos a medida..."
 
@@ -12098,9 +12341,6 @@ msgstr "Estilo de tipograf?a"
 msgid "Font Face"
 msgstr "Estilo de tipograf?a"
 
-msgid "Background Color"
-msgstr "Color del fondo"
-
 msgid "Foreground Color"
 msgstr "Color del primer plano"
 
@@ -12439,6 +12679,9 @@ msgstr "A qui?n avisar"
 msgid "Pounce on Whom"
 msgstr "A qui?n avisar"
 
+msgid "_Account:"
+msgstr "_Cuenta:"
+
 msgid "_Buddy name:"
 msgstr "Nombre del _amigo:"
 
@@ -12551,9 +12794,18 @@ msgstr "Evento de aviso desconocido. ?P
 msgid "Unknown.... Please report this!"
 msgstr "Evento de aviso desconocido. ?Por favor, informe de esto! "
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Fall? el desempaque de tema de emoticonos"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Fall? el desempaque de tema de emoticonos"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Fall? el desempaque de tema de emoticonos"
+
 msgid "Install Theme"
 msgstr "Instalar tema"
 
@@ -13118,6 +13370,10 @@ msgstr "Gestor de emoticonos a medida"
 msgid "Custom Smiley Manager"
 msgstr "Gestor de emoticonos a medida"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Seleccionar amigo"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Pulse para cambiar el icono de amigo para esta cuenta."
 
@@ -13342,6 +13598,79 @@ msgstr "Muestra informaci?n estad?stic
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Muestra informaci?n estad?stica de la disponibilidad de sus amigos"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Direcci?n del servidor"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Introducir un servidor de conferencias"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Selecciona un servidor de conferencias al que consultar"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Servicios en l?nea"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Enviar lista de amigos"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Se ausenta"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Directorio de registro"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Completado con el tabulador"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Servicio PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descripci?n:</b> Terror?fica"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Informaci?n de descubrimiento de servicio"
+
+msgid "_Browse"
+msgstr "_Navegador"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "El usuario no existe"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "El servidor no soporta bloqueos"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Informaci?n de descubrimiento de servicio"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Este complemento es ?til para depurar clientes o servidores XMPP."
+
 msgid "Buddy is idle"
 msgstr "El amigo est? inactivo"
 
@@ -13860,12 +14189,6 @@ msgstr ""
 "- Env?a un mensaje a las personas en su lista inmediatamente cuando se "
 "conectan"
 
-msgid "Cursor Color"
-msgstr "Color del puntero"
-
-msgid "Secondary Cursor Color"
-msgstr "Color secundario del puntero"
-
 msgid "Hyperlink Color"
 msgstr "Color de hiperenlace"
 
@@ -13875,6 +14198,10 @@ msgstr "Color para mensajes resaltados p
 msgid "Highlighted Message Name Color"
 msgstr "Color para mensajes resaltados por nombre"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Color de notificaci?n de tecleo"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separaci?n horizontal GtkTreeView"
 
@@ -13904,35 +14231,25 @@ msgstr "Tema de atajos de teclado GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atajos de teclado GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Colores de la interfaz"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Activar la notificaci?n de tecleo"
 
-msgid "Widget Sizes"
-msgstr "Tama?o de los controles"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Control de tema GTK+ de Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Color"
+
 msgid "Fonts"
 msgstr "Tipograf?a"
 
+#, fuzzy
+msgid "Miscellaneous"
+msgstr "Error miscel?neo"
+
 msgid "Gtkrc File Tools"
 msgstr "Herramientas de ficheros Gtkrc"
 
@@ -14078,12 +14395,120 @@ msgstr ""
 "Reemplaza el texto de los mensajes salientes seg?n las reglas definidas por "
 "el usuario."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "No ha iniciado sesi?n"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s se ha desconectado."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Unirse a un chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorar"
+
+#, fuzzy
+msgid "Founder"
+msgstr "M?s ruidoso"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Operador IRC"
+
+#, fuzzy
+msgid "Half Operator"
+msgstr "Operador IRC"
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizaci?n otorgada"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informaci?n"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Di?logo de solicitud"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Niveles de aviso"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Estado de %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Localizaci?n de la sala de chat"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Cambiar icono"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Control de tema GTK+ de Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informaci?n del contacto"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin - Lista de amigos"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista de amigos"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Control de tema GTK+ de Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Control de tema GTK+ de Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Deslizante de amigos"
 
@@ -14291,6 +14716,21 @@ msgstr "Este complemento es ?til para d
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es ?til para depurar clientes o servidores XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "?Qu? ID quiere activar?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Color del puntero"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Color secundario del puntero"
+
+#~ msgid "Interface colors"
+#~ msgstr "Colores de la interfaz"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Tama?o de los controles"
+
 #~ msgid "Invite message"
 #~ msgstr "Mensaje de invitacio"
 
@@ -14742,9 +15182,6 @@ msgstr "Este complemento es ?til para d
 #~ "Su solicitud de unirse al grupo %d ha sido aprobada por el administrador %"
 #~ "d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Se ha a?adido este grupo a su lista de amigos."
-
 #~ msgid "I am applying to join"
 #~ msgstr "He solicitado unirme"
 
@@ -14827,9 +15264,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(obteniendo)</i>"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Error al solicitar un testigo de conexi?n"
-
 #~ msgid "TCP Address"
 #~ msgstr "Direcci?n TCP"
 
@@ -14937,9 +15371,6 @@ msgstr "Este complemento es ?til para d
 #~ "sobrenombre se mostrar? en lugar del nombre de usuario siempre que sea "
 #~ "posible.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Cuenta:"
-
 #~ msgid "User has typed something and stopped"
 #~ msgstr "El usuario ha escrito algo y ha parado"
 
@@ -15462,13 +15893,6 @@ msgstr "Este complemento es ?til para d
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Descripci?n:</b> Terror?fica"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15724,9 +16148,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "DBus"
 #~ msgstr "DBus"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s se ha desconectado."
-
 #~ msgid "Buddy icon:"
 #~ msgstr "Icono de amigo:"
 
@@ -15736,15 +16157,9 @@ msgstr "Este complemento es ?til para d
 #~ msgid "Screen Name:"
 #~ msgstr "Nombre de usuario:"
 
-#~ msgid "Background color name"
-#~ msgstr "Nombre del color de fondo"
-
 #~ msgid "Background color as a string"
 #~ msgstr "Cadena del color de fondo"
 
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "Color de fondo como un GdkColor"
-
 #~ msgid "Background set"
 #~ msgstr "Establecer color de fondo"
 
@@ -16220,9 +16635,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "/Tools/A_ccounts"
 #~ msgstr "/Herramientas/_Cuentas"
 
-#~ msgid "Idle "
-#~ msgstr "Inactivo "
-
 #~ msgid "/Tools/Account Actions"
 #~ msgstr "/Herramientas/Acciones de cuentas"
 
@@ -16552,9 +16964,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Enviar un mensaje al amigo seleccionado"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Obtener informaci?n sobre el amigo seleccionado"
-
 #~ msgid "_Chat"
 #~ msgstr "_Charlar"
 
@@ -16771,9 +17180,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "Summary"
 #~ msgstr "Resumen"
 
-#~ msgid "Message Text"
-#~ msgstr "Texto de los mensajes"
-
 #~ msgid "Please create an account."
 #~ msgstr "Por favor, cree una cuenta."
 
@@ -16854,9 +17260,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "Invisible for friends only"
 #~ msgstr "Invisible s?lo para los amigos"
 
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "No se pudo resolver el nombre del servidor."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "Error al escribir al socket."
 
@@ -17128,9 +17531,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "Myanmar"
 #~ msgstr "Myanmar"
 
-#~ msgid "Miscellaneous error"
-#~ msgstr "Error miscel?neo"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr ""
 #~ "Error desconocido cuando se intentaba obtener autorizaci?n del servidor "
@@ -17256,9 +17656,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "User Count:\t\t%d\n"
 #~ msgstr "Cuenta de usuarios:\t\t%d\n"
 
-#~ msgid "_Browse"
-#~ msgstr "_Navegador"
-
 #~ msgid "Show IMs and chats in _same tabbed window"
 #~ msgstr "Mo_strar MIs y chats en la misma ventana con solapas."
 
@@ -17388,9 +17785,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "Use custom si_ze"
 #~ msgstr "Usar _tama?o personalizado"
 
-#~ msgid "Color"
-#~ msgstr "Color"
-
 #~ msgid "Show _URLs as links"
 #~ msgstr "Mostrar _URLs como enlaces"
 
@@ -17421,9 +17815,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "Hide window on _send"
 #~ msgstr "Ocultar la ventana al _enviar"
 
-#~ msgid "Tab Completion"
-#~ msgstr "Completado con el tabulador"
-
 #~ msgid "_Tab-complete nicks"
 #~ msgstr "_Tab completa los apodos"
 
@@ -17860,9 +18251,6 @@ msgstr "Este complemento es ?til para d
 #~ msgid "DCC Chat with %s established"
 #~ msgstr "Chat v?a DCC con %s establecida"
 
-#~ msgid "IRC Operator"
-#~ msgstr "Operador IRC"
-
 #~ msgid "%s is an Identified User"
 #~ msgstr "%s es un usuario identificado"
 
@@ -18066,9 +18454,6 @@ msgstr "Este complemento es ?til para d
 #~ "Permite a?adir salas de chat a su lista de amigos. Pulse el bot?n de "
 #~ "configuraci?n para escoger las salas."
 
-#~ msgid "Pidgin - Buddy Ticker"
-#~ msgstr "Pidgin - Lista de amigos"
-
 #~ msgid "<b>Status:</b> %s%s%s"
 #~ msgstr "<b>Estado:</b> %s%s%s"
 
============================================================
--- po/et.po	185d80b2649801ed705574469aeb38495c7baa6b
+++ po/et.po	4c2fc01dd876cf7632dd8638964e755a1204e731
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-09-30 08:10+0300\n"
 "Last-Translator: Ivar Smolin <okul at linux.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -1758,6 +1758,8 @@ msgstr "+++ %s logis v?lja"
 msgid "+++ %s signed off"
 msgstr "+++ %s logis v?lja"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -2155,6 +2157,10 @@ msgstr "(%s) %s <AUTOMAATVASTUS>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATVASTUS>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Viga ?henduse loomisel"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Sul on kasutusel %s kuid selle plugina jaoks on vajalik %s."
@@ -3130,6 +3136,11 @@ msgstr "Vestluse _nimi:"
 msgid "Chat _name:"
 msgstr "Vestluse _nimi:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Serveriga pole v?imalik ?henduda."
+
 msgid "Chat error"
 msgstr "Viga vestlusel"
 
@@ -3178,6 +3189,10 @@ msgstr "Gadu-Gadu kasutaja"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu kasutaja"
 
+#, fuzzy
+msgid "GG server"
+msgstr "M??ra kasutajateave..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tundmatu k?sk: %s"
@@ -3220,7 +3235,8 @@ msgstr "_Parool:"
 msgid "_Password:"
 msgstr "_Parool:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nimed ei tohi sisaldada t?hje kohti"
 
 #. 1. connect to server
@@ -3675,6 +3691,9 @@ msgstr "Server ei kasuta ?htegi toetatu
 msgid "Server does not use any supported authentication method"
 msgstr "Server ei kasuta ?htegi toetatud autentimismeetodit"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Sa n?uad kr?ptimist aga selles serveris pole see toetatud."
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3945,6 +3964,14 @@ msgstr "Vahend"
 msgid "Resource"
 msgstr "Vahend"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Sisse logitud"
+
 msgid "Middle Name"
 msgstr "Keskmine nimi"
 
@@ -4109,9 +4136,18 @@ msgstr "Otsi jututube"
 msgid "Find Rooms"
 msgstr "Otsi jututube"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Sa n?uad kr?ptimist aga selles serveris pole see toetatud."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Sobivaid kasutajaid ei leitud"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Roll"
+
 msgid "Ping timeout"
 msgstr "Pingimine ?letas ajapiirangu"
 
@@ -4131,7 +4167,7 @@ msgstr "Vigane XMPP ID. Domeen peab olem
 msgstr "Vigane XMPP ID. Domeen peab olema m??ratud."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "T?rge serveriga ?hendumisel."
 
 #, c-format
@@ -4158,9 +4194,6 @@ msgstr "T?rge registreeringu t?histami
 msgid "Unregistration Failed"
 msgstr "T?rge registreeringu t?histamisel"
 
-msgid "Already Registered"
-msgstr "Juba registreeritud"
-
 msgid "State"
 msgstr "Olek"
 
@@ -4173,6 +4206,9 @@ msgstr "Kuup?ev"
 msgid "Date"
 msgstr "Kuup?ev"
 
+msgid "Already Registered"
+msgstr "Juba registreeritud"
+
 msgid "Unregister"
 msgstr "T?hista registreering"
 
@@ -4200,6 +4236,10 @@ msgstr "Registreeringu muutmine"
 msgid "Change Registration"
 msgstr "Registreeringu muutmine"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "T?rge serveriga ?hendumisel."
+
 msgid "Error unregistering account"
 msgstr "Viga konto registreeringu t?histamisel"
 
@@ -4563,13 +4603,14 @@ msgid ""
 msgstr "ban &lt;kasutaja&gt; [p?hjus]:  Kasutaja t?rjumine toast."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;kasutaja&gt; &lt;moderator|participant|visitor|none&gt;: Kasutaja "
 "rolli m??ramine selle ruumi jaoks."
@@ -4633,6 +4674,9 @@ msgstr "Faili?lekande proksid"
 msgid "File transfer proxies"
 msgstr "Faili?lekande proksid"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5035,6 +5079,10 @@ msgstr "Kontakti eemaldamine"
 msgid "Non-IM Contacts"
 msgstr "Kontakti eemaldamine"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
+
 msgid "Nudge"
 msgstr "M?ks"
 
@@ -5376,64 +5424,27 @@ msgstr "Windows Live ID autentimine:Viga
 msgstr "Windows Live ID autentimine:Vigane vastus"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s pole korrektne grupp."
-
-msgid "Unknown error."
-msgstr "Tundmatu viga."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s m?ksas sind!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Tundmatu viga (%d)"
 
 msgid "Unable to add user"
 msgstr "Kasutajat pole v?imalik lisada"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Tundmatu viga (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "J?rgneb sinu otsingu tulemus"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Kasutajat %s ei lisatud, kuna sinu s?branimekiri on t?is."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr "Teenus pole ajutiselt k?ttesaadav."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiilis?numit ei saadetud, kuna see oli liiga pikk."
 
-msgid "Unable to rename group"
-msgstr "Gruppi pole v?imalik ?mber nimetada"
-
-msgid "Unable to delete group"
-msgstr "Gruppi pole v?imalik kustutada"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5511,6 +5522,9 @@ msgstr ""
 "Sinu MSN-i s?branimekiri pole ajutiselt saadaval. Palun oota ja proovi "
 "uuesti."
 
+msgid "Unknown error."
+msgstr "Tundmatu viga."
+
 msgid "Handshaking"
 msgstr "K?epigistus"
 
@@ -5529,6 +5543,14 @@ msgstr "S?branimekirja vastuv?tmine"
 msgid "Retrieving buddy list"
 msgstr "S?branimekirja vastuv?tmine"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
+
 msgid "Away From Computer"
 msgstr "Arvutist eemal"
 
@@ -5568,14 +5590,6 @@ msgstr "S?numit pole v?imlik saata, ku
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "S?numit pole v?imlik saata, kuna leidis aset tundmatu viga:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s lisas sinu oma s?branimekirja."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s eemaldas sinu oma s?branimekirjast."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Lisa aadressiraamatusse"
@@ -5606,6 +5620,51 @@ msgstr "MSN protokolli plugin"
 msgstr "MSN protokolli plugin"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s pole korrektne grupp."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Kasutajat %s ei lisatud, kuna sinu s?branimekiri on t?is."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr "Teenus pole ajutiselt k?ttesaadav."
+
+msgid "Unable to rename group"
+msgstr "Gruppi pole v?imalik ?mber nimetada"
+
+msgid "Unable to delete group"
+msgstr "Gruppi pole v?imalik kustutada"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s lisas sinu oma s?branimekirja."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s eemaldas sinu oma s?branimekirjast."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Sellist kasutajat pole: %s"
 
@@ -5638,6 +5697,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Uued e-posti s?numid"
 
@@ -5688,12 +5749,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "Vigane kasutajanimi v?i parool"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM viga"
 
@@ -6010,9 +6073,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr "Vigane kasutajanimi v?i parool"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Sinu poolt sisestatud kasutajanimest pole v?imalik hosti ?ra tunda"
 
@@ -6226,6 +6286,29 @@ msgstr "Serveri port"
 msgid "Server port"
 msgstr "Serveri port"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Serverist v?eti vastu ootamatu HTTP-vastus."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Sinu ?hendumine ja ?henduse katkestamine toimub liiga sagedasi. Oota 10 "
+"minutit ja proovi siis uuesti. Kui sa aga samamoodi j?tkad, siis pead p?rast "
+"ka kauem ootama."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Viga %s lahendamisel"
+
+msgid "Incorrect password."
+msgstr "Vale parool."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Jututoaga pole v?imalik ?hineda"
 
@@ -6523,14 +6606,31 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr "Pole v?imalik ?henduda"
+
+msgid "Received authorization"
+msgstr "Autoriseerimine vastu v?etud"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Vigane kasutajanimi."
 
-msgid "Incorrect password."
-msgstr "Vale parool."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6539,28 +6639,22 @@ msgstr "AOL'i v?lks?numiserver pole aj
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL'i v?lks?numiserver pole ajutiselt saadaval."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Sinu ?hendumine ja ?henduse katkestamine toimub liiga sagedasi. Oota 10 "
-"minutit ja proovi siis uuesti. Kui sa aga samamoodi j?tkad, siis pead p?rast "
-"ka kauem ootama."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Sinu poolt kasutatava kliendi versioon on liiga vana. Palun hangi uuem "
 "versioon aadressilt %s"
 
-msgid "Could Not Connect"
-msgstr "Pole v?imalik ?henduda"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"Sinu ?hendumine ja ?henduse katkestamine toimub liiga sagedasi. Oota 10 "
+"minutit ja proovi siis uuesti. Kui sa aga samamoodi j?tkad, siis pead p?rast "
+"ka kauem ootama."
 
-msgid "Received authorization"
-msgstr "Autoriseerimine vastu v?etud"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Sisestatud SecurID v?ti on vigane."
 
@@ -6576,20 +6670,6 @@ msgstr "_Olgu"
 msgid "_OK"
 msgstr "_Olgu"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr "Parool saadetud"
 
@@ -7054,6 +7134,7 @@ msgstr "Kasutajate andmete m??ramine (
 msgid "Set User Info (web)..."
 msgstr "Kasutajate andmete m??ramine (veebis)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Muuda parooli (veebis)"
 
@@ -7083,6 +7164,10 @@ msgstr "S?bra otsimine andmete j?rgi"
 msgid "Search for Buddy by Information"
 msgstr "S?bra otsimine andmete j?rgi"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Kasutaja pole sisse logitud"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9343,10 +9428,6 @@ msgstr "Autentimisdomeen"
 msgid "Auth Domain"
 msgstr "Autentimisdomeen"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s saatis sulle veebikaamera kutse, mis pole aga veel toetatud."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9370,6 +9451,42 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Autoriseerimine vastu v?etud"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Vigane parool"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine v?ib selle parandada."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Kasutajat pole olemas"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine v?ib selle parandada."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Vigane kasutajanimi v?i parool"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9471,8 +9588,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "Milline ID aktiveerida?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr ""
@@ -10237,16 +10354,17 @@ msgstr "Palun uuenda tarvilikud v?ljad.
 msgid "Please update the necessary fields."
 msgstr "Palun uuenda tarvilikud v?ljad."
 
-msgid "Room _List"
-msgstr "Tubade _nimekiri"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Palun sisesta teave vestluse kohta, millega soovid ?hineda.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Tubade _nimekiri"
 
 msgid "_Block"
 msgstr "_Bloki"
@@ -10682,6 +10800,111 @@ msgstr "/S?brad/Sordi s?brad"
 msgid "/Buddies/Sort Buddies"
 msgstr "/S?brad/Sordi s?brad"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Taustav?rvus"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Taustav?rvus"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Laien_da"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Taustav?rvuse valimine"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "Ahen_da"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Taustav?rvuse valimine"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Kiirklahv"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?hendatud"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Eemal"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?hendamata"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tujutekst"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Saadetakse s?numit"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Kasutaja %s andmete muutmine"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-serverid"
@@ -11184,6 +11407,10 @@ msgstr "Ungari"
 msgid "Hungarian"
 msgstr "Ungari"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumeenia"
+
 msgid "Indonesian"
 msgstr "Indoneesia"
 
@@ -11282,6 +11509,9 @@ msgstr "Rootsi"
 msgid "Swedish"
 msgstr "Rootsi"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamili"
 
@@ -11705,11 +11935,9 @@ msgstr "Pildi salvestamine"
 msgid "Save Image"
 msgstr "Pildi salvestamine"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Salvesta pilt..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Lisa _kohandatud tujun?gu..."
 
@@ -11795,9 +12023,6 @@ msgstr "Kirjat??p"
 msgid "Font Face"
 msgstr "Kirjat??p"
 
-msgid "Background Color"
-msgstr "Taustav?rvus"
-
 msgid "Foreground Color"
 msgstr "Teksti v?rvus"
 
@@ -12116,6 +12341,9 @@ msgstr "Kellest m?rku antakse"
 msgid "Pounce on Whom"
 msgstr "Kellest m?rku antakse"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "S?bra _nimi:"
 
@@ -12226,9 +12454,18 @@ msgstr "Tundmatu teavituss?ndmus. Palun
 msgid "Unknown.... Please report this!"
 msgstr "Tundmatu teavituss?ndmus. Palun anna sellest teada!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "T?rge tujun?gude teema lahtipakkimisel"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "T?rge tujun?gude teema lahtipakkimisel"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "T?rge tujun?gude teema lahtipakkimisel"
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12788,6 +13025,10 @@ msgstr "Kohandatud tujun?gude haldur"
 msgstr "Kohandatud tujun?gude haldur"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Vali s?ber"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Selle konto jaoks kasutatakse seda s?bra_ikooni:"
 
@@ -13006,6 +13247,77 @@ msgstr "S?prade saadavaloleku kohta sta
 msgid "Displays statistical information about your buddies' availability"
 msgstr "S?prade saadavaloleku kohta statistiliste andmete kuvamine"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Serveri aadress"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Jututoaserveri sisestamine"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Vali konverentsiserver, kuhu p?ring esitada"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "V?rguteenused"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "S?branimekiri"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Eemaldub"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Logikataloog"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Heli valimine"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Kirjeldus"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Teenuse avastamise andmed"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Si_rvija:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Kasutajat pole olemas"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server ei kasuta ?htegi toetatud autentimismeetodit"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Teenuse avastamise andmed"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
+
 msgid "Buddy is idle"
 msgstr "S?ber on j?ude"
 
@@ -13489,12 +13801,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr "Kursori v?rvus"
-
-msgid "Secondary Cursor Color"
-msgstr "Teise kursori v?rvus"
-
 msgid "Hyperlink Color"
 msgstr "H?perviida v?rvus"
 
@@ -13504,6 +13810,10 @@ msgstr "Nime v?rvus esilet?stetud s?n
 msgid "Highlighted Message Name Color"
 msgstr "Nime v?rvus esilet?stetud s?numites"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Tippimism?rguande v?rvus"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GTK puuvaate r?hteraldaja"
 
@@ -13533,35 +13843,24 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Liidese v?rvid"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Tippimism?rguande lubamine"
 
-msgid "Widget Sizes"
-msgstr "Vidinate suurused"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgini GTK+ teemajuhtija"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Sulge"
+
 msgid "Fonts"
 msgstr "Kirjat??bid"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc failit??riistad"
 
@@ -13701,12 +14000,119 @@ msgstr ""
 "Asendab v?ljaminevates s?numites teksti vastavalt kasutaja poolt m??ratud "
 "reeglitele"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Pole sisse logitud"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Pole sisse logitud"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Vestlusega ?hinemine"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Eira"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Valjem"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Volituste andmisest keeldumise s?num:"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Vead"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Andmed"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "P?ringudialoog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Hoiatuste tase"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Olekud"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Jututoa lokaat"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Ikooni salvestamine"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgini GTK+ teemajuhtija"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktandmed"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "S?branimekiri"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "S?branimekiri"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgini GTK+ teemajuhtija"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgini GTK+ teemajuhtija"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "S?bratiksuja"
 
@@ -13911,6 +14317,21 @@ msgstr "See plugin sobib XMPP serverite 
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Milline ID aktiveerida?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kursori v?rvus"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Teise kursori v?rvus"
+
+#~ msgid "Interface colors"
+#~ msgstr "Liidese v?rvid"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Vidinate suurused"
+
 #~ msgid "Invite message"
 #~ msgstr "Kutse s?num"
 
============================================================
--- po/eu.po	75625b80c73f488e730969a57b36ed661f12c337
+++ po/eu.po	6dd0366a0ebcfe5dba9d20a7dbc52f155894700d
@@ -6,7 +6,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2006-05-25 23:48+0200\n"
 "Last-Translator: tamax\n"
 "Language-Team:  <en at li.org>\n"
@@ -1884,6 +1884,8 @@ msgstr "+++%s irten egin da"
 msgid "+++ %s signed off"
 msgstr "+++%s irten egin da"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -2273,6 +2275,10 @@ msgstr "(%s) %s <ERANTZUN AUTOMATIKOA>: 
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ERANTZUN AUTOMATIKOA>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Errorea konexioa sortzean"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3267,6 +3273,11 @@ msgstr "Berreketan _Deitura:"
 msgid "Chat _name:"
 msgstr "Berreketan _Deitura:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Ezin da zerbitzariarekin konektatu."
+
 msgid "Chat error"
 msgstr "Berriketa-errorea"
 
@@ -3315,6 +3326,10 @@ msgstr "Gadu-Gadu erabiltzailea"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu erabiltzailea"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Ezarri erabiltzailearen datuak..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Komando ezezaguna: %s"
@@ -3358,7 +3373,8 @@ msgstr "_Pasahitza:"
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC goitizenek ezin dute zuriunerik eduki"
 
 #. 1. connect to server
@@ -3845,6 +3861,9 @@ msgstr "Zerbitzariak ez du erabiltzen au
 msgid "Server does not use any supported authentication method"
 msgstr "Zerbitzariak ez du erabiltzen autentifikazio-metodo onarturik"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Erronka baliogabea zerbitzaritik"
 
@@ -4146,6 +4165,14 @@ msgstr "Baliabidea"
 msgid "Resource"
 msgstr "Baliabidea"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Konektatuta dago lehendik"
+
 msgid "Middle Name"
 msgstr "Bigarren izena"
 
@@ -4318,10 +4345,19 @@ msgstr "Bilatu gelak"
 msgid "Find Rooms"
 msgstr "Bilatu gelak"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Aliasa:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Ez dira erabiltzailerik aurkitu"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Funtzioa"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Testu arrunta"
 
@@ -4342,7 +4378,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Huts egin du zerbitzariarekin konektatzean."
 
 #, c-format
@@ -4371,9 +4407,6 @@ msgstr "Erregistratzeak huts egin du"
 msgid "Unregistration Failed"
 msgstr "Erregistratzeak huts egin du"
 
-msgid "Already Registered"
-msgstr "Erregistratuta dago"
-
 msgid "State"
 msgstr "Herrialdea"
 
@@ -4386,6 +4419,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Erregistratuta dago"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Erregistratu"
@@ -4418,6 +4454,10 @@ msgstr "Erregistratze-errorea"
 msgstr "Erregistratze-errorea"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Huts egin du zerbitzariarekin konektatzean."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Errorea kontuaren datuak aldatzean"
 
@@ -4795,16 +4835,18 @@ msgstr "ban &lt;erabiltzailea&gt; [gela]
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;erabiltzailea&gt; [gela]:  bota erabiltzailea gela batetik."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "Afiliatu &It; erabiltzaile&gt;&It;jabea| administratzailea|kidea| paria | "
 "ezer ez&gt;: Erabiltzailearen afiliazioa ezarri gelarekiko."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "Zeregin &It;erabiltzaile;&It;moderatzailea| partehartzailea | bisitari | "
 "ezer ez&gt;: Ezarri erabiltzailearen zeregina gelarekiko."
@@ -4877,6 +4919,9 @@ msgstr "Fitxategi-transferentzien ataka"
 msgid "File transfer proxies"
 msgstr "Fitxategi-transferentzien ataka"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5291,6 +5336,10 @@ msgstr "Kendu kontaktua"
 msgid "Non-IM Contacts"
 msgstr "Kendu kontaktua"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5656,65 +5705,28 @@ msgstr "Huts egin du era normalean auten
 msgstr "Huts egin du era normalean autentifikatzean."
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ez da baliozko taldea."
-
-msgid "Unknown error."
-msgstr "Errore ezezaguna."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s: %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s berriki harreta eskaera bidali dizute !"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Errore ezezaguna"
 
 msgid "Unable to add user"
 msgstr "Ezin da erabiltzailea gehitu"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Errore ezezaguna"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Zure bilaketaren ondoriozko emaitzak hauek dira"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Ezin da erabiltzailea gehitu: %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ezin da erabiltzailea blokeatu: %s (%s)."
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Ezin da erabiltzailea baimendu: %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ezin da gehitu lagunen zerrenda beteta daukazulako."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ez da baliozko pasaporte-kontua."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Zerbitzua ez dago erabilgarri une honetan "
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mezua ezin izan da bidali azkarregi bidaltzen ari garelako:"
 
-msgid "Unable to rename group"
-msgstr "Ezin da taldea izenez aldatu"
-
-msgid "Unable to delete group"
-msgstr "Ezin da taldea ezabatu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5802,6 +5814,9 @@ msgstr ""
 "MSN lagunen zerrenda ez dago erabilgarri une honetan. Itxaron, eta saiatu "
 "berriro."
 
+msgid "Unknown error."
+msgstr "Errore ezezaguna."
+
 msgid "Handshaking"
 msgstr "Negoziaketa"
 
@@ -5820,6 +5835,14 @@ msgstr "Lagunen zerrenda eskuratzen"
 msgid "Retrieving buddy list"
 msgstr "Lagunen zerrenda eskuratzen"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Ordenagailutik urrun"
 
@@ -5860,14 +5883,6 @@ msgstr "Mezua ezin izan da bidali errore
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s gehitu zaitut bere lagunen-zerrendara."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ezabatu zaitu bere lagunen-zerrendatik."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Gehitu helbide-liburuan"
@@ -5901,6 +5916,51 @@ msgstr "AIM/ICQ protokoloaren plugin-a"
 msgstr "AIM/ICQ protokoloaren plugin-a"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ez da baliozko taldea."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s: %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Ezin da erabiltzailea gehitu: %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ezin da erabiltzailea blokeatu: %s (%s)."
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Ezin da erabiltzailea baimendu: %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ezin da gehitu lagunen zerrenda beteta daukazulako."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ez da baliozko pasaporte-kontua."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Zerbitzua ez dago erabilgarri une honetan "
+
+msgid "Unable to rename group"
+msgstr "Ezin da taldea izenez aldatu"
+
+msgid "Unable to delete group"
+msgstr "Ezin da taldea ezabatu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s gehitu zaitut bere lagunen-zerrendara."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ezabatu zaitu bere lagunen-zerrendatik."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5935,6 +5995,8 @@ msgstr "Zerbitzaritik deskonektatuta zau
 msgstr "Zerbitzaritik deskonektatuta zaude."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Bidali _mezua"
@@ -5984,12 +6046,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Goitizen edo pasahitz okerra."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6334,10 +6399,6 @@ msgstr "Artxibo nagusia oker konfiguratu
 msgstr "Artxibo nagusia oker konfiguratuta dago"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Goitizen edo pasahitz okerra."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Ezin izan da idatzi duzun ostalariko erabiltzaile-izena ezagutu"
 
@@ -6557,6 +6618,29 @@ msgstr "Zerbitzariaren ataka"
 msgstr "Zerbitzariaren ataka"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Erantzun baliogabea zerbitzaritik."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Maizegi konektatzen eta deskonektatzen aritu zara. Itxaron hamar minutu, eta "
+"saiatu berriro. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
+"duzu."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Errorea konexioa sortzean"
+
+msgid "Incorrect password."
+msgstr "Okerreko pasahitza."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Ezin izan da konektatu"
 
@@ -6860,15 +6944,38 @@ msgstr ""
 "zenbakiak eta zuriuneak bakarrik eduki, edo bestela zenbakiak bakarrik eduki "
 "behar dituzte."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Laster deskonektatuta greatzeko arriskua duzu. TOC erabil dezakezu arazoa "
+"konpondu arte. Bilatu eguneratzeak %s gunean."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin-ek ezin du lortu AIM saio-hasierako hash baliozkorik."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Laster deskonektatuta greatzeko arriskua duzu. TOC erabil dezakezu arazoa "
+"konpondu arte. Bilatu eguneratzeak %s gunean."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin-ek ezin du lortu saio-hasierako hash baliozkorik."
+
+msgid "Could Not Connect"
+msgstr "Ezin izan da konektatu"
+
+msgid "Received authorization"
+msgstr "Baimena jaso da"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Erabiltzaile-izena ez da baliozkoa"
 
-msgid "Incorrect password."
-msgstr "Okerreko pasahitza."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Zure kontua esekita dago une honetan."
@@ -6877,26 +6984,20 @@ msgstr "AOL berehalako mezularitza-zerbi
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL berehalako mezularitza-zerbitzua ez dago erabilgarri une honetan."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Zuk daukazun bezero-bertsioa zaharregia da; bertsio-berritu %s gunean"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Maizegi konektatzen eta deskonektatzen aritu zara. Itxaron hamar minutu, eta "
 "saiatu berriro. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
 "duzu."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Zuk daukazun bezero-bertsioa zaharregia da; bertsio-berritu %s gunean"
-
-msgid "Could Not Connect"
-msgstr "Ezin izan da konektatu"
-
-msgid "Received authorization"
-msgstr "Baimena jaso da"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Sartu duzun SecurID gakoa ez da baliozkoa"
 
@@ -6913,26 +7014,6 @@ msgstr "Ados"
 msgid "_OK"
 msgstr "Ados"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Laster deskonektatuta greatzeko arriskua duzu. TOC erabil dezakezu arazoa "
-"konpondu arte. Bilatu eguneratzeak %s gunean."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin-ek ezin du lortu AIM saio-hasierako hash baliozkorik."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Laster deskonektatuta greatzeko arriskua duzu. TOC erabil dezakezu arazoa "
-"konpondu arte. Bilatu eguneratzeak %s gunean."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin-ek ezin du lortu saio-hasierako hash baliozkorik."
-
 msgid "Password sent"
 msgstr "Pasahitza bidali da"
 
@@ -7466,6 +7547,7 @@ msgstr "Ezarri erabiltzailearen datuak (
 msgid "Set User Info (web)..."
 msgstr "Ezarri erabiltzailearen datuak (URLa)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Aldatu pasahitza (URLa)"
@@ -7500,6 +7582,10 @@ msgstr "Bilatu laguna informazioaren ara
 msgid "Search for Buddy by Information"
 msgstr "Bilatu laguna informazioaren arabera..."
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Erabiltzailea ez dago konektatuta"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9907,10 +9993,6 @@ msgstr "Automatikoa"
 msgid "Auth Domain"
 msgstr "Automatikoa"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9938,6 +10020,44 @@ msgstr "Laguna gehitzea ezetsita"
 msgid "Add buddy rejected"
 msgstr "Laguna gehitzea ezetsita"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Ezin da zerbitzariarekiko SSL konexiorik ezarri."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Okerreko pasahitza."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"%d errore-zenbaki ezezaguna. Yahoo-ren web gunean konektatzeak arazoa konpon "
+"dezake."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Erabiltzailea ez dago"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"%d errore-zenbaki ezezaguna. Yahoo-ren web gunean konektatzeak arazoa konpon "
+"dezake."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Goitizen edo pasahitz okerra."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10051,9 +10171,8 @@ msgstr "Hasi \"Doodling\" "
 msgid "Start Doodling"
 msgstr "Hasi \"Doodling\" "
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Zein ID aktibatu?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Norekin elkartu nahi duzu berriketan?"
@@ -10853,16 +10972,17 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Gelen zerrenda"
+msgid "A_ccount"
+msgstr "Kontua:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Eman sartu nahi duzun berriketari buruzko informazioa.\n"
 
-msgid "_Account:"
-msgstr "K_ontua:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Gelen zerrenda"
 
 msgid "_Block"
 msgstr "Blokeatu "
@@ -11332,6 +11452,113 @@ msgstr "/Lagunak/Lagun Motak"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Lagunak/Lagun Motak"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Atzeko planoko kolorea"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "%s gehitu zaitut bere lagunen-zerrendara."
+
+#, fuzzy
+msgid "Layout"
+msgstr "Saioa hasteko aukerak"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Atzeko planoko kolorea"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Zabaldu"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Hautatu atzeko planoaren kolorea"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Tolestu"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Hautatu atzeko planoaren kolorea"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Ataka"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Linean"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Kanpoan"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Lineaz kanpo"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Umorea"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mezua bidali da"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Aldatu %s erabiltzailearen datuak"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11856,6 +12083,10 @@ msgstr "Hungariera"
 msgstr "Hungariera"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Errumaniera"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Mazedoniera"
 
@@ -11962,6 +12193,9 @@ msgstr "Suediera"
 msgid "Swedish"
 msgstr "Suediera"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -12406,11 +12640,10 @@ msgstr "Gorde irudia"
 msgid "Save Image"
 msgstr "Gorde irudia"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Gorde irudia..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Erakutsi _aurpegiera grafikoak "
 
@@ -12501,10 +12734,6 @@ msgstr "Letra-tipoa"
 msgstr "Letra-tipoa"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Atzeko planoko kolorea"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Aurreko planoko letraren kolorea"
 
@@ -12844,6 +13073,9 @@ msgstr "Alerta nori"
 msgid "Pounce on Whom"
 msgstr "Alerta nori"
 
+msgid "_Account:"
+msgstr "K_ontua:"
+
 msgid "_Buddy name:"
 msgstr "_Lagunaren izena:"
 
@@ -12957,9 +13189,18 @@ msgstr "Alerta emateko gertaera ezezagun
 msgid "Unknown.... Please report this!"
 msgstr "Alerta emateko gertaera ezezaguna. Eman honen berri!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "desenpetatzerakoan huts egin du."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "desenpetatzerakoan huts egin du."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "desenpetatzerakoan huts egin du."
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13550,6 +13791,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Hautatu laguna"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13785,6 +14030,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Zerbitzariaren helbidea"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Sartu konferentzia-zerbitzari bat"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Hautatu konferentzia-zerbitzari bat kontsulta egiteko"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Zerbitzuak linean"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Bidali lagunen zerrenda"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Joanda egoera joan"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Bilatu direktorioa"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Soinua hautatzea"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Azalpena:</b> Beldurgarria"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Ezarri Dir informazioa"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Arakatzailea:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Erabiltzailea ez dago"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Zerbitzariak ez du erabiltzen autentifikazio-metodo onarturik"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Ezarri Dir informazioa"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "Laguna inaktibo dago"
 
@@ -14307,12 +14624,6 @@ msgstr ""
 "- Sarrerako testu guztia alderantzikatzen du\n"
 "- Zure zerrendakoren batek saioa hasten duenean, mezua bidaltzen dio"
 
-msgid "Cursor Color"
-msgstr "Kurtsore kolorea"
-
-msgid "Secondary Cursor Color"
-msgstr "Bigarrengo Kurtsore kolorea"
-
 msgid "Hyperlink Color"
 msgstr "Hiperestekaren kolorea "
 
@@ -14324,6 +14635,10 @@ msgstr "Aurkitutako azpimarratu"
 msgid "Highlighted Message Name Color"
 msgstr "Aurkitutako azpimarratu"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Kendu jakinarazpenak"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView banatzaile horizontala"
 
@@ -14353,35 +14668,24 @@ msgstr "GTK+ Testu ? gaia"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Testu ? gaia"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Koloreen Interfaze"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Mezu berrien jakinarazpenak"
 
-msgid "Widget Sizes"
-msgstr "Widget neurriak"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ Gaien kontrola"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Itxi"
+
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin fitxategien kontrola"
@@ -14530,12 +14834,119 @@ msgstr ""
 "Mezuak bidaltzean testua ordezten du erabiltzaileak sortutako arauei "
 "jarraituz. "
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Ez dago konektatuta"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Ez dago konektatuta"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Sartu berriketa batean"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ez ikusi egin"
+
+#, fuzzy
+msgid "Founder"
+msgstr "ordu"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Baimena eman da"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Errorea"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Laneko datuak"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Eskaera Elkarrizketa"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Abisu-maila"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Egoera : %s rako."
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Berriketarako gela gunea"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Gorde ikonoa"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ Gaien kontrola"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontuari buruzko informazioa"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lagunen zerrenda"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lagunen zerrenda"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ Gaien kontrola"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ Gaien kontrola"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Lagunen korritze-barra"
 
@@ -14750,6 +15161,22 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Zein ID aktibatu?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kurtsore kolorea"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Bigarrengo Kurtsore kolorea"
+
+#~ msgid "Interface colors"
+#~ msgstr "Koloreen Interfaze"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget neurriak"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Txertatu irudia mezuan"
 
@@ -15243,10 +15670,6 @@ msgstr ""
 #~ msgstr "Eraibltzaileak %s(e)n: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "%s gehitu zaitut bere lagunen-zerrendara."
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Errorea fitxategi-eragiketan"
 
@@ -15256,10 +15679,6 @@ msgstr ""
 #~ msgstr "Sartu momentuko lekukoa"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Errorea konexioa sortzean"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Ezin da AIMen sartu"
 
@@ -15381,10 +15800,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_Mezua:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Kontua:"
-
 #~ msgid "DBus"
 #~ msgstr "DBus"
 
@@ -15495,13 +15910,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Azalpena:</b> Beldurgarria"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
============================================================
--- po/fa.po	25e3bfb5f5decc94528bb025c663c4a3728db963
+++ po/fa.po	bf0a0eac9025b5c97003f0ae23a11dcc66e77e4f
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-04-10 20:37+0330\n"
 "Last-Translator: Elnaz Sarbar <elnaz at farsiweb.info>\n"
 "Language-Team: Persian\n"
@@ -1802,6 +1802,8 @@ msgstr "+++ %s ?? ????? ???? 
 msgid "+++ %s signed off"
 msgstr "+++ %s ?? ????? ???? ??"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "???? ???????"
 
@@ -2186,6 +2188,10 @@ msgstr "(%s) %s <???? ??????>:
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <???? ??????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "???? ????? ????? ?????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "??? ?? %s ??????? ???????? ??? ??? ?????????? ?? %s ???? ????."
@@ -3158,6 +3164,11 @@ msgstr "_??? ??:"
 msgid "Chat _name:"
 msgstr "_??? ??:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "????? ??? ?????? ???? ????."
+
 msgid "Chat error"
 msgstr "???? ??"
 
@@ -3206,6 +3217,10 @@ msgstr "????? Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "????? Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "????? ??????? ?????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "????? ???????: %s"
@@ -3248,7 +3263,8 @@ msgstr "_???????:"
 msgid "_Password:"
 msgstr "_???????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "??????? IRC ?????????? ???? ????? ?????"
 
 #. 1. connect to server
@@ -3726,6 +3742,9 @@ msgstr "??????? ?? ??? ??? msgid "Server does not use any supported authentication method"
 msgstr "??????? ?? ??? ??? ????? ???? ???????? ?????? ??????? ???????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "?????? ??????? ?? ??? ???????"
 
@@ -4024,6 +4043,14 @@ msgstr "?????"
 msgid "Resource"
 msgstr "?????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???? ????? ??"
+
 msgid "Middle Name"
 msgstr "??? ???"
 
@@ -4196,10 +4223,19 @@ msgstr "???? ???? ??????? msgid "Find Rooms"
 msgstr "???? ???? ???????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??? ??????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "?????? ?? ??? ?????? ???? ???"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "???"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "??? ????"
 
@@ -4220,7 +4256,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "????? ?? ??????? ???? ????."
 
 #, c-format
@@ -4249,9 +4285,6 @@ msgstr "??? ??? ???? ????"
 msgid "Unregistration Failed"
 msgstr "??? ??? ???? ????"
 
-msgid "Already Registered"
-msgstr "????? ??? ??? ??? ???"
-
 msgid "State"
 msgstr "?????"
 
@@ -4264,6 +4297,9 @@ msgstr "?????"
 msgid "Date"
 msgstr "?????"
 
+msgid "Already Registered"
+msgstr "????? ??? ??? ??? ???"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "???"
@@ -4296,6 +4332,10 @@ msgstr "???? ???"
 msgstr "???? ???"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "????? ?? ??????? ???? ????."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "??? ????? ????? ??????? ????"
 
@@ -4670,16 +4710,18 @@ msgstr "?ban &lt;user&gt; [room]?: ? msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "?ban &lt;user&gt; [room]?: ????? ???? ?????? ?? ????."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ????? ??? "
 "?????? ????? ?? ????."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ????? ??? "
 "????? ?? ????."
@@ -4747,6 +4789,9 @@ msgstr "????? ?????? ????
 msgid "File transfer proxies"
 msgstr "????? ?????? ??????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5156,6 +5201,10 @@ msgstr "??? ??????? ????"
 msgid "Non-IM Contacts"
 msgstr "??? ??????? ????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5513,65 +5562,28 @@ msgstr "????? ???? ???? ?? msgstr "????? ???? ???? ???? ????!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "?%s ???? ?????? ????."
-
-msgid "Unknown error."
-msgstr "???? ???????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "?%s ?? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "?%s ???? ??? ???????? ??????"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "???? ???????"
 
 msgid "Unable to add user"
 msgstr "???????? ????? ?? ????? ???"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "???? ???????"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "????? ?????? ??? ?? ??? ???? ???"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "???????? ????? ?? ?? %s ????? ??? (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "???????? ?? ????? ?? %s ??? ????? ??? (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "???????? ?? ????? ?????? ???? ?? %s ?? ??? (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "????? ???? %s ???? ???? ??? ????? ????? ??? ?? ??? ???."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "?%s ???? passport ?????? ????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "????? ?????? ????? ????."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "???????? ????? ?? ?????? ??? ???? ????? ???????? ???? ???? ???:"
 
-msgid "Unable to rename group"
-msgstr "????? ??? ???? ???? ????"
-
-msgid "Unable to delete group"
-msgstr "??? ???? ???? ????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5655,6 +5667,9 @@ msgstr ""
 "????? ????? MSN ??? ?????? ???? ?????? ????. ????? ?? ?? ??? ??? ?????? ?????? "
 "????."
 
+msgid "Unknown error."
+msgstr "???? ???????."
+
 msgid "Handshaking"
 msgstr "?? ??? ??? ????"
 
@@ -5673,6 +5688,14 @@ msgstr "?? ??? ??????? ??? msgid "Retrieving buddy list"
 msgstr "?? ??? ??????? ????? ????"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "?? ???? ???????? ???? ???"
 
@@ -5709,14 +5732,6 @@ msgstr "???? ??? ????? ??? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "???? ??? ????? ??????? ???? ???? ??? ????? ??????? ?? ???:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "?%s ??? ?? ?? ????? ?????? ????? ???."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "?%s ??? ?? ?? ????? ?????? ??? ???."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "????? ???? ?? ??????? ?????"
@@ -5750,6 +5765,51 @@ msgstr "???? ?????? ?????
 msgstr "???? ?????? ??????? AIM"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "?%s ???? ?????? ????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "?%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "???????? ????? ?? ?? %s ????? ??? (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "???????? ?? ????? ?? %s ??? ????? ??? (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "???????? ?? ????? ?????? ???? ?? %s ?? ??? (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "????? ???? %s ???? ???? ??? ????? ????? ??? ?? ??? ???."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "?%s ???? passport ?????? ????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "????? ?????? ????? ????."
+
+msgid "Unable to rename group"
+msgstr "????? ??? ???? ???? ????"
+
+msgid "Unable to delete group"
+msgstr "??? ???? ???? ????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "?%s ??? ?? ?? ????? ?????? ????? ???."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "?%s ??? ?? ?? ????? ?????? ??? ???."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5786,6 +5846,8 @@ msgstr ""
 "?%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "????? ???? ????"
@@ -5834,12 +5896,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "??? ?? ???????? ??????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6179,10 +6244,6 @@ msgstr "????? ???? ???? ?? msgstr "????? ???? ???? ???????? ???? ???"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "??? ?? ???????? ??????"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "??????? ??????? ??? ????????? ?? ???? ???????? ???? ???"
 
@@ -6396,6 +6457,29 @@ msgstr "????? ???????"
 msgstr "????? ???????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "???????? HTTP ??????? ?? ??????? ?????? ??."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"??? ????? ???? ????? ???? ??? ? ?????? ???????? ?? ??? ????????. ?? ????? ??? "
+"???? ? ??? ?????? ?????? ????. ??? ???? ?? ??????? ????? ???? ???? ????? "
+"???? ????? ????? ??????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "???? ????? ????? ?????"
+
+msgid "Incorrect password."
+msgstr "???????? ??????"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "???? ???"
 
@@ -6699,15 +6783,36 @@ msgstr ""
 "???. ??? ?????? ???? ?? ?? ??? ???? ??? ? ???? ????? ?????? ? ????? ???? ?? "
 "??? ?? ????? ????? ??? ????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"???? ??? ?? ???? ?????? ??? ??? ???. ???? ???? ???????????????? %s ?? ??????."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "???????? ?????? ??????? AIM ?? ????? ???."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"???? ??? ?? ???? ?????? ??? ??? ???. ???? ???? ???????????????? %s ?? ??????."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "?????? ??????? %s ???? ????."
+
+msgid "Could Not Connect"
+msgstr "???????? ???? ??"
+
+msgid "Received authorization"
+msgstr "????? ?????? ??"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "??? ???????"
 
-msgid "Incorrect password."
-msgstr "???????? ??????"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "???? ??? ?? ??? ???? ?? ???? ????? ?? ???? ???."
@@ -6716,26 +6821,20 @@ msgstr "?????????? ?????
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????????? ???????? AOL ?????? ???? ?????? ????."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "????? ??????? ?? ??????? ??????? ???? ????? ???. ????? ?? %s ????? ????"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "??? ????? ???? ????? ???? ??? ? ?????? ???????? ?? ??? ????????. ?? ????? ??? "
 "???? ? ??? ?????? ?????? ????. ??? ???? ?? ??????? ????? ???? ???? ????? "
 "???? ????? ????? ??????."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "????? ??????? ?? ??????? ??????? ???? ????? ???. ????? ?? %s ????? ????"
-
-msgid "Could Not Connect"
-msgstr "???????? ???? ??"
-
-msgid "Received authorization"
-msgstr "????? ?????? ??"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???? SecurID ???? ??? ??????? ???."
 
@@ -6751,24 +6850,6 @@ msgstr "_?????"
 msgid "_OK"
 msgstr "_?????"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"???? ??? ?? ???? ?????? ??? ??? ???. ???? ???? ???????????????? %s ?? ??????."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "???????? ?????? ??????? AIM ?? ????? ???."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"???? ??? ?? ???? ?????? ??? ??? ???. ???? ???? ???????????????? %s ?? ??????."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "?????? ??????? %s ???? ????."
-
 msgid "Password sent"
 msgstr "??????? ??????? ??"
 
@@ -7260,6 +7341,7 @@ msgstr "????? ??????? ???
 msgid "Set User Info (web)..."
 msgstr "????? ??????? ????? (????? ????????)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "????? ??????? (????? ????????)"
@@ -7292,6 +7374,10 @@ msgstr "????? ?? ????? ??? msgstr "????? ?? ????? ???? ?? ??? ???????"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "????? ???? ????? ???? ???"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9629,10 +9715,6 @@ msgstr "????? ???? ?????"
 msgid "Auth Domain"
 msgstr "????? ???? ?????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9659,6 +9741,44 @@ msgstr "????? ???? ???? ?? msgid "Add buddy rejected"
 msgstr "????? ???? ???? ?? ??"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "???????? ???????? ?? ????? ??????? ?????? ??.."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "???????? ??????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"???? ??????? ?? ?????? %d. ???? ?? ?????? Yahoo!? ???? ??? ??? ???? ?? ????? "
+"???."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "????? ???? ?????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"???? ??????? ?? ?????? %d. ???? ?? ?????? Yahoo!? ???? ??? ??? ???? ?? ????? "
+"???."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??? ?? ???????? ??????"
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9770,9 +9890,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "????????? ???? ??????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?????? ?? ?? ?? ???"
@@ -10545,8 +10664,8 @@ msgstr "????? ??????? ???
 msgstr "????? ??????? ???? ?? ???????? ????."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "????? ????"
+msgid "A_ccount"
+msgstr "????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10554,8 +10673,9 @@ msgstr ""
 msgstr ""
 "????? ??????? ????? ?? ??????? ??????? ?? ?????? ?? ?? ???????? ???? ????.\n"
 
-msgid "_Account:"
-msgstr "_????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "????? ????"
 
 msgid "_Block"
 msgstr "_??? ?????"
@@ -11017,6 +11137,120 @@ msgstr "/????/???? ???? ??
 msgid "/Buddies/Sort Buddies"
 msgstr "/????/???? ???? ????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "??? ????????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "???? ???? ?? ????? ????? ??? ????? ??."
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "??? ????????"
+
+#, fuzzy
+msgid "The background color of an expanded group"
+msgstr "??? ????????"
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_??? ????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "?????? ??? ????????"
+
+#, fuzzy
+msgid "The background color of a collapsed group"
+msgstr "??? ????????"
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_??? ????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "?????? ??? ????????"
+
+#, fuzzy
+msgid "The background color of a contact or chat"
+msgstr "??? ????????"
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "????????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "????"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "????? ??????? ??????? ???? ?????? ???"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "????"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "????? ??????? ??????? ???? ?????? ???"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "???????"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "????? ??????? ??????? ???? ?????? ???"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "???? ???"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "????? ??????? ??????? ???? ?????? ???"
+
+msgid "Message Text"
+msgstr "??? ?????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "??? ?????"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "????? ??????? ????? %s"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11525,6 +11759,10 @@ msgstr "?????"
 msgid "Hungarian"
 msgstr "?????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "?????????"
+
 msgid "Indonesian"
 msgstr "??????????"
 
@@ -11627,6 +11865,9 @@ msgstr "?????"
 msgid "Swedish"
 msgstr "?????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "??????"
 
@@ -12066,11 +12307,10 @@ msgstr "?????? ?????"
 msgid "Save Image"
 msgstr "?????? ?????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_?????? ?????..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "????? ????????? ??????"
 
@@ -12163,10 +12403,6 @@ msgstr "??? ???"
 msgstr "??? ???"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "??? ????????"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "??? ??? ?????????"
 
@@ -12515,6 +12751,9 @@ msgstr "???? ????"
 msgid "Pounce on Whom"
 msgstr "???? ????"
 
+msgid "_Account:"
+msgstr "_????:"
+
 msgid "_Buddy name:"
 msgstr "_??? ????:"
 
@@ -12626,9 +12865,18 @@ msgstr "?????? ???? ?????
 msgid "Unknown.... Please report this!"
 msgstr "?????? ???? ???????. ????? ??? ?? ????? ????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "??????? ?? ???????? ?? ???? ???? ????."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "??????? ?? ???????? ?? ???? ???? ????."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "??????? ?? ???????? ?? ???? ???? ????."
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13212,6 +13460,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "?????? ????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13443,6 +13695,79 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "????? ???????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??????? ??????? ?? ???? ????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??????? ???????? ???? ??????? ?????? ????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "????????? ????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "??????? ????? ????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "????? ??? ?????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "?????? ???"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>???:</b> ????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "????? ??????? ??????? ??????? ???????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_??????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "????? ???? ?????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "??????? ?? ??? ??? ????? ???? ???????? ?????? ??????? ???????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "????? ??????? ??????? ??????? ???????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "??? ??????????? ???? ??????????? ???????? ?? ?????????? XMPP ???? ???."
+
 msgid "Buddy is idle"
 msgstr "??????? ?????? ???"
 
@@ -13953,12 +14278,6 @@ msgstr ""
 "- ?? ??? ??? ?? ?? ?? ?? ????? ????? ?? ????? ??? ???? ????? ???? ?????? "
 "??????? ????????"
 
-msgid "Cursor Color"
-msgstr "??? ????????"
-
-msgid "Secondary Cursor Color"
-msgstr "??? ????????? ????"
-
 msgid "Hyperlink Color"
 msgstr "??? ????? ????????"
 
@@ -13970,6 +14289,10 @@ msgstr "?? ??? ???? ??????msgid "Highlighted Message Name Color"
 msgstr "?? ??? ???? ????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "??? ?????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "??????? ???? ???? ????? GTK"
 
@@ -13999,35 +14322,24 @@ msgstr "?? ??????? ???? GT
 msgid "GTK+ Text Shortcut Theme"
 msgstr "?? ??????? ???? GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "??????? ????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "????????? ????? ????"
 
-msgid "Widget Sizes"
-msgstr "??????? ???????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "????? ?? GTK+ ?????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "????"
+
 msgid "Fonts"
 msgstr "??????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -14173,12 +14485,119 @@ msgstr ""
 msgstr ""
 "????????? ??? ?? ????????? ?????? ?? ???? ?? ?????? ????? ??? ???? ?????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???? ????? ???? ???"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ?? ????? ???? ??."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "?????? ?? ??"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?????? ?????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????? ???? ??"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "???"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "???????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "??????? ???????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??? ?????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "????? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "????? ???? ???? ??"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "?????? ?????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "????? ?? GTK+ ?????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "??????? ????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????? ????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????? ????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "????? ?? GTK+ ?????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "????? ?? GTK+ ?????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "???? ????"
 
@@ -14384,6 +14803,22 @@ msgstr "??? ??????????? 
 msgstr "??? ??????????? ???? ??????????? ???????? ?? ?????????? XMPP ???? ???."
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "????????? ???? ??????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "??? ????????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??? ????????? ????"
+
+#~ msgid "Interface colors"
+#~ msgstr "??????? ????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "??????? ???????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "?????? ????"
 
@@ -14907,9 +15342,6 @@ msgstr "??? ??????????? 
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "???? %Id ??????? ??? ?? ???? ?????? ?? ???? %Id ????? ???? ???"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "???? ???? ?? ????? ????? ??? ????? ??."
-
 #~ msgid "I am applying to join"
 #~ msgstr "?? ???? ?????? ??????? ???????"
 
@@ -14934,10 +15366,6 @@ msgstr "??? ??????????? 
 #~ msgid "Enter your reason:"
 #~ msgstr "???????? ?? ???? ????:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "???? ????? ????? ?????"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "???????? ???? ????? ??? ???????? ??????????? ?? ????? ????"
 
@@ -15061,10 +15489,6 @@ msgstr "??? ??????????? 
 #~ msgid "_Merge"
 #~ msgstr "_?????:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "????:"
-
 #~ msgid "Toggle offline buddies"
 #~ msgstr "???? ????? ???????"
 
@@ -15390,13 +15814,6 @@ msgstr "??? ??????????? 
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>???:</b> ????"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15625,25 +16042,14 @@ msgstr "??? ??????????? 
 #~ msgid "g003: Error opening connection.\n"
 #~ msgstr "?g003: ???? ???? ???? ?????.\n"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ?? ????? ???? ??."
-
 #~ msgid "Screen Name:"
 #~ msgstr "??? ??????:"
 
 #, fuzzy
-#~ msgid "Background color name"
-#~ msgstr "??? ????????"
-
-#, fuzzy
 #~ msgid "Background color as a string"
 #~ msgstr "??? ????????"
 
 #, fuzzy
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "??? ????????"
-
-#, fuzzy
 #~ msgid "Background set"
 #~ msgstr "??? ????????"
 
@@ -16001,9 +16407,6 @@ msgstr "??? ??????????? 
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "??????? ????? ?? ???? ?????? ???"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "????? ??????? ??????? ???? ?????? ???"
-
 #~ msgid "_Chat"
 #~ msgstr "_??"
 
@@ -16270,9 +16673,6 @@ msgstr "??? ??????????? 
 #~ msgid "Summary"
 #~ msgstr "?????"
 
-#~ msgid "Message Text"
-#~ msgstr "??? ?????"
-
 #~ msgid "Please create an account."
 #~ msgstr "????? ?? ???? ????? ????."
 
@@ -16348,9 +16748,6 @@ msgstr "??? ??????????? 
 #~ msgid "Invisible for friends only"
 #~ msgstr "?????? ??? ???? ??????"
 
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "????? ??? ?????? ???? ????."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "??? ????? ????? ?? ????."
 
============================================================
--- po/fi.po	3905b9f9fbd25dad453a7d1080c71794bec3873a
+++ po/fi.po	9f3df4e357da0b636ddadde9ed7950ca7b9a0798
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-04-28 16:31+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki at iki.fi>\n"
 "Language-Team: \n"
@@ -1775,6 +1775,8 @@ msgstr "+++ %s kirjautui ulos"
 msgid "+++ %s signed off"
 msgstr "+++ %s kirjautui ulos"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2174,6 +2176,10 @@ msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Virhe luotaessa yhteytt?"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "K?yt?t: %s, mutta t?m? liit?nn?inen vaatii: %s."
@@ -3149,6 +3155,11 @@ msgstr "Keskustelunimi:"
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Ei kyetty selvitt?m??n is?nn?n nime?."
+
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
@@ -3197,6 +3208,10 @@ msgstr "Gadu-Gadu-k?ytt?j?"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-k?ytt?j?"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Haetaan palvelinta"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
@@ -3239,7 +3254,8 @@ msgstr "_Salasana:"
 msgid "_Password:"
 msgstr "_Salasana:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-kutsumanimiss? ei tule olla v?lily?ntej?"
 
 #. 1. connect to server
@@ -3711,6 +3727,9 @@ msgstr "Palvelin ei k?yt? mit??n tue
 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei k?yt? mit??n tuetuista tunnistautumismenetelmist?"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Salausta vaadittu, mutta sit? ei tueta t?ll? palvelimella."
+
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
@@ -3980,6 +3999,14 @@ msgstr "Sijainti"
 msgid "Resource"
 msgstr "Sijainti"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Kirjautumisesta aikaa"
+
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
@@ -4146,9 +4173,18 @@ msgstr "Etsi huoneita"
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Salausta vaadittu, mutta sit? ei tueta t?ll? palvelimella."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Lempinimi:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "K?ytt?jist? ei l?ytynyt osumia"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Asema"
+
 msgid "Ping timeout"
 msgstr "Pingin aikakatkaisu"
 
@@ -4168,7 +4204,7 @@ msgstr "Ep?kelpo XMPP-ID. Verkkoalue pi
 msgstr "Ep?kelpo XMPP-ID. Verkkoalue pit?? olla asetettu."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Palvelimeen ei saatu yhteytt?."
 
 #, c-format
@@ -4195,9 +4231,6 @@ msgstr "Rekister?innin poisto ep?onnis
 msgid "Unregistration Failed"
 msgstr "Rekister?innin poisto ep?onnistui"
 
-msgid "Already Registered"
-msgstr "Valmiiksi rekister?ity"
-
 msgid "State"
 msgstr "L??ni"
 
@@ -4210,6 +4243,9 @@ msgstr "P?iv?ys"
 msgid "Date"
 msgstr "P?iv?ys"
 
+msgid "Already Registered"
+msgstr "Valmiiksi rekister?ity"
+
 msgid "Unregister"
 msgstr "Rekister?innin poisto"
 
@@ -4237,6 +4273,10 @@ msgstr "Muuta rekister?itymist?"
 msgid "Change Registration"
 msgstr "Muuta rekister?itymist?"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Palvelimeen ei saatu yhteytt?."
+
 msgid "Error unregistering account"
 msgstr "Virhe poistettaessa k?ytt?j?tilin rekister?itymist?"
 
@@ -4602,16 +4642,18 @@ msgstr "ban &lt;k?ytt?j?&gt; [syy]: E
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;k?ytt?j?&gt; [syy]: Est? k?ytt?j? huoneesta."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "k?ytt?j?n k?ytt?j?luokka t?lle huoneelle."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "k?ytt?j?n rooli huoneessa."
@@ -4675,6 +4717,9 @@ msgstr "Tiedostonsiirron v?lipalvelimet
 msgid "File transfer proxies"
 msgstr "Tiedostonsiirron v?lipalvelimet"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5070,6 +5115,10 @@ msgstr "Pikaviestitt?m?t yhteystiedot"
 msgid "Non-IM Contacts"
 msgstr "Pikaviestitt?m?t yhteystiedot"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s on l?hett?nyt webkamera-kutsun, mik? ei ole viel? tuettuna."
+
 msgid "Nudge"
 msgstr "T?n?ise"
 
@@ -5413,63 +5462,26 @@ msgstr "Windows Live ID -tunnistautumine
 msgstr "Windows Live ID -tunnistautuminen:Virheellinen vastaus"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ei ole kelvollinen ryhm?."
-
-msgid "Unknown error."
-msgstr "Tuntematon virhe."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s tilill? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "K?ytt?j? %s l?hetti sinulle juuri t?n?isyn!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Tuntematon virhe (%d)"
 
 msgid "Unable to add user"
 msgstr "K?ytt?j?? ei voi lis?t?"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Tuntematon virhe (%d)"
+
 msgid "The following users are missing from your addressbook"
 msgstr "Seuraavat k?ytt?j?t puuttuvat osoitekirjastasi"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "K?ytt?j?? ei voi lis?t? %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ei voi est?? k?ytt?j?? %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "K?ytt?j?? ei voi sallia %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "K?ytt?j?? %s ei voi lis?t? koska tuttavia on liikaa."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ei ole kelvollinen passport-tili"
-
-msgid "Service Temporarily Unavailable."
-msgstr "Palvelu ei tilap?isesti ole k?ytett?viss?."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiiliviesti? ei l?hetetty, koska se on liian pitk?."
 
-msgid "Unable to rename group"
-msgstr "Ryhm?n uudelleen nime?minen ep?onnistui"
-
-msgid "Unable to delete group"
-msgstr "Ryhm?? ei voi poistaa"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5556,6 +5568,9 @@ msgstr "MSN-tuttavia ei v?liaikaisesti 
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "MSN-tuttavia ei v?liaikaisesti voi hakea. Yrit? my?hemmin uudelleen."
 
+msgid "Unknown error."
+msgstr "Tuntematon virhe."
+
 msgid "Handshaking"
 msgstr "K?ttely"
 
@@ -5574,6 +5589,14 @@ msgstr "Noudetaan tuttavia"
 msgid "Retrieving buddy list"
 msgstr "Noudetaan tuttavia"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s on l?hett?nyt webkamera-kutsun, mik? ei ole viel? tuettuna."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s on l?hett?nyt webkamera-kutsun, mik? ei ole viel? tuettuna."
+
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
@@ -5614,14 +5637,6 @@ msgstr "Viesti? ei voi l?hett?? tunt
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Viesti? ei voi l?hett?? tuntemattoman virheen vuoksi:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "K?ytt?j? %s on lis?nnyt sinut tuttaviinsa."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s on poistanut sinut tuttavistaan."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Poista tuttava osoitekirjasta?"
 
@@ -5651,6 +5666,51 @@ msgstr "MSN-yhteysk?yt?nt?liit?nn?i
 msgstr "MSN-yhteysk?yt?nt?liit?nn?inen"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ei ole kelvollinen ryhm?."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s tilill? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "K?ytt?j?? ei voi lis?t? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ei voi est?? k?ytt?j?? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "K?ytt?j?? ei voi sallia %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "K?ytt?j?? %s ei voi lis?t? koska tuttavia on liikaa."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ei ole kelvollinen passport-tili"
+
+msgid "Service Temporarily Unavailable."
+msgstr "Palvelu ei tilap?isesti ole k?ytett?viss?."
+
+msgid "Unable to rename group"
+msgstr "Ryhm?n uudelleen nime?minen ep?onnistui"
+
+msgid "Unable to delete group"
+msgstr "Ryhm?? ei voi poistaa"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "K?ytt?j? %s on lis?nnyt sinut tuttaviinsa."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s on poistanut sinut tuttavistaan."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "K?ytt?j?? ei l?ydy: %s"
 
@@ -5679,6 +5739,8 @@ msgstr "Yhteys palvelimeen katkesi"
 msgstr "Yhteys palvelimeen katkesi"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Uusia viestej? postilaatikossa"
 
@@ -5727,18 +5789,20 @@ msgstr "Yhteysk?yt?nt?virhe, virhekoo
 msgid "Protocol error, code %d: %s"
 msgstr "Yhteysk?yt?nt?virhe, virhekoodi %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Salasanasi on %d merkki?, mik? on enemm?n kuin MySpaceIM:n odottama "
 "suurin mahdollinen %d merkki?. Lyhenn? salasanaasi osoitteessa http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "ja yrit? uudelleen."
 
+msgid "Incorrect username or password"
+msgstr "Virheellinen k?ytt?j?nimi tai salasana"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-virhe"
 
@@ -6054,9 +6118,6 @@ msgstr "P??arkisto on v??rin konfigu
 msgid "Master archive is misconfigured"
 msgstr "P??arkisto on v??rin konfiguroitu"
 
-msgid "Incorrect username or password"
-msgstr "Virheellinen k?ytt?j?nimi tai salasana"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Sy?tetyn k?ytt?j?nimen is?nt?palvelinta ei voi tunnistaa"
 
@@ -6272,6 +6333,29 @@ msgstr "Palvelimen portti"
 msgid "Server port"
 msgstr "Palvelimen portti"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Odottamaton HTTP-vastaus palvelimelta."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Olet ottanut ja katkaissut yhteyden liian tihe?sti. Odota kymmenen minuuttia "
+"ja yrit? uudelleen. Jos jatkat yritt?mist?, joudut odottamaan viel? "
+"pidemp??n."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Virhe pyydett?ess? kirjautumispolettia"
+
+msgid "Incorrect password."
+msgstr "Virheellinen salasana."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Keskusteluhuoneeseen ei voi liitty?"
 
@@ -6576,14 +6660,32 @@ msgstr ""
 "kirjaimella ja sis?lt?? vain kirjaimia, numeroita ja v?lily?ntej?, tai "
 "sis?lt?? vain numeroita."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Yhteytesi saattaa katketa kohta. Jos niin k?y, tarkista p?ivitykset: %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kelvollista AIM-sis??nkirjautumistiivistett? ei saatu."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Yhteytesi saattaa katketa kohta. Tarkista p?ivitykset: %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kelvollista sis??nkirjautumistiivistett? ei saatu."
+
+msgid "Could Not Connect"
+msgstr "Yhteytt? ei voi muodostaa"
+
+msgid "Received authorization"
+msgstr "Saatiin lupa"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Ep?kelpo k?ytt?j?nimi."
 
-msgid "Incorrect password."
-msgstr "Virheellinen salasana."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "K?ytt?j?tilisi palvelu on parhaillaan keskeytetty."
@@ -6592,26 +6694,20 @@ msgstr "AOL-pikaviestipalvelu ei tilap?
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilap?isesti ole k?yt?ss?."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Asiakasohjelmasi versio on liian vanha. P?ivit? osoitteessa %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Olet ottanut ja katkaissut yhteyden liian tihe?sti. Odota kymmenen minuuttia "
 "ja yrit? uudelleen. Jos jatkat yritt?mist?, joudut odottamaan viel? "
 "pidemp??n."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Asiakasohjelmasi versio on liian vanha. P?ivit? osoitteessa %s"
-
-msgid "Could Not Connect"
-msgstr "Yhteytt? ei voi muodostaa"
-
-msgid "Received authorization"
-msgstr "Saatiin lupa"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Sy?tetty SecurID-avain on virheellinen."
 
@@ -6627,21 +6723,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Yhteytesi saattaa katketa kohta. Jos niin k?y, tarkista p?ivitykset: %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kelvollista AIM-sis??nkirjautumistiivistett? ei saatu."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Yhteytesi saattaa katketa kohta. Tarkista p?ivitykset: %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kelvollista sis??nkirjautumistiivistett? ei saatu."
-
 msgid "Password sent"
 msgstr "Salasana l?hetetty"
 
@@ -7145,6 +7226,7 @@ msgstr "Aseta k?ytt?j?tiedot (WWW)...
 msgid "Set User Info (web)..."
 msgstr "Aseta k?ytt?j?tiedot (WWW)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Vaihda salasana (WWW)"
 
@@ -7174,6 +7256,10 @@ msgstr "Etsi tuttavaa tietojen perusteel
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "K?ytt?j? ei ole kirjautuneena sis??n"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9429,10 +9515,6 @@ msgstr "Todennus/verkkoalue"
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s on l?hett?nyt webkamera-kutsun, mik? ei ole viel? tuettuna."
-
 msgid "Your SMS was not delivered"
 msgstr "Tekstiviesti? (SMS) ei v?litetty"
 
@@ -9459,6 +9541,44 @@ msgstr "Tuttavan lis??minen estetty"
 msgid "Add buddy rejected"
 msgstr "Tuttavan lis??minen estetty"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Palvelimeen yhdistett?ess? vastaanotettiin virheellisi? tietoja."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Virheellinen salasana"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
+"korjata t?m?n."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "K?ytt?j?? ei ole"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
+"korjata t?m?n."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Virheellinen k?ytt?j?nimi tai salasana"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9572,8 +9692,8 @@ msgstr "Aloita piirtely"
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-msgid "Activate which ID?"
-msgstr "Mik? tunnus (ID) aktivoidaan?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kenen seuraan liityt??n ryhm?keskustelussa?"
@@ -10358,16 +10478,17 @@ msgstr "P?ivit? tarvittavat kent?t."
 msgid "Please update the necessary fields."
 msgstr "P?ivit? tarvittavat kent?t."
 
-msgid "Room _List"
-msgstr "Huone_luettelo"
+#, fuzzy
+msgid "A_ccount"
+msgstr "_K?ytt?j?tili:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Sy?t? tiedot ryhm?keskustelusta, johon haluaisit liitty?.\n"
 
-msgid "_Account:"
-msgstr "_K?ytt?j?tili:"
+msgid "Room _List"
+msgstr "Huone_luettelo"
 
 msgid "_Block"
 msgstr "_Est?"
@@ -10804,6 +10925,119 @@ msgstr "/Tuttavat/Lajittele tuttavat"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Taustav?ri"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "T?m? ryhm? on lis?tty tuttaviisi"
+
+#, fuzzy
+msgid "Layout"
+msgstr "lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Taustav?ri"
+
+#, fuzzy
+msgid "The background color of an expanded group"
+msgstr "Taustav?rin nimi"
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Laajentajan koko"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Valitse taustav?ri"
+
+#, fuzzy
+msgid "The background color of a collapsed group"
+msgstr "Taustav?ri GdkColor-tyyppisen?"
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Pienenn?"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Valitse taustav?ri"
+
+#, fuzzy
+msgid "The background color of a contact or chat"
+msgstr "Taustav?ri GdkColor-tyyppisen?"
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Oikotien teksti"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Linjoilla"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Hae tietoja valitusta tuttavasta"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Poissa"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Hae tietoja valitusta tuttavasta"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Poissa linjoilta"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Hae tietoja valitusta tuttavasta"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mielialan teksti"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Hae tietoja valitusta tuttavasta"
+
+msgid "Message Text"
+msgstr "Viestin teksti"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Viestin teksti"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Vaihda k?ytt?j?tietoja - %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-palvelimet"
@@ -11300,6 +11534,10 @@ msgstr "unkari"
 msgid "Hungarian"
 msgstr "unkari"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "romania"
+
 msgid "Indonesian"
 msgstr "indonesia"
 
@@ -11396,6 +11634,9 @@ msgstr "ruotsi"
 msgid "Swedish"
 msgstr "ruotsi"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "tamil"
 
@@ -11823,11 +12064,9 @@ msgstr "Tallenna kuva"
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimell?..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Lis?? oma hymi?..."
 
@@ -11916,9 +12155,6 @@ msgstr "Kirjasintyyppi"
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-msgid "Background Color"
-msgstr "Taustav?ri"
-
 msgid "Foreground Color"
 msgstr "Etualav?ri"
 
@@ -12242,6 +12478,9 @@ msgstr "Kenest? ilmoitetaan"
 msgid "Pounce on Whom"
 msgstr "Kenest? ilmoitetaan"
 
+msgid "_Account:"
+msgstr "_K?ytt?j?tili:"
+
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
@@ -12352,9 +12591,18 @@ msgstr "Tuntematon... Raportoi t?st?!"
 msgid "Unknown.... Please report this!"
 msgstr "Tuntematon... Raportoi t?st?!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Hymi?teeman purkaminen ep?onnistui."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Hymi?teeman purkaminen ep?onnistui."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Hymi?teeman purkaminen ep?onnistui."
+
 msgid "Install Theme"
 msgstr "Asenna teema"
 
@@ -12908,6 +13156,10 @@ msgstr "Omien hymi?iden hallinta"
 msgid "Custom Smiley Manager"
 msgstr "Omien hymi?iden hallinta"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Valitse tuttava"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Napsauta muuttaaksesi t?m?n k?ytt?j?tilin tuttavakuvaketta."
 
@@ -13129,6 +13381,82 @@ msgstr "N?ytt?? tilastotietoja tuttav
 msgid "Displays statistical information about your buddies' availability"
 msgstr "N?ytt?? tilastotietoja tuttavien l?sn?olosta"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Palvelimen osoite"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Sy?t? konferenssipalvelin"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Valitse konferenssipalvelin"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online-palvelut"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "L?het? tuttavat"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "poistuu"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Lokihakemisto"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "??nivalinta"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub-palvelu"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Kuvaus:</b> Aavemainen"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Palvelul?yt?tiedot"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Selain:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "K?ytt?j?? ei ole"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Palvelin ei tue est?mist?"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Palvelul?yt?tiedot"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"T?t? liit?nn?ist? voidaan k?ytt?? XMPP-palvelimien tai -asiakasohjelmien "
+"virheenj?ljitykseen."
+
 msgid "Buddy is idle"
 msgstr "Tuttava on jouten"
 
@@ -13631,12 +13959,6 @@ msgstr ""
 "- L?hett?? viestin listalla oleville tuttavillesi aina kun he kirjautuvat "
 "sis??n"
 
-msgid "Cursor Color"
-msgstr "Kohdistimen v?ri"
-
-msgid "Secondary Cursor Color"
-msgstr "Toissijainen kohdistimen v?ri"
-
 msgid "Hyperlink Color"
 msgstr "Hyperlinkin v?ri"
 
@@ -13646,6 +13968,10 @@ msgstr "Korostetun viestin nimen v?ri"
 msgid "Highlighted Message Name Color"
 msgstr "Korostetun viestin nimen v?ri"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Kirjoittamishuomautuksen v?ri"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView - leveyssuuntainen erotus"
 
@@ -13675,35 +14001,24 @@ msgstr "GTK+-tekstioikopolkuteema"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+-tekstioikopolkuteema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "K?ytt?liittym?n v?rit"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Ota kirjoittamishuomautus k?ytt??n"
 
-msgid "Widget Sizes"
-msgstr "S??dinkoot"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+-teemanhallinta"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Sulje"
+
 msgid "Fonts"
 msgstr "Kirjasimet"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-tiedostoty?kalut"
 
@@ -13847,12 +14162,119 @@ msgstr "Korvaa l?hetett?v?n tekstin k
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Korvaa l?hetett?v?n tekstin k?ytt?j?n m??ritelm?n mukaan."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Et ole kirjautunut sis??n."
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s kirjautui ulos."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Liity ryhm?keskusteluun"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "J?t? huomiotta"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??nekk??mpi"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Valtuutus annettu"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Virheet "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Tiedot"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Pyynt?valintaikkuna"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Varoitustaso"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s:n tila"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Keskusteluhuoneen paikallisasetus"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Vaihda kuvake"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+-teemanhallinta"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Yhteystiedot"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Tuttavaluettelon teema"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Tuttavaluettelon teema"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+-teemanhallinta"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+-teemanhallinta"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Rullaava tuttavataulu"
 
@@ -14064,6 +14486,21 @@ msgstr ""
 "T?t? liit?nn?ist? voidaan k?ytt?? XMPP-palvelimien tai -asiakasohjelmien "
 "virheenj?ljitykseen."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Mik? tunnus (ID) aktivoidaan?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kohdistimen v?ri"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Toissijainen kohdistimen v?ri"
+
+#~ msgid "Interface colors"
+#~ msgstr "K?ytt?liittym?n v?rit"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "S??dinkoot"
+
 #~ msgid "Invite message"
 #~ msgstr "Kutsuviesti"
 
@@ -14507,9 +14944,6 @@ msgstr ""
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Pyynt?si liitty? ryhm??n %d hyv?ksyttiin yll?pit?j?n %d toimesta"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "T?m? ryhm? on lis?tty tuttaviisi"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Pyyd?n liittymist?"
 
@@ -14592,9 +15026,6 @@ msgstr ""
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr "<i>(vastaanotetaan)</i>"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Virhe pyydett?ess? kirjautumispolettia"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP-osoite"
 
@@ -14661,9 +15092,6 @@ msgstr ""
 #~ "valita lempinimen tuttavalle. Lempinimi n?ytet??n n?ytt?nimen sijasta "
 #~ "aina kuin mahdollista.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_K?ytt?j?tili:"
-
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
 
@@ -15235,13 +15663,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Kuvaus:</b> Aavemainen"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15638,18 +16059,9 @@ msgstr ""
 #~ msgid "%s went away"
 #~ msgstr "%s on poissa"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s kirjautui ulos."
-
-#~ msgid "Background color name"
-#~ msgstr "Taustav?rin nimi"
-
 #~ msgid "Background color as a string"
 #~ msgstr "Taustav?ri merkkijonona"
 
-#~ msgid "Background color as a GdkColor"
-#~ msgstr "Taustav?ri GdkColor-tyyppisen?"
-
 #~ msgid "Background set"
 #~ msgstr "Taustav?ri asetettu"
 
@@ -16031,9 +16443,6 @@ msgstr ""
 #~ msgid "Show transfer details"
 #~ msgstr "N?yt? tiedostonsiirron yksityiskohdat"
 
-#~ msgid "Expander Size"
-#~ msgstr "Laajentajan koko"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Laajennusnuolen koko"
 
@@ -16345,9 +16754,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "L?het? viesti valitulle tuttavalle"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Hae tietoja valitusta tuttavasta"
-
 #~ msgid "_Chat"
 #~ msgstr "_Keskustelu"
 
@@ -16506,9 +16912,6 @@ msgstr ""
 #~ msgid "New conversation _placement:"
 #~ msgstr "Uusi keskustelu_asetettelu:"
 
-#~ msgid "Message Text"
-#~ msgstr "Viestin teksti"
-
 #~ msgid "Please create an account."
 #~ msgstr "Luo uusi k?ytt?j?tili"
 
@@ -16580,9 +16983,6 @@ msgstr ""
 #~ msgid "Invisible for friends only"
 #~ msgstr "N?kym?t?n vain yst?ville"
 
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "Ei kyetty selvitt?m??n is?nn?n nime?."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "Virhe kirjoitettaessa socketiin."
 
============================================================
--- po/fr.po	a525ad86fe67d5b9b7d145b0246a8a2878c0f85a
+++ po/fr.po	686055193df3ba4d5b8486b00d5d1e48724c25ae
@@ -21,7 +21,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-23 01:25+0100\n"
 "Last-Translator: ?ric Boumaour <zongo_fr at users.sourceforge.net>\n"
 "Language-Team: fr <fr at li.org>\n"
@@ -1792,6 +1792,8 @@ msgstr "+++ %s a quitt?"
 msgid "+++ %s signed off"
 msgstr "+++ %s a quitt?"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -2198,6 +2200,10 @@ msgstr "(%s) %s <R?ponse automatique> 
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <R?ponse automatique> : %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Erreur ? l'ouverture de la connexion"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Vous utilisez %s, mais ce plugin a besoin de %s."
@@ -3184,6 +3190,11 @@ msgstr "_Nom de la discussion :"
 msgid "Chat _name:"
 msgstr "_Nom de la discussion :"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Impossible de se connecter au serveur"
+
 msgid "Chat error"
 msgstr "Erreur de discussion"
 
@@ -3232,6 +3243,10 @@ msgstr "Utilisateur Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Utilisateur Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "R?cup?ration du serveur"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Commande inconnue : %s"
@@ -3274,7 +3289,8 @@ msgstr "Mot de _passe :"
 msgid "_Password:"
 msgstr "Mot de _passe :"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Les pseudonymes IRC ne doivent pas avoir d'espace"
 
 #. 1. connect to server
@@ -3758,6 +3774,10 @@ msgstr "Le serveur utilise une m?thode 
 msgid "Server does not use any supported authentication method"
 msgstr "Le serveur utilise une m?thode d'authentification non support?e"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"Vous voulez un chiffrement, mais il n'est pas disponible sur ce serveur."
+
 msgid "Invalid challenge from server"
 msgstr "Demande d'acc?s non valide du serveur"
 
@@ -4028,6 +4048,14 @@ msgstr "Ressource"
 msgid "Resource"
 msgstr "Ressource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Connect?"
+
 msgid "Middle Name"
 msgstr "Deuxi?me pr?nom"
 
@@ -4197,10 +4225,18 @@ msgstr "Chercher un salon de discussions
 msgid "Find Rooms"
 msgstr "Chercher un salon de discussions"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-"Vous voulez un chiffrement, mais il n'est pas disponible sur ce serveur."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias :"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Aucun utilisateur correspondant trouv?."
+
+#, fuzzy
+msgid "Roles:"
+msgstr "R?le"
+
 msgid "Ping timeout"
 msgstr "Pas de r?ponse au ping"
 
@@ -4220,7 +4256,7 @@ msgstr "Identifiant XMPP non valide. Le 
 msgstr "Identifiant XMPP non valide. Le domaine doit ?tre saisi."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Impossible de se connecter au serveur."
 
 #, c-format
@@ -4247,9 +4283,6 @@ msgstr "?chec ? la d?sinscription"
 msgid "Unregistration Failed"
 msgstr "?chec ? la d?sinscription"
 
-msgid "Already Registered"
-msgstr "D?j? enregistr?"
-
 msgid "State"
 msgstr "?tat"
 
@@ -4262,6 +4295,9 @@ msgstr "Date"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "D?j? enregistr?"
+
 msgid "Unregister"
 msgstr "Se d?sinscrire"
 
@@ -4293,6 +4329,10 @@ msgstr "Changer l'enregistrement"
 msgid "Change Registration"
 msgstr "Changer l'enregistrement"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Impossible de se connecter au serveur."
+
 msgid "Error unregistering account"
 msgstr "Erreur ? la d?sinscription du compte"
 
@@ -4659,16 +4699,18 @@ msgstr "ban &lt;utilisateur&gt; [salon]? msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;utilisateur&gt; [salon] : Bannir un utilisateur d'un salon"
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;utilisateur&gt; &lt;owner|admin|member|outcast|none&gt; : "
 "Change l'affiliation d'un utilisateur dans le salon."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;utilisateur&gt; &lt;moderator|participant|visitor|none&gt; : "
 "Assigne ? un utilisateur un r?le dans le salon."
@@ -4733,6 +4775,9 @@ msgstr "Serveur mandataire de transfert 
 msgid "File transfer proxies"
 msgstr "Serveur mandataire de transfert de fichiers"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5135,6 +5180,11 @@ msgstr "Contacts non instantan?s"
 msgid "Non-IM Contacts"
 msgstr "Contacts non instantan?s"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s vous a envoy? une invitation webcam, ce qui n'est pas encore support?."
+
 msgid "Nudge"
 msgstr "Nudge"
 
@@ -5480,63 +5530,26 @@ msgstr "Authentification Windows Live ID
 msgstr "Authentification Windows Live ID : r?ponse non valide."
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s n'est pas un nom de groupe valide"
-
-msgid "Unknown error."
-msgstr "Erreur inconnue"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s pour %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vient de vous envoyer un << Nudge. >>"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Erreur inconnue (%d)"
 
 msgid "Unable to add user"
 msgstr "Impossible d'ajouter un utilisateur"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Les utilisateurs suivants manquent dans votre carnet d'adresse"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Impossible d'ajouter l'utilisateur ? la liste de %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Erreur inconnue (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Impossible de bloquer l'utilisateur pour %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "Les utilisateurs suivants manquent dans votre carnet d'adresse"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Impossible d'autoriser l'utilisateur pour %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Liste de contacts pleine. Impossible d'ajouter %s."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s n'est pas un compte passeport valide."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Service temporairement indisponible."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Le message mobile n'a pas ?t? envoy? parce qu'il est trop long."
 
-msgid "Unable to rename group"
-msgstr "Impossible de renommer le groupe"
-
-msgid "Unable to delete group"
-msgstr "Impossible de supprimer le groupe"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5627,6 +5640,9 @@ msgstr ""
 "Votre liste de contacts MSN n'est pas disponible pour l'instant. Veuillez "
 "attendre un peu puis r?essayer."
 
+msgid "Unknown error."
+msgstr "Erreur inconnue"
+
 msgid "Handshaking"
 msgstr "Poign?e de main"
 
@@ -5645,6 +5661,16 @@ msgstr "R?cup?ration de la liste de co
 msgid "Retrieving buddy list"
 msgstr "R?cup?ration de la liste de contacts"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s vous a envoy? une invitation webcam, ce qui n'est pas encore support?."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s vous a envoy? une invitation webcam, ce qui n'est pas encore support?."
+
 msgid "Away From Computer"
 msgstr "Absent"
 
@@ -5687,14 +5713,6 @@ msgstr "Impossible d'envoyer le message 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Impossible d'envoyer le message ? cause d'une erreur inconnue :"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "L'utilisateur %s vous a ajout? ? sa liste de contacts."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "L'utilisateur %s vous a supprim? de sa liste de contacts."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Supprimer le contact du carnet d'adresses ?"
 
@@ -5724,6 +5742,51 @@ msgstr "Plugin pour le protocole MSN"
 msgstr "Plugin pour le protocole MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s n'est pas un nom de groupe valide"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s pour %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Impossible d'ajouter l'utilisateur ? la liste de %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Impossible de bloquer l'utilisateur pour %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Impossible d'autoriser l'utilisateur pour %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Liste de contacts pleine. Impossible d'ajouter %s."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s n'est pas un compte passeport valide."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Service temporairement indisponible."
+
+msgid "Unable to rename group"
+msgstr "Impossible de renommer le groupe"
+
+msgid "Unable to delete group"
+msgstr "Impossible de supprimer le groupe"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "L'utilisateur %s vous a ajout? ? sa liste de contacts."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "L'utilisateur %s vous a supprim? de sa liste de contacts."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Utilisateur inconnu : %s"
 
@@ -5754,6 +5817,8 @@ msgstr "Connexion perdue avec le serveur
 msgstr "Connexion perdue avec le serveur"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nouveaux courrier ?lectroniques"
 
@@ -5802,18 +5867,20 @@ msgstr "Erreur de protocole, code %d : 
 msgid "Protocol error, code %d: %s"
 msgstr "Erreur de protocole, code %d : %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s, votre mot de passe fait %d caract?res, ce qui est sup?rieur ? la "
 "longueur maximale de %d attendue par MySpaceIM. Veuillez raccourcir votre "
 "mot de passe ? http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword puis r?essayer."
 
+msgid "Incorrect username or password"
+msgstr "Nom d'utilisateur ou mot de passe incorrect"
+
 msgid "MySpaceIM Error"
 msgstr "Erreur MySpaceIM"
 
@@ -6129,9 +6196,6 @@ msgstr "L'archive principale est mal con
 msgid "Master archive is misconfigured"
 msgstr "L'archive principale est mal configur?e"
 
-msgid "Incorrect username or password"
-msgstr "Nom d'utilisateur ou mot de passe incorrect"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Impossible de reconna?tre le nom d'h?te ou d'utilisateur saisi"
 
@@ -6350,6 +6414,29 @@ msgstr "Port du serveur"
 msgid "Server port"
 msgstr "Port du serveur"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "R?ception d'un message HTTP non attendu du serveur."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Vous vous ?tes connect?/d?connect? trop rapidement. Attendez 10 minutes et "
+"r?essayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
+"longtemps."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Erreur ? la r?solution du nom %s."
+
+msgid "Incorrect password."
+msgstr "Mot de passe incorrect."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Impossible de rejoindre le salon de discussions"
 
@@ -6654,14 +6741,34 @@ msgstr ""
 "une lettre et contenir uniquement des lettres, des chiffres et des espaces, "
 "soit contenir uniquement des chiffres."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Vous risquez d'?tre d?connect? sous peu. Si c'est le cas, consultez %s pour "
+"plus d'informations."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Impossible de r?cup?rer un code de connexion AIM valide."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Vous risquez ?tre d?connect? sous peu. Consultez %s pour plus d'informations."
+
+msgid "Unable to get a valid login hash."
+msgstr "Impossible de r?cup?rer un code de connexion valide."
+
+msgid "Could Not Connect"
+msgstr "Impossible de se connecter."
+
+msgid "Received authorization"
+msgstr "Autorisation re?ue."
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Nom d'utilisateur non valide."
 
-msgid "Incorrect password."
-msgstr "Mot de passe incorrect."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Votre compte est actuellement suspendu."
@@ -6670,28 +6777,22 @@ msgstr "Le service est temporairement in
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Vous vous ?tes connect?/d?connect? trop rapidement. Attendez 10 minutes et "
-"r?essayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
-"longtemps."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La version du client que vous utilisez est trop ancienne. Veuillez la mettre "
 "? jour sur %s."
 
-msgid "Could Not Connect"
-msgstr "Impossible de se connecter."
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"Vous vous ?tes connect?/d?connect? trop rapidement. Attendez 10 minutes et "
+"r?essayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
+"longtemps."
 
-msgid "Received authorization"
-msgstr "Autorisation re?ue."
-
 msgid "The SecurID key entered is invalid."
 msgstr "La cl? SecurID saisie est non valide."
 
@@ -6707,23 +6808,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Vous risquez d'?tre d?connect? sous peu. Si c'est le cas, consultez %s pour "
-"plus d'informations."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Impossible de r?cup?rer un code de connexion AIM valide."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Vous risquez ?tre d?connect? sous peu. Consultez %s pour plus d'informations."
-
-msgid "Unable to get a valid login hash."
-msgstr "Impossible de r?cup?rer un code de connexion valide."
-
 msgid "Password sent"
 msgstr "Mot de passe envoy?"
 
@@ -7245,6 +7329,7 @@ msgstr "Modifier les informations (web).
 msgid "Set User Info (web)..."
 msgstr "Modifier les informations (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Changer de mot de passe (web)"
 
@@ -7274,6 +7359,10 @@ msgstr "Chercher d'apr?s les informatio
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'apr?s les informations..."
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Utilisateur non connect?"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9546,11 +9635,6 @@ msgstr "Domaine d'authentification"
 msgid "Auth Domain"
 msgstr "Domaine d'authentification"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s vous a envoy? une invitation webcam, ce qui n'est pas encore support?."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9578,6 +9662,44 @@ msgstr "Ajout du contact refus?"
 msgid "Add buddy rejected"
 msgstr "Ajout du contact refus?"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Donn?es non valides re?ues sur la connexion du serveur."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Mot de passe incorrect."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Erreur inconnue n?%d. Se connecter sur le site web Yahoo! peut corriger le "
+"probl?me."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Cet utilisateur n'existe pas"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Erreur inconnue n?%d. Se connecter sur le site web Yahoo! peut corriger le "
+"probl?me."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nom d'utilisateur ou mot de passe incorrect"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9693,8 +9815,8 @@ msgstr "Commencer ? griffonner"
 msgid "Start Doodling"
 msgstr "Commencer ? griffonner"
 
-msgid "Activate which ID?"
-msgstr "Activer quelle identit? ?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Qui rejoindre dans une discussion ?"
@@ -10490,8 +10612,9 @@ msgstr "Veuillez mettre ? jour les rubr
 msgid "Please update the necessary fields."
 msgstr "Veuillez mettre ? jour les rubriques n?cessaires."
 
-msgid "Room _List"
-msgstr "_Liste des salons de discussions"
+#, fuzzy
+msgid "A_ccount"
+msgstr "_Compte :"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10500,8 +10623,8 @@ msgstr ""
 "Saisissez les informations sur le salon de discussions que vous voulez "
 "rejoindre.\n"
 
-msgid "_Account:"
-msgstr "C_ompte :"
+msgid "Room _List"
+msgstr "_Liste des salons de discussions"
 
 msgid "_Block"
 msgstr "_Bloquer"
@@ -10941,6 +11064,111 @@ msgstr "/Contacts/Trier les contacts"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacts/Trier les contacts"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Couleur de fond"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Couleur de fond"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Etendre"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Changer la couleur du fond"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "Re_plier"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Changer la couleur du fond"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Raccourci"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "En ligne"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Absent"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "D?connect?"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Texte d'humeur"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Envoi d'un message"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Changer les informations pour %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Serveurs SSL"
@@ -11444,6 +11672,10 @@ msgstr "Hongrois"
 msgid "Hungarian"
 msgstr "Hongrois"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Roumain"
+
 msgid "Indonesian"
 msgstr "Indon?sien"
 
@@ -11541,6 +11773,9 @@ msgstr "Su?dois"
 msgid "Swedish"
 msgstr "Su?dois"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamoul"
 
@@ -11976,11 +12211,9 @@ msgstr "Enregistrer l'image"
 msgid "Save Image"
 msgstr "Enregistrer l'image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Enregi_strer l'image..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Ajouter une frimousse personnalis?e..."
 
@@ -12070,9 +12303,6 @@ msgstr "Type de police"
 msgid "Font Face"
 msgstr "Type de police"
 
-msgid "Background Color"
-msgstr "Couleur de fond"
-
 msgid "Foreground Color"
 msgstr "Couleur du texte"
 
@@ -12408,6 +12638,9 @@ msgstr "Alerte sur"
 msgid "Pounce on Whom"
 msgstr "Alerte sur"
 
+msgid "_Account:"
+msgstr "C_ompte :"
+
 msgid "_Buddy name:"
 msgstr "_Contact :"
 
@@ -12518,9 +12751,18 @@ msgstr "?v?nement d'alerte inconnu. Ve
 msgid "Unknown.... Please report this!"
 msgstr "?v?nement d'alerte inconnu. Veuillez reporter cette erreur."
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Le th?me de frimousses n'a pas pu ?tre d?ball?."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Le th?me de frimousses n'a pas pu ?tre d?ball?."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Le th?me de frimousses n'a pas pu ?tre d?ball?."
+
 msgid "Install Theme"
 msgstr "Installer un th?me"
 
@@ -13083,6 +13325,10 @@ msgstr "Gestionnaire de frimousses perso
 msgid "Custom Smiley Manager"
 msgstr "Gestionnaire de frimousses personnalis?e"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Choisir contact"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Cliquer pour changer votre ic?ne pour ce compte."
 
@@ -13307,6 +13553,78 @@ msgstr "Affiche des statistiques sur la 
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Affiche des statistiques sur la disponibilit? de vos contacts"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "H?te du serveur"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Rejoindre un serveur de conf?rences"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Choisissez un serveur de conf?rences"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Services en ligne"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Envoyer sa liste de contacts"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "S'absente"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Dossier des archives"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Choix des sons"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Service PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Description"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Informations du service de d?couverte"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Navigateur :"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Cet utilisateur n'existe pas"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Le serveur ne supporte pas le blocage"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Informations du service de d?couverte"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Ce plugin est utile pour d?bugger les clients ou serveurs XMPP."
+
 msgid "Buddy is idle"
 msgstr "L'utilisateur est inactif"
 
@@ -13826,12 +14144,6 @@ msgstr ""
 "- il ?crit ? l'envers tous les messages re?us\n"
 "- il envoie automatiquement un message ? tous les contacts qui se connectent"
 
-msgid "Cursor Color"
-msgstr "Couleur du curseur"
-
-msgid "Secondary Cursor Color"
-msgstr "Deuxi?me couleur du curseur"
-
 msgid "Hyperlink Color"
 msgstr "Couleur des liens hypertextes"
 
@@ -13841,6 +14153,10 @@ msgstr "Nom de la couleur des messages e
 msgid "Highlighted Message Name Color"
 msgstr "Nom de la couleur des messages en surbrillance"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Couleur de la notification de saisie"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "S?paration horizontale GtkTreeView"
 
@@ -13870,35 +14186,24 @@ msgstr "Raccourci du th?me GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Raccourci du th?me GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Couleurs de l'interface"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Activer la notification de saise"
 
-msgid "Widget Sizes"
-msgstr "Tailles des ?l?ments"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Contr?le Pidgin du th?me GTK+"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Fermer"
+
 msgid "Fonts"
 msgstr "Polices"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Outils du fichier Gtkrc"
 
@@ -14040,12 +14345,119 @@ msgstr ""
 "Remplace le texte dans les messages envoy?s gr?ce ? des r?gles de "
 "substitution."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Non connect?"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Non connect?"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Rejoindre une discussion"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorer"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Tr?s fort"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Op?ra"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorisation donn?e"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Erreur "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informations"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Boite de message pour requ?te"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Niveau d'avertissement"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "?tat pour %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Langue du salon de discussions"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Changer l'ic?ne"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Contr?le Pidgin du th?me GTK+"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Infos du contact"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Liste de contacts"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Liste de contacts"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Contr?le Pidgin du th?me GTK+"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Contr?le Pidgin du th?me GTK+"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "D?filement des contacts"
 
@@ -14250,6 +14662,21 @@ msgstr "Ce plugin est utile pour d?bugg
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ce plugin est utile pour d?bugger les clients ou serveurs XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Activer quelle identit? ?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Couleur du curseur"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Deuxi?me couleur du curseur"
+
+#~ msgid "Interface colors"
+#~ msgstr "Couleurs de l'interface"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Tailles des ?l?ments"
+
 #~ msgid "Invite message"
 #~ msgstr "Message d'invitation"
 
@@ -14452,9 +14879,6 @@ msgstr "Ce plugin est utile pour d?bugg
 #~ "connexion non crypt?e. Voulez-vous autoriser ceci et continuer "
 #~ "l'authentification ?"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Compte :"
-
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Alerter uniquement quand mon ?tat est non disponible"
 
============================================================
--- po/ga.po	4add1c8e0a666c8d3edf0ea58883630353f8422b
+++ po/ga.po	ce4b191f2f75d67df167ebe5894e1c92c37cfe21
@@ -2,7 +2,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-08-27 16:26-0800\n"
 "Last-Translator: Aaron Kearns <ajkearns6 at gmail.com>\n"
 "Language-Team: \n"
@@ -1701,6 +1701,8 @@ msgstr ""
 msgid "+++ %s signed off"
 msgstr ""
 
+#. Unknown error
+#. Unknown error!
 #, fuzzy
 msgid "Unknown error"
 msgstr "Earraidh gan aithne"
@@ -2070,6 +2072,9 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+msgid "Error creating conference."
+msgstr ""
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3004,6 +3009,11 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "N? f?idir an comhad a oscailt."
+
 msgid "Chat error"
 msgstr ""
 
@@ -3053,6 +3063,10 @@ msgstr "Gadu-Gadu ?s?ideoir"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ?s?ideoir"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Nasc di?ltaithe"
+
 #, fuzzy, c-format
 msgid "Unknown command: %s"
 msgstr "ord? anaithnid: `%c'"
@@ -3096,7 +3110,7 @@ msgstr "_Pasfhocal:"
 msgid "_Password:"
 msgstr "_Pasfhocal:"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3527,6 +3541,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3796,6 +3813,14 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Log?ilte isteach!\n"
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3965,9 +3990,18 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Ailias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "N?l fuaim"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Post"
+
 msgid "Ping timeout"
 msgstr ""
 
@@ -3987,7 +4021,7 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr ""
 
 #, c-format
@@ -4014,9 +4048,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 #, fuzzy
 msgid "State"
 msgstr "St?t"
@@ -4031,6 +4062,9 @@ msgstr "D?ta"
 msgid "Date"
 msgstr "D?ta"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -4058,6 +4092,9 @@ msgstr ""
 msgid "Change Registration"
 msgstr ""
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4425,13 +4462,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4491,6 +4528,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4879,6 +4919,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5224,64 +5268,26 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
+msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#, fuzzy
-msgid "Unknown error."
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Earr?id anaithnid=(%d)\n"
 
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ar %s (%s)"
-
-#, c-format
-msgid "%s just sent you a Nudge!"
+msgid "Unable to add user"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
 msgid "Unknown error (%d)"
 msgstr "Earr?id anaithnid=(%d)\n"
 
-msgid "Unable to add user"
-msgstr ""
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5353,6 +5359,10 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Unknown error."
+msgstr "Earr?id anaithnid=(%d)\n"
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5371,6 +5381,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5407,14 +5425,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 msgid "Delete Buddy from Address Book?"
 msgstr ""
 
@@ -5443,6 +5453,51 @@ msgstr "MSN Pr?tacal Breise?n"
 msgid "MSN Protocol Plugin"
 msgstr "MSN Pr?tacal Breise?n"
 
+#, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ar %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "No such user: %s"
 msgstr "%s: N?l a leith?id d'?s?ideoir ann"
@@ -5473,6 +5528,8 @@ msgstr "Cailleadh an nasc le \"%s\"."
 msgstr "Cailleadh an nasc le \"%s\"."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr ""
 
@@ -5519,12 +5576,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr ""
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -5839,9 +5898,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6041,6 +6097,26 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "earr?id agus ag l?amh %s"
+
+#, fuzzy
+msgid "Incorrect password."
+msgstr "pasfhocal m?cheart"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6328,15 +6404,31 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect password."
-msgstr "pasfhocal m?cheart"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6345,23 +6437,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr ""
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6377,20 +6462,6 @@ msgstr "_Ceart go Leor"
 msgid "_OK"
 msgstr "_Ceart go Leor"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6836,6 +6907,7 @@ msgstr ""
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr ""
 
@@ -6865,6 +6937,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9079,10 +9154,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9106,6 +9177,37 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "pasfhocal m?cheart"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "N?l ?s?ideoir '%s' ar bith ann."
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "earr?id agus ag l?amh %s"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9206,7 +9308,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9952,16 +10054,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr ""
 
-msgid "Room _List"
-msgstr ""
+#, fuzzy
+msgid "A_ccount"
+msgstr "Cuntas"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "_Cuntas:"
+msgid "Room _List"
+msgstr ""
 
 msgid "_Block"
 msgstr "_Cuireann bac"
@@ -10384,6 +10487,108 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Dath C?lra"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "L??is"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Dath C?lra"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Cuir dath c?lra"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Cuir dath c?lra"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+msgid "Contact Text"
+msgstr ""
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Gn?th-Th?acs"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Shi?l"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Gn?th-Th?acs"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "D?omhaoin"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Sc?al"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Servers"
@@ -10899,6 +11104,10 @@ msgstr "Ung?iris"
 msgid "Hungarian"
 msgstr "Ung?iris"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "R?m?inis"
+
 msgid "Indonesian"
 msgstr "Indin?isis"
 
@@ -10997,6 +11206,9 @@ msgstr "Sualainnis"
 msgid "Swedish"
 msgstr "Sualainnis"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamailis"
 
@@ -11389,11 +11601,9 @@ msgstr "S?bh?il an ?omha"
 msgid "Save Image"
 msgstr "S?bh?il an ?omha"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_S?bh?il ?omh?..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11481,10 +11691,6 @@ msgstr "Cl?fhoireann"
 msgid "Font Face"
 msgstr "Cl?fhoireann"
 
-#, fuzzy
-msgid "Background Color"
-msgstr "Dath C?lra"
-
 msgid "Foreground Color"
 msgstr "Dath an Tulra"
 
@@ -11785,6 +11991,9 @@ msgstr ""
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_Cuntas:"
+
 msgid "_Buddy name:"
 msgstr ""
 
@@ -11895,9 +12104,15 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12453,6 +12668,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Roghnaigh Cl?..."
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12664,6 +12883,68 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "?ontr?il Pasfhocal"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Liosta Cara"
+
+msgid "Gateway"
+msgstr ""
+
+#, fuzzy
+msgid "Directory"
+msgstr "cruthaitheoir"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Tuarascail"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Brabhs?la?:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "N?l ?s?ideoir '%s' ar bith ann."
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13139,12 +13420,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13154,6 +13429,9 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13184,35 +13462,22 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+msgid "Disable Typing Notification Text"
 msgstr ""
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "D?n"
+
 msgid "Fonts"
 msgstr "Cl?fhoireann"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13348,12 +13613,112 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Log?ilte isteach!\n"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr ""
+
+#, fuzzy
+msgid "Ignored"
+msgstr "D?an neamhshuim"
+
+#, fuzzy
+msgid "Founder"
+msgstr "N?os Airde"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?daraigh cara?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Earraidh"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Eolas"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Rabhadh"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "St?das le %s"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Athraigh focal faire"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "Ceangal"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Liosta Cara"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Liosta Cara"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -13576,10 +13941,6 @@ msgstr ""
 #~ msgstr "Luas:"
 
 #, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "earr?id agus ag l?amh %s"
-
-#, fuzzy
 #~ msgid "QQ Budy"
 #~ msgstr "Cara"
 
============================================================
--- po/gl.po	c4c40d23f286b4bf00db56404c12f3ae880f5526
+++ po/gl.po	825d66703861c1c54244a87ce8e388ea848e60aa
@@ -9,7 +9,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-12-15 13:44+0100\n"
 "Last-Translator: Frco. Javier Rial Rodr?guez <fjrial at cesga.es>\n"
 "Language-Team: Galego <g11n at mancomun.org>\n"
@@ -1780,6 +1780,8 @@ msgstr "+++ %s desconectouse"
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectouse"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Erro desco?ecido"
 
@@ -2186,6 +2188,10 @@ msgstr "(%s) %s <RESPOSTA AUTOM?TICA>: 
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOM?TICA>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Erro ao crear a conexi?n"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Esta a empregar %s, mais este complemento precisa %s."
@@ -3172,6 +3178,11 @@ msgstr "_Nome da conversa:"
 msgid "Chat _name:"
 msgstr "_Nome da conversa:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Non se puido conectar ao servidor."
+
 msgid "Chat error"
 msgstr "Erro da conversa"
 
@@ -3220,6 +3231,10 @@ msgstr "Usuario de Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "A obter o servidor"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desco?ecido: %s"
@@ -3262,7 +3277,8 @@ msgstr "_Contrasinal:"
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Os alias de IRC non poden conter espazos en branco"
 
 #. 1. connect to server
@@ -3740,6 +3756,10 @@ msgstr "O servidor non usa ning?n m?to
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor non usa ning?n m?todo de autenticaci?n co?ecido"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"Vostede solicitou a codificaci?n, mais non est? dispo??bel neste servidor."
+
 msgid "Invalid challenge from server"
 msgstr "O desaf?o do servidor non ? v?lido."
 
@@ -4010,6 +4030,14 @@ msgstr "Recurso"
 msgid "Resource"
 msgstr "Recurso"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Con sesi?n iniciada"
+
 msgid "Middle Name"
 msgstr "Segundo nome"
 
@@ -4177,10 +4205,18 @@ msgstr "Buscar salas"
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-"Vostede solicitou a codificaci?n, mais non est? dispo??bel neste servidor."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Non se encontrou usuarios coincidentes"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Papel"
+
 msgid "Ping timeout"
 msgstr "Excedeuse o tempo de espera do ping"
 
@@ -4200,7 +4236,7 @@ msgstr "ID de XMPP non v?lido. D?bese 
 msgstr "ID de XMPP non v?lido. D?bese definir o dominio."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Fallou ao conectar ao servidor."
 
 #, c-format
@@ -4227,9 +4263,6 @@ msgstr "Fallou a cancelaci?n do rexistr
 msgid "Unregistration Failed"
 msgstr "Fallou a cancelaci?n do rexistro"
 
-msgid "Already Registered"
-msgstr "Xa est? rexistrado"
-
 msgid "State"
 msgstr "Estado"
 
@@ -4242,6 +4275,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Xa est? rexistrado"
+
 msgid "Unregister"
 msgstr "Cancelar o rexistro"
 
@@ -4272,6 +4308,10 @@ msgstr "Modificar rexistro"
 msgid "Change Registration"
 msgstr "Modificar rexistro"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Fallou ao conectar ao servidor."
+
 msgid "Error unregistering account"
 msgstr "Erro ao cancelar o rexistro de conta"
 
@@ -4638,16 +4678,18 @@ msgstr "ban &lt;usuario&gt; [sala]: Excl
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]: Exclu?r un usuario da sala."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: Definir a "
 "afiliaci?n dun usuario coa sala."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir o "
 "papel dun usuario na sala."
@@ -4713,6 +4755,9 @@ msgstr "Proxies de transferencia de fich
 msgid "File transfer proxies"
 msgstr "Proxies de transferencia de ficheiros"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5112,6 +5157,10 @@ msgstr "Contactos non MI"
 msgid "Non-IM Contacts"
 msgstr "Contactos non MI"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s enviou unconvite de c?mara web, mais a?nda non est? soportada."
+
 msgid "Nudge"
 msgstr "Chamar a atenci?n"
 
@@ -5459,63 +5508,26 @@ msgstr "Autenticaci?n do Windows Live I
 msgstr "Autenticaci?n do Windows Live ID: resposta non v?lida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s non ? un grupo v?lido."
-
-msgid "Unknown error."
-msgstr "Erro desco?ecido."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s en %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ac?balle de dar un cobadazo!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Erro desco?ecido (%d)"
 
 msgid "Unable to add user"
 msgstr "Non ? pos?bel engadir o usuario"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Os seguintes usuarios faltan da s?a axenda de enderezos"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Non ? pos?bel engadir o usuario a %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Erro desco?ecido (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Non ? pos?bel bloquear o usuario en %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "Os seguintes usuarios faltan da s?a axenda de enderezos"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Non ? pos?bel permitir o usuario en %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Non se puido engadir a %s porque a s?a lista de contactos est? chea."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s non ? un nome v?lido de conta passport."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Servizo non dispo??bel temporalmente."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Non se puido enviar a mensaxe porque era demasiado longa."
 
-msgid "Unable to rename group"
-msgstr "Non ? pos?bel renomear o grupo"
-
-msgid "Unable to delete group"
-msgstr "Non ? pos?bel eliminar o grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5608,6 +5620,9 @@ msgstr ""
 "A lista de contactos MSN non est? dispo??bel temporalmente. Agarde e volva "
 "tentalo m?is tarde."
 
+msgid "Unknown error."
+msgstr "Erro desco?ecido."
+
 msgid "Handshaking"
 msgstr "Negociaci?n"
 
@@ -5626,6 +5641,14 @@ msgstr "Recuperando a lista de contactos
 msgid "Retrieving buddy list"
 msgstr "Recuperando a lista de contactos"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s enviou unconvite de c?mara web, mais a?nda non est? soportada."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s enviou unconvite de c?mara web, mais a?nda non est? soportada."
+
 msgid "Away From Computer"
 msgstr "Ausente do computador"
 
@@ -5670,14 +5693,6 @@ msgstr "Non se puido enviar a mensaxe po
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro desco?ecido:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "O usuario %s engadiuno ? s?a lista de contactos."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "O usuario %s eliminouno da s?a lista de contactos."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Eliminar o contacto da s?a axenda de enderezos?"
 
@@ -5707,6 +5722,51 @@ msgstr "Complemento de protocolo MSN"
 msgstr "Complemento de protocolo MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s non ? un grupo v?lido."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s en %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Non ? pos?bel engadir o usuario a %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Non ? pos?bel bloquear o usuario en %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Non ? pos?bel permitir o usuario en %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Non se puido engadir a %s porque a s?a lista de contactos est? chea."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s non ? un nome v?lido de conta passport."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servizo non dispo??bel temporalmente."
+
+msgid "Unable to rename group"
+msgstr "Non ? pos?bel renomear o grupo"
+
+msgid "Unable to delete group"
+msgstr "Non ? pos?bel eliminar o grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "O usuario %s engadiuno ? s?a lista de contactos."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "O usuario %s eliminouno da s?a lista de contactos."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Non existe ese usuario: %s"
 
@@ -5735,6 +5795,8 @@ msgstr "Perdeuse a conexi?n co servidor
 msgstr "Perdeuse a conexi?n co servidor"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Novas mensaxes de correo"
 
@@ -5783,18 +5845,20 @@ msgstr "Erro de protocolo, c?digo %d: %
 msgid "Protocol error, code %d: %s"
 msgstr "Erro de protocolo, c?digo %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s O seu contrasinal ten %d caracteres, maior do que a lonxitude m?xima de %"
 "d para o MySpaceIM. Faga a s?a conta m?is curta en http://profileedit."
 "myspace.com/index.cfm?fuseaction=accountSettings.changePassword e t?nteo de "
 "novo."
 
+msgid "Incorrect username or password"
+msgstr "O nome de conta ou contrasinal non ? correcto"
+
 msgid "MySpaceIM Error"
 msgstr "Erro do MySpaceIM"
 
@@ -6111,9 +6175,6 @@ msgstr "O arquivo mestre non est? ben c
 msgid "Master archive is misconfigured"
 msgstr "O arquivo mestre non est? ben configurado"
 
-msgid "Incorrect username or password"
-msgstr "O nome de conta ou contrasinal non ? correcto"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Non se reco?eceu o host do nome de usuario que introduciu"
 
@@ -6333,6 +6394,28 @@ msgstr "Porto do servidor"
 msgid "Server port"
 msgstr "Porto do servidor"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Recibiuse unha resposta HTTP inesperada do servidor."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Conectouse e desconectouse demasiadas veces. Agarde dez minutos e int?nteo "
+"de novo. Se segue a intentalo pode que precise agardar a?nda m?is tempo."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Erro ao resolver %s"
+
+msgid "Incorrect password."
+msgstr "Contrasinal incorrecto."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Non se puido unir ? sala de conversa"
 
@@ -6636,14 +6719,31 @@ msgstr ""
 "de correo electr?nico v?lida ou comezar cunha letra e conter s? letras, "
 "n?meros e espazos, ou conter s? n?meros."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizaci?ns."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Non se puido obter un hash de inicio de sesi?n AIM v?lido."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizaci?ns."
+
+msgid "Unable to get a valid login hash."
+msgstr "Non se puido obter un hash de inicio de sesi?n v?lido."
+
+msgid "Could Not Connect"
+msgstr "Non se puido conectar"
+
+msgid "Received authorization"
+msgstr "Recibiuse a autorizaci?n"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Nome de usuario non v?lido."
 
-msgid "Incorrect password."
-msgstr "Contrasinal incorrecto."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "A conta est? actualmente deshabilitada."
@@ -6653,25 +6753,19 @@ msgstr ""
 msgstr ""
 "O servizo de mensaxer?a instant?nea AOL non est? dispo??bel temporalmente."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "A versi?n do cliente que usa ? demasiado antiga. Actual?zea en %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e int?nteo "
 "de novo. Se segue a intentalo pode que precise agardar a?nda m?is tempo."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "A versi?n do cliente que usa ? demasiado antiga. Actual?zea en %s"
-
-msgid "Could Not Connect"
-msgstr "Non se puido conectar"
-
-msgid "Received authorization"
-msgstr "Recibiuse a autorizaci?n"
-
 msgid "The SecurID key entered is invalid."
 msgstr "A chave SecurID que se introduciu non ? v?lida."
 
@@ -6687,20 +6781,6 @@ msgstr "_Aceptar"
 msgid "_OK"
 msgstr "_Aceptar"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizaci?ns."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Non se puido obter un hash de inicio de sesi?n AIM v?lido."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizaci?ns."
-
-msgid "Unable to get a valid login hash."
-msgstr "Non se puido obter un hash de inicio de sesi?n v?lido."
-
 msgid "Password sent"
 msgstr "Contrasinal enviado"
 
@@ -7214,6 +7294,7 @@ msgstr "Editar a informaci?n de usuario
 msgid "Set User Info (web)..."
 msgstr "Editar a informaci?n de usuario (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Modificar contrasinal (web)"
 
@@ -7243,6 +7324,10 @@ msgstr "Localizar un contacto pola s?a 
 msgid "Search for Buddy by Information"
 msgstr "Localizar un contacto pola s?a informaci?n"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "O usuario non est? conectado"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9525,10 +9610,6 @@ msgstr "Dominio de autenticaci?n"
 msgid "Auth Domain"
 msgstr "Dominio de autenticaci?n"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s enviou unconvite de c?mara web, mais a?nda non est? soportada."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9556,6 +9637,44 @@ msgstr "Rexeitouse engadir o contacto"
 msgid "Add buddy rejected"
 msgstr "Rexeitouse engadir o contacto"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Recib?ronse datos non v?lidos na conexi?n co servidor."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Contrasinal incorrecto"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Erro desco?ecido n?mero %d. Se inicia sesi?n no sitio web de Yahoo! ? "
+"pos?bel que isto se arranxe."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "O usuario non existe"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Erro desco?ecido n?mero %d. Se inicia sesi?n no sitio web de Yahoo! ? "
+"pos?bel que isto se arranxe."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "O nome de conta ou contrasinal non ? correcto"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9669,8 +9788,8 @@ msgstr "Comezar o Doodle"
 msgid "Start Doodling"
 msgstr "Comezar o Doodle"
 
-msgid "Activate which ID?"
-msgstr "Que ID quere activar?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "A quen quere unir ? conversa?"
@@ -10462,8 +10581,9 @@ msgstr "Actualice os campos necesarios."
 msgid "Please update the necessary fields."
 msgstr "Actualice os campos necesarios."
 
-msgid "Room _List"
-msgstr "_Lista de salas"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Conta"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10471,8 +10591,8 @@ msgstr ""
 msgstr ""
 "Introduza a informaci?n apropiada da conversa ? que desexar?a unirse.\n"
 
-msgid "_Account:"
-msgstr "_Conta:"
+msgid "Room _List"
+msgstr "_Lista de salas"
 
 msgid "_Block"
 msgstr "_Bloquear"
@@ -10913,6 +11033,111 @@ msgstr "/Contactos/Ordenar contactos"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contactos/Ordenar contactos"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Cor do fondo"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Cor do fondo"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expandir"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Seleccionar a cor do fondo"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Contraer"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Seleccionar a cor do fondo"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Atallo"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Conectado"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Ausente"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Desconectado"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Texto de estado de ?nimo"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mensaxe enviada"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Modificar a informaci?n de usuario para %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"
@@ -11416,6 +11641,10 @@ msgstr "H?ngaro"
 msgid "Hungarian"
 msgstr "H?ngaro"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Roman?s"
+
 msgid "Indonesian"
 msgstr "Indonesio"
 
@@ -11514,6 +11743,9 @@ msgstr "Sueco"
 msgid "Swedish"
 msgstr "Sueco"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11941,11 +12173,9 @@ msgstr "Gardar imaxe"
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Gardar a imaxe..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Eng_adir emoticonas personalizadas..."
 
@@ -12035,9 +12265,6 @@ msgstr "Estilo do tipo de letra"
 msgid "Font Face"
 msgstr "Estilo do tipo de letra"
 
-msgid "Background Color"
-msgstr "Cor do fondo"
-
 msgid "Foreground Color"
 msgstr "Cor de primeiro plano"
 
@@ -12369,6 +12596,9 @@ msgstr "A quen avisar"
 msgid "Pounce on Whom"
 msgstr "A quen avisar"
 
+msgid "_Account:"
+msgstr "_Conta:"
+
 msgid "_Buddy name:"
 msgstr "Nome do _contacto:"
 
@@ -12479,9 +12709,18 @@ msgstr "Evento de aviso desco?ecido. In
 msgid "Unknown.... Please report this!"
 msgstr "Evento de aviso desco?ecido. Informe disto!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Fallou o desempaquetado do tema de emoticonas."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Fallou o desempaquetado do tema de emoticonas."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Fallou o desempaquetado do tema de emoticonas."
+
 msgid "Install Theme"
 msgstr "Instalar tema"
 
@@ -13044,6 +13283,10 @@ msgstr "Xestor de emoticonas personaliza
 msgid "Custom Smiley Manager"
 msgstr "Xestor de emoticonas personalizadas"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Seleccionar contacto"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Prema para cambiar a s?a icona de contacto para esta conta."
 
@@ -13268,6 +13511,78 @@ msgstr ""
 msgstr ""
 "Mostra informaci?n estat?stica sobre a dispo?ibilidade dos seus contactos"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Enderezo do servidor"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Introduza un servidor de conferencias"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Seleccione un servidor de conferencias ao que consultar"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Servizos en li?a"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Enviar lista de contactos"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Est? ausente"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Directorio de rexistro"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Selecci?n de son"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Servizo PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Descrici?n"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Informaci?n de descubrimento de servizo"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Navegador:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "O usuario non existe"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "O servidor non usa ning?n m?todo de autenticaci?n co?ecido"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Informaci?n de descubrimento de servizo"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Este complemento ? ?til para depurar servidores XMPP ou clientes."
+
 msgid "Buddy is idle"
 msgstr "O contacto est? inactivo"
 
@@ -13774,12 +14089,6 @@ msgstr ""
 "- Transp?n os textos que lle env?en\n"
 "- Env?a inmediatamente unha mensaxe ?s persoas da s?a lista cando se conectan"
 
-msgid "Cursor Color"
-msgstr "Cor do cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Cor secundaria do cursor"
-
 msgid "Hyperlink Color"
 msgstr "Cor da ligaz?n"
 
@@ -13789,6 +14098,10 @@ msgstr "Cor do nome para a mensaxe realz
 msgid "Highlighted Message Name Color"
 msgstr "Cor do nome para a mensaxe realzada"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Eliminaci?n da notificaci?n de escritura"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separaci?n horizontal de GtkTreeView"
 
@@ -13818,35 +14131,24 @@ msgstr "Tema de atallo de texto GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atallo de texto GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Cores da interface"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Activar a notificaci?n de escritura"
 
-msgid "Widget Sizes"
-msgstr "Tama?o dos widget"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Control de temas GTK+ de Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Pechar"
+
 msgid "Fonts"
 msgstr "Tipos de letra"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Ferramentas de ficheiros Gtkrc"
 
@@ -13990,12 +14292,119 @@ msgstr ""
 "Substit?e o texto das mensaxes sa?ntes segundo as regras definidas polo "
 "usuario."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Non iniciou a sesi?n"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Non iniciou a sesi?n"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Unirse a unha conversa"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorar"
+
+#, fuzzy
+msgid "Founder"
+msgstr "M?is ruidoso"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizaci?n concedida"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Erro "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informaci?n"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Di?logo de solicitude"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Nivel de aviso"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Estado para %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Localizaci?n da sala de conversa"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Cambiar icona"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Control de temas GTK+ de Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informaci?n do contacto"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lista de contactos"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista de contactos"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Control de temas GTK+ de Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Control de temas GTK+ de Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Monitor de contactos"
 
@@ -14201,6 +14610,21 @@ msgstr "Este complemento ? ?til para d
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento ? ?til para depurar servidores XMPP ou clientes."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Que ID quere activar?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Cor do cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Cor secundaria do cursor"
+
+#~ msgid "Interface colors"
+#~ msgstr "Cores da interface"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Tama?o dos widget"
+
 #~ msgid "Invite message"
 #~ msgstr "Mensaxe de convite"
 
============================================================
--- po/gu.po	d9876553cf7d84afdd380972b78b498071db3e82
+++ po/gu.po	a230674da75c27c551b8d9535780a95e0a486664
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin_gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2006-07-03 11:31+0530\n"
 "Last-Translator: Ankit Patel <ankit644 at yahoo.com>\n"
 "Language-Team: Gujarati <indianoss-gujarati at lists.sourceforge.net>\n"
@@ -1872,6 +1872,8 @@ msgstr "%s ?????? ????msgid "+++ %s signed off"
 msgstr "%s ?????? ???? ????? ???"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "?????? ?????"
 
@@ -2260,6 +2262,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "????? ????????? ?????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3255,6 +3261,11 @@ msgstr "????? ??? (_n):"
 msgid "Chat _name:"
 msgstr "????? ??? (_n):"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "??????? ???? ??????? ??????"
+
 msgid "Chat error"
 msgstr "????? ?????"
 
@@ -3306,6 +3317,10 @@ msgstr "???-??? ????
 msgid "Gadu-Gadu User"
 msgstr "???-??? ??????????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "?????????? ??? ??????? ???..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?????? ????: %s"
@@ -3349,7 +3364,8 @@ msgstr "??????? (_P):"
 msgid "_Password:"
 msgstr "??????? (_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ???? ???? ???? ?????? ????? ??? ????"
 
 #. 1. connect to server
@@ -3830,6 +3846,9 @@ msgstr "????? ????? 
 msgid "Server does not use any supported authentication method"
 msgstr "????? ????? ??????? ?????????? ?????? ??????? ???"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "?????????? ?????? ???"
 
@@ -4129,6 +4148,14 @@ msgstr "?????"
 msgid "Resource"
 msgstr "?????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?????? ???? ?????"
+
 msgid "Middle Name"
 msgstr "???? ???"
 
@@ -4299,10 +4326,19 @@ msgstr "????? ????"
 msgid "Find Rooms"
 msgstr "????? ????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "??? ??? ????? ???"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??????"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "????? ????"
 
@@ -4323,7 +4359,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "????? ???? ????????? ??????."
 
 #, c-format
@@ -4352,9 +4388,6 @@ msgstr "??????????? msgid "Unregistration Failed"
 msgstr "??????????? ??????"
 
-msgid "Already Registered"
-msgstr "??????? ? ?????? ?????? ??"
-
 msgid "State"
 msgstr "??????"
 
@@ -4368,6 +4401,9 @@ msgstr "?????"
 msgid "Date"
 msgstr "?????"
 
+msgid "Already Registered"
+msgstr "??????? ? ?????? ?????? ??"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "???????"
@@ -4400,6 +4436,10 @@ msgstr "??????????? msgstr "??????????? ?????"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "????? ???? ????????? ??????."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "???? ??????? ???????? ?????"
 
@@ -4776,17 +4816,18 @@ msgstr "ban &lt;user&gt; [room]:  ??
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  ???????????? ??????? ??? ??? ??."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ????????????? "
 "???? ??????? ????? ??????? ??."
 
 #, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ????????????? "
 "???? ??????? ????? ??????? ??."
@@ -4855,6 +4896,9 @@ msgstr "???? ?????? 
 msgid "File transfer proxies"
 msgstr "???? ?????? ?????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5266,6 +5310,10 @@ msgstr "?????? ??? ?
 msgid "Non-IM Contacts"
 msgstr "?????? ??? ???"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5654,67 +5702,29 @@ msgstr "??????? ????msgstr "??????? ?????????? ??????!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ? ????? ??? ???."
-
-msgid "Unknown error."
-msgstr "?????? ?????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ? %s (%s) ??"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ? ???? ???? ?????!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "?????? ?????"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "?????????? %s ?? ??? ??????? ??????"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "?????? ?????"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "???? ????? ?????? ??????? ??"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) ?? ?????????? ????????? ??????"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) ?? ?????????? ?????????? ??????"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) ?? ???????????? ??????? ??????? ??????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ????? ?????? ???? ???? ?? ????? ??????? ???? ????? ??."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ? ????? ???????? ????? ???."
-
 #, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "???? ????? ???? ??????? ???"
-
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "?????????? ?????? ?????? ????? ?????? ????? ????? ????:"
 
-msgid "Unable to rename group"
-msgstr "?????? ??? ????????? ??????"
-
-msgid "Unable to delete group"
-msgstr "??? ???? ????????? ??????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5801,6 +5811,9 @@ msgstr ""
 "????? MSN ??????? ???? ??????? ???? ?????? ???. ???????? ????? ??? ??? ??? ????? "
 "??????? ???."
 
+msgid "Unknown error."
+msgstr "?????? ?????."
+
 msgid "Handshaking"
 msgstr "Handshaking"
 
@@ -5819,6 +5832,14 @@ msgstr "??????? ????msgid "Retrieving buddy list"
 msgstr "??????? ???? ????? ????? ???"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "??????????? ???"
 
@@ -5856,14 +5877,6 @@ msgstr "?????? ?????msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????? ?????? ????? ???? ???? ?? ?? ?????? ????? ???????:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "?????????? %s ? ???? ???? ???? ?????? ?????????????? ?????? ??."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ???? ???? ?????? ???? ????? ?????? ?????? ??."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "?????? ??????????? ?????"
@@ -5897,6 +5910,52 @@ msgstr "AIM/ICQ ????????
 msgstr "AIM/ICQ ????????? ??????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ? ????? ??? ???."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ? %s (%s) ??"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) ?? ?????????? ????????? ??????"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) ?? ?????????? ?????????? ??????"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) ?? ???????????? ??????? ??????? ??????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ????? ?????? ???? ???? ?? ????? ??????? ???? ????? ??."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ? ????? ???????? ????? ???."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "???? ????? ???? ??????? ???"
+
+msgid "Unable to rename group"
+msgstr "?????? ??? ????????? ??????"
+
+msgid "Unable to delete group"
+msgstr "??? ???? ????????? ??????"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "?????????? %s ? ???? ???? ???? ?????? ?????????????? ?????? ??."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ???? ???? ?????? ???? ????? ?????? ?????? ??."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5931,6 +5990,8 @@ msgstr "????? ???? ?
 msgstr "????? ???? ????????? ???."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "??? ??? ????? ??????"
@@ -5981,12 +6042,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "?????? ??? ???? ???????."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6327,10 +6391,6 @@ msgstr "????? ???? ?
 msgstr "????? ???? ???? ???? ??????????? ???? ??"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "?????? ??? ???? ???????."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "??? ???? ???? ???????????????? ????? ???? ????? ????"
 
@@ -6543,6 +6603,28 @@ msgstr "????? ?????"
 msgstr "????? ?????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "?????????? ?????? ???????????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"??? ??? ????? ????? ????? ????? ?? ??? ???? ????? ??. ?? ????? ??? ??? ??? ????? "
+"??????? ???. ?? ??? ??????? ??????? ???? ????, ?? ????? ??? ??? ???? ??? ???? ????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "????? ????????? ?????"
+
+msgid "Incorrect password."
+msgstr "?????? ???????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "????? ????? ????"
 
@@ -6843,15 +6925,38 @@ msgstr ""
 "??????? ???? ????? ?? ??????? ? ??? ??? ???? ??? ????? ??????, ????? ??? ??????, ???? "
 "????? ????? ? ?????? ???? ????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"??? ??????? ? ????? ???? ????.  ??? TOC ???????? ????? ????? ????? ???? ? ?????? ???? ?? "
+"???.  ??????? ???? %s ?? ?????."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin ? ????? AIM ?????? ??? ????????? ?????? ????."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"??? ??????? ? ????? ???? ????.  ??? TOC ???????? ????? ????? ????? ???? ? ?????? ???? ?? "
+"???.  ??????? ???? %s ?? ?????."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin ? ????? ?????? ??? ????????? ?????? ????."
+
+msgid "Could Not Connect"
+msgstr "????? ????? ????"
+
+msgid "Received authorization"
+msgstr "?????????? ????????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "?????? ?????????? ???"
 
-msgid "Incorrect password."
-msgstr "?????? ???????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "?????? ????? ?????????? ?????? ??????? ??."
@@ -6860,25 +6965,19 @@ msgstr "AOL ????? ????
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL ????? ?????????? ???? ??????? ???? ?????? ???."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "??? ????? ????? ?? ?? ???????? ??????? ??? ???? ??. ???????? ????? %s ????? ??????"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "??? ??? ????? ????? ????? ????? ?? ??? ???? ????? ??. ?? ????? ??? ??? ??? ????? "
 "??????? ???. ?? ??? ??????? ??????? ???? ????, ?? ????? ??? ??? ???? ??? ???? ????."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "??? ????? ????? ?? ?? ???????? ??????? ??? ???? ??. ???????? ????? %s ????? ??????"
-
-msgid "Could Not Connect"
-msgstr "????? ????? ????"
-
-msgid "Received authorization"
-msgstr "?????????? ????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???? ???? SecurID ?? ?????? ??."
 
@@ -6895,26 +6994,6 @@ msgstr "?????"
 msgid "_OK"
 msgstr "?????"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"??? ??????? ? ????? ???? ????.  ??? TOC ???????? ????? ????? ????? ???? ? ?????? ???? ?? "
-"???.  ??????? ???? %s ?? ?????."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin ? ????? AIM ?????? ??? ????????? ?????? ????."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"??? ??????? ? ????? ???? ????.  ??? TOC ???????? ????? ????? ????? ???? ? ?????? ???? ?? "
-"???.  ??????? ???? %s ?? ?????."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin ? ????? ?????? ??? ????????? ?????? ????."
-
 msgid "Password sent"
 msgstr "??????? ?????? ???"
 
@@ -7421,6 +7500,7 @@ msgstr "?????????? ?msgid "Set User Info (web)..."
 msgstr "?????????? ??? ??????? ??? (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "??????? ???? (URL)"
@@ -7456,6 +7536,10 @@ msgstr "??????? ????msgid "Search for Buddy by Information"
 msgstr "??????? ?????? ??????? ???? ??? ???"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "?????????? ????????? ???"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9869,10 +9953,6 @@ msgstr "??????"
 msgid "Auth Domain"
 msgstr "??????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9897,6 +9977,40 @@ msgstr "??????? ????msgid "Add buddy rejected"
 msgstr "??????? ????????? ??????? ????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "????? ???? SSL ????? ????????? ??????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "?????? ???????."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "?????? ????? ???? %d. Yahoo! ?????????? ?????? ??????? ????? ?????? ????."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "?????????? ??????????? ???"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "?????? ????? ???? %d. Yahoo! ?????????? ?????? ??????? ????? ?????? ????."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "?????? ??? ???? ???????."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10007,9 +10121,8 @@ msgstr "??????? ??? 
 msgid "Start Doodling"
 msgstr "??????? ??? ???"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "???? ID ?????? ????? ???"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "????? ?? ??? ???????? ???"
@@ -10814,16 +10927,17 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "???? ????"
+msgid "A_ccount"
+msgstr "?????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "???????? ????? ??? ?? ???????? ?????? ????? ???? ???? ????? ??????? ???? ???.\n"
 
-msgid "_Account:"
-msgstr "????? (_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "???? ????"
 
 #, fuzzy
 msgid "_Block"
@@ -11304,6 +11418,117 @@ msgstr "/????????/??
 msgid "/Buddies/Sort Buddies"
 msgstr "/????????/????? ????????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "????? ????? ???"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "??? ??? ? ????????? ????? ??????? ??????? ?????? ????? ???"
+
+#, fuzzy
+msgid "Layout"
+msgstr "?????? ???? ?????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????? ????? ???"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "???????? (_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????? ????? ??? ???? ???"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "????? ??? (_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????? ????? ??? ???? ???"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "???????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "???? ???? ??????? ?? ??????? ?????"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "???? ???? ??????? ?? ??????? ?????"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "???? ???? ??????? ?? ??????? ?????"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "???? ???? ??????? ?? ??????? ?????"
+
+msgid "Message Text"
+msgstr "?????? ????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "?????? ????"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ???? ?????????? ??????? ????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11833,6 +12058,10 @@ msgstr "?????????"
 msgstr "?????????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "????????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "?????????"
 
@@ -11937,6 +12166,9 @@ msgstr "???????"
 msgid "Swedish"
 msgstr "???????"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "???????"
@@ -12382,11 +12614,9 @@ msgstr "????? ??????msgid "Save Image"
 msgstr "????? ???????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "????? ??????? (_S)..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12476,10 +12706,6 @@ msgstr "????? ???"
 msgstr "????? ???"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "????? ????? ???"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "??????? ???? ????? ???"
 
@@ -12825,6 +13051,9 @@ msgstr "?????? ???"
 msgid "Pounce on Whom"
 msgstr "?????? ???"
 
+msgid "_Account:"
+msgstr "????? (_A):"
+
 msgid "_Buddy name:"
 msgstr "??????? ??? (_B):"
 
@@ -12949,9 +13178,16 @@ msgstr "?????? ?????msgid "Unknown.... Please report this!"
 msgstr "?????? ?????? ????. ???????? ????? ??? ?????? ???!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "????? ???????? ??????"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13549,6 +13785,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "??????? ???? ???"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13788,6 +14028,78 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "????? ???????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "????????? ????? ???? ???"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "?????? ????? ???? ????????? ????? ???? ???"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????? ?????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "??????? ???? ?????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "?????? ??? ???"
+
+#, fuzzy
+msgid "Directory"
+msgstr "????????? ????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ??????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>?????:</b> ???????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "????????? ??????? ??????? ???"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "??????? (_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "?????????? ??????????? ???"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "????? ????? ??????? ?????????? ?????? ??????? ???"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "????????? ??????? ??????? ???"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "??????? ????????? ??:"
 
@@ -14304,12 +14616,6 @@ msgstr ""
 "- ?? ??? ???? ????? ???? ??? ??\n"
 "- ?? ????? ????????? ?????? ?????? ????? ?? ?????? ??? ?????? ???"
 
-msgid "Cursor Color"
-msgstr "????? ???"
-
-msgid "Secondary Cursor Color"
-msgstr "??? ????? ???"
-
 msgid "Hyperlink Color"
 msgstr "????????? ???"
 
@@ -14321,6 +14627,10 @@ msgstr "???? ???????msgid "Highlighted Message Name Color"
 msgstr "???? ????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "???? ??? ???????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14350,37 +14660,25 @@ msgstr "GTK+ ???? ????? msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ???? ?????? ???"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "???? ????? (_o)"
+msgid "Disable Typing Notification Text"
+msgstr "??? ???? ?????"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ ??? ????????"
 
 #, fuzzy
+msgid "Colors"
+msgstr "??? ???"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "?????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin ???? ????????"
@@ -14523,12 +14821,119 @@ msgstr "???????? ???msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "???????? ?????????? ??????????-??????????? ????? ?????? ???? ???? ??."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???????? ???"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ???? ????? ???."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???????? ?????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????????? ??????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "?????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "???????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "?????? ?????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "?????? ????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "??????: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "????? ???? ?????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????? ???????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ ??? ????????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "???? ???????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "??????? ????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "??????? ????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ ??? ????????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ ??? ????????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "??????? ????"
 
@@ -14743,6 +15148,20 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "???? ID ?????? ????? ???"
+
+#~ msgid "Cursor Color"
+#~ msgstr "????? ???"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??? ????? ???"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "???? ????? (_o)"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "???? ???????? ??????"
 
@@ -15232,10 +15651,6 @@ msgstr ""
 #~ msgstr "%s ???? ???????????: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "??? ??? ? ????????? ????? ??????? ??????? ?????? ????? ???"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "???? ????????? ?????"
 
@@ -15244,10 +15659,6 @@ msgstr ""
 #~ msgstr "?????? ???? ???? ???"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "????? ????????? ?????"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "AIM ??? ?????? ??????? ??????"
 
@@ -15381,10 +15792,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "?????? (_M):"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "?????:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "????? ???? ?????? ?????? ??????"
 
@@ -15552,13 +15959,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>?????:</b> ???????"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -16242,9 +16642,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "???? ???? ????????? ?????? ?????"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "???? ???? ??????? ?? ??????? ?????"
-
 #~ msgid "_Chat"
 #~ msgstr "????? (_C)"
 
@@ -16451,9 +16848,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "???"
 
-#~ msgid "Message Text"
-#~ msgstr "?????? ????"
-
 #~ msgid "Away Messages"
 #~ msgstr "??? ???????"
 
@@ -16550,9 +16944,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "GG ???????????? ???? ?????\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "??????? ???? ??????? ??????"
-
 #~ msgid "Send as message"
 #~ msgstr "?????? ????? ?????"
 
@@ -16754,9 +17145,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s ???????? ??."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ???? ????? ???."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
============================================================
--- po/he.po	6308d1609fa81715d5bef5f2251cb92d26e73423
+++ po/he.po	42e53596bc58a00bda033b6203a00dbaed56686c
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-08-27 21:03+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he at li.org>\n"
@@ -1740,6 +1740,8 @@ msgstr "+++ %s ?????"
 msgid "+++ %s signed off"
 msgstr "+++ %s ?????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????? ?? ?????"
 
@@ -2121,6 +2123,10 @@ msgstr "(%s) %s <????-???????
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????-???????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "????? ?????? ??????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "??/? ?????/? ?- %s, ??? ???? ?? ???? %s."
@@ -3081,6 +3087,11 @@ msgstr "?? _?'??:"
 msgid "Chat _name:"
 msgstr "?? _?'??:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?? ???? ?????? ????"
+
 msgid "Chat error"
 msgstr "????? ??'??"
 
@@ -3129,6 +3140,10 @@ msgstr "????? Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "????? Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??? ?? ????? ?? ??????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "????? ???? ?????: %s"
@@ -3171,7 +3186,8 @@ msgstr "_?????:"
 msgid "_Password:"
 msgstr "_?????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "???? ????? ?-IRC ????? ??????"
 
 #. 1. connect to server
@@ -3631,6 +3647,9 @@ msgstr "???? ?? ???? ????? msgid "Server does not use any supported authentication method"
 msgstr "???? ?? ???? ?????? ??? ?????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "??? ????? ??????, ??? ???? ?? ???? ???."
+
 msgid "Invalid challenge from server"
 msgstr "????? ????? ?? ???? ?????"
 
@@ -3899,6 +3918,14 @@ msgstr "????"
 msgid "Resource"
 msgstr "????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?????"
+
 msgid "Middle Name"
 msgstr "?? ?????"
 
@@ -4065,9 +4092,18 @@ msgstr "??? ?????"
 msgid "Find Rooms"
 msgstr "??? ?????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "??? ????? ??????, ??? ???? ?? ???? ???."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "?? ????? ??????? ??????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "?????"
+
 msgid "Ping timeout"
 msgstr "???? ?? ??? ????"
 
@@ -4087,7 +4123,7 @@ msgstr "???? XMPP ????. ?? ?? msgstr "???? XMPP ????. ?? ?????? ?? ???????."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "??? ???????? ????"
 
 #, c-format
@@ -4114,9 +4150,6 @@ msgstr "???? ?????? ?????
 msgid "Unregistration Failed"
 msgstr "???? ?????? ?????"
 
-msgid "Already Registered"
-msgstr "?????? ??? ????."
-
 msgid "State"
 msgstr "????"
 
@@ -4129,6 +4162,9 @@ msgstr "?????"
 msgid "Date"
 msgstr "?????"
 
+msgid "Already Registered"
+msgstr "?????? ??? ????."
+
 msgid "Unregister"
 msgstr "??? ?????"
 
@@ -4156,6 +4192,10 @@ msgstr "??? ?????"
 msgid "Change Registration"
 msgstr "??? ?????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "??? ???????? ????"
+
 msgid "Error unregistering account"
 msgstr "????? ?????? ?????"
 
@@ -4518,16 +4558,18 @@ msgstr "ban &lt;?????&gt; [????
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;?????&gt; [????]:  ???? ????? ?? ????."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;?????&gt; &lt;?????|?????|???|?????|???&gt;: ????? ????? ????? "
 "?? ????."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;?????&gt; &lt;?????|?????|???|?????|???&gt;: ????? ????? ????? ?? "
 "????."
@@ -4589,6 +4631,9 @@ msgstr "???? ????? ??????
 msgid "File transfer proxies"
 msgstr "???? ????? ?????? ?????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -4986,6 +5031,10 @@ msgstr "??? ??? ???"
 msgid "Non-IM Contacts"
 msgstr "??? ??? ???"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ??? ??"
+
 msgid "Nudge"
 msgstr "?? ???!"
 
@@ -5329,64 +5378,27 @@ msgstr "????? ??? Windows Live I
 msgstr "????? ??? Windows Live ID:????? ?? ????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ???? ????? ????."
-
-msgid "Unknown error."
-msgstr "????? ?? ?????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ??? ?? ???? ????? ???!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "????? ?? ????? (%d)"
 
 msgid "Unable to add user"
 msgstr "?? ???? ?????? ?????"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "????? ?? ????? (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "???? ?????? ?????? ???"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "??? ?????? ?????? ????? ?? %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "??? ?????? ????? ????? ?? %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "??? ?????? ???? ????? ?? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "?? ???? ?????? ?? %s ?????? ?????? ???? ???? ??? ????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ???? ????? ?????? ???."
-
-msgid "Service Temporarily Unavailable."
-msgstr "?????? ???? ???? ????."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "????? ????? ?? ????? ?????? ???? ????? ???."
 
-msgid "Unable to rename group"
-msgstr "??? ?????? ????? ?? ?? ??????"
-
-msgid "Unable to delete group"
-msgstr "??? ?????? ????? ?? ??????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5469,6 +5481,9 @@ msgstr "????? ???? ???? ?? "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "????? ???? ???? ??? ?-MSN ???? ????? ????. ?? ????? ???? ????? ????."
 
+msgid "Unknown error."
+msgstr "????? ?? ?????."
+
 msgid "Handshaking"
 msgstr "???? ??????"
 
@@ -5487,6 +5502,14 @@ msgstr "???? ????? ???? ?? msgid "Retrieving buddy list"
 msgstr "???? ????? ???? ????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ??? ??"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ??? ??"
+
 msgid "Away From Computer"
 msgstr "????? ??????"
 
@@ -5525,14 +5548,6 @@ msgstr "?????? ???? ?? ??? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????? ???? ?? ????? ?????? ?????? ????? ?? ?????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?????/? ???? ?????? ???? ???? ??? ?? ???."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ????/? ???? ?????? ???? ???? ??? ?? ???."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "???? ????? ???????"
@@ -5564,6 +5579,51 @@ msgstr "???? ???????? MSN"
 msgstr "???? ???????? MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ???? ????? ????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "??? ?????? ?????? ????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "??? ?????? ????? ????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "??? ?????? ???? ????? ?? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "?? ???? ?????? ?? %s ?????? ?????? ???? ???? ??? ????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ???? ????? ?????? ???."
+
+msgid "Service Temporarily Unavailable."
+msgstr "?????? ???? ???? ????."
+
+msgid "Unable to rename group"
+msgstr "??? ?????? ????? ?? ?? ??????"
+
+msgid "Unable to delete group"
+msgstr "??? ?????? ????? ?? ??????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?????/? ???? ?????? ???? ???? ??? ?? ???."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ????/? ???? ?????? ???? ???? ??? ?? ???."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "??? ????? ???: %s"
 
@@ -5595,6 +5655,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "?????? ???\"? ?????"
 
@@ -5641,17 +5703,19 @@ msgstr "????? ????????, ?? msgid "Protocol error, code %d: %s"
 msgstr "????? ????????, ??? %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s ?????? ???? ????? %d ????, ???? ?????? ?????? ?? %d ???? MySpaceIM (????? "
 "?????? ??????? ?????????).?? ???? ?? ?????? ???http://profileedit.myspace."
 "com/index.cfm?fuseaction=accountSettings.changePassword ?????? ????."
 
+msgid "Incorrect username or password"
+msgstr "?? ????? ?? ????? ??????"
+
 msgid "MySpaceIM Error"
 msgstr "????? MySpaceIM"
 
@@ -5966,9 +6030,6 @@ msgstr "??????? ????? ???
 msgid "Master archive is misconfigured"
 msgstr "??????? ????? ????? ????? ?? ?????"
 
-msgid "Incorrect username or password"
-msgstr "?? ????? ?? ????? ??????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "?? ???? ????? ?? ???? ???? ????"
 
@@ -6175,6 +6236,28 @@ msgstr "???? ????"
 msgid "Server port"
 msgstr "???? ????"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "?????? ????? HTTP ??-????? ?? ????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?????? ??????? ??????? ????? ????. ???? 10 ???? ???? ????. ?? ????? ?????, "
+"????? ?????? ????? ????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "????? ????? ?????? ?????"
+
+msgid "Incorrect password."
+msgstr "????? ?? ?????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "?? ???? ?????? ?? ??? ??'??"
 
@@ -6475,14 +6558,31 @@ msgstr ""
 "????? ?????? ????? ?????? ?????? ??????, ?? ?????? ???? ?????? ?? ?????? "
 "?????? ???????, ?? ??????? ????? ?? ??? ??????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "????? ??????/? ?????. ?? ????? ?? %s ?????????."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "?? ????? ????? ??? ??????? ??? ?? AIM."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "????? ??????/? ?????. ?? ????? ?? %s ?????????."
+
+msgid "Unable to get a valid login hash."
+msgstr "?? ????? ????? ??? ??????? ???."
+
+msgid "Could Not Connect"
+msgstr "?? ???? ??????"
+
+msgid "Received authorization"
+msgstr "?????? ?????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "?? ????? ?? ???."
 
-msgid "Incorrect password."
-msgstr "????? ?? ?????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "?????? ????? ????."
@@ -6491,25 +6591,19 @@ msgstr "????? ??????? ?? A
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "????? ??????? ?? AOL ?? ???? ????."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "????? ????? ????? ?? ??/? ?????/? ???? ???. ??? ????/? ?-%s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "?????? ??????? ??????? ????? ????. ???? 10 ???? ???? ????. ?? ????? ?????, "
 "????? ?????? ????? ????."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "????? ????? ????? ?? ??/? ?????/? ???? ???. ??? ????/? ?-%s"
-
-msgid "Could Not Connect"
-msgstr "?? ???? ??????"
-
-msgid "Received authorization"
-msgstr "?????? ?????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "????? ???? SecurID ???? ???."
 
@@ -6525,20 +6619,6 @@ msgstr "?????"
 msgid "_OK"
 msgstr "?????"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "????? ??????/? ?????. ?? ????? ?? %s ?????????."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "?? ????? ????? ??? ??????? ??? ?? AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "????? ??????/? ?????. ?? ????? ?? %s ?????????."
-
-msgid "Unable to get a valid login hash."
-msgstr "?? ????? ????? ??? ??????? ???."
-
 msgid "Password sent"
 msgstr "?????? ?????"
 
@@ -7018,6 +7098,7 @@ msgstr "??? ?? ????? ?? ??
 msgid "Set User Info (web)..."
 msgstr "??? ?? ????? ?? ?????? (???)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "??? ????? (???)"
 
@@ -7047,6 +7128,10 @@ msgstr "??? ???-??? ??\"? ?
 msgid "Search for Buddy by Information"
 msgstr "??? ???-??? ??\"? ????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "?????? ?? ?????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9361,10 +9446,6 @@ msgstr "?????? ??????"
 msgid "Auth Domain"
 msgstr "?????? ??????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ??? ??"
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9390,6 +9471,40 @@ msgstr "????? ??? ??? ???? msgid "Add buddy rejected"
 msgstr "????? ??? ??? ?????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "????? ???? ???? ?????? ?? ????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????? ?? ?????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "????? ?? ????? ???? %d. ??????? ???? Yahoo! ???? ???? ?? ??."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "?????? ?? ????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "????? ?? ????? ???? %d. ??????? ???? Yahoo! ???? ???? ?? ??."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "?? ????? ?? ????? ??????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9498,8 +9613,8 @@ msgstr "???? ?????"
 msgid "Start Doodling"
 msgstr "???? ?????"
 
-msgid "Activate which ID?"
-msgstr "???? ID ???????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?????? ??? ??'???"
@@ -10270,16 +10385,17 @@ msgstr "?? ????? ?? ????? 
 msgid "Please update the necessary fields."
 msgstr "?? ????? ?? ????? ???????."
 
-msgid "Room _List"
-msgstr "????? _?????"
+#, fuzzy
+msgid "A_ccount"
+msgstr "?????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "?? ????? ?? ????? ?????? ?? ??'?? ??????? ?????? ????.\n"
 
-msgid "_Account:"
-msgstr "??_???:"
+msgid "Room _List"
+msgstr "????? _?????"
 
 msgid "_Block"
 msgstr "????"
@@ -10712,6 +10828,112 @@ msgstr "/???? ???/???? ???
 msgid "/Buddies/Sort Buddies"
 msgstr "/???? ???/???? ????-???"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "??? ????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "????? ?? ????? ?????? ???? ???? ???"
+
+#, fuzzy
+msgid "Layout"
+msgstr "????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "??? ????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "?_???"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????? ??? ???"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_???"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????? ??? ???"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????-???"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???? ??????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "???? ???-???"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "????? ?????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "??? ???? ????? ???? %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "???? SSL"
@@ -11215,6 +11437,10 @@ msgstr "???????"
 msgid "Hungarian"
 msgstr "???????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "??????"
+
 msgid "Indonesian"
 msgstr "?????????"
 
@@ -11313,6 +11539,9 @@ msgstr "??????"
 msgid "Swedish"
 msgstr "??????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "????"
 
@@ -11730,11 +11959,9 @@ msgstr "???? ?????"
 msgid "Save Image"
 msgstr "???? ?????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "???? _?????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "???? ???????? ???..."
 
@@ -11821,9 +12048,6 @@ msgstr "???? ?????"
 msgid "Font Face"
 msgstr "???? ?????"
 
-msgid "Background Color"
-msgstr "??? ????"
-
 msgid "Foreground Color"
 msgstr "??? ?????"
 
@@ -12145,6 +12369,9 @@ msgstr "??? ?????"
 msgid "Pounce on Whom"
 msgstr "??? ?????"
 
+msgid "_Account:"
+msgstr "??_???:"
+
 msgid "_Buddy name:"
 msgstr "?? ??? ????:"
 
@@ -12255,9 +12482,18 @@ msgstr "????? ?????? ?? ?? msgid "Unknown.... Please report this!"
 msgstr "????? ?????? ?? ?????. ??? ???? ?? ??!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "?????? ??? ????? ???? ????????"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?????? ??? ????? ???? ????????"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "?????? ??? ????? ???? ????????"
+
 msgid "Install Theme"
 msgstr "???? ?????"
 
@@ -12819,6 +13055,10 @@ msgstr "???? ???????? ???
 msgstr "???? ???????? ???"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "??? ??? ???"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "????? ?????? ?? ?????? ??:"
 
@@ -13037,6 +13277,78 @@ msgstr "???? ???? ???????
 msgid "Displays statistical information about your buddies' availability"
 msgstr "???? ???? ??????? ?? ?????? ????-???? ???"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "????? ???"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "?? ????? ??? ?????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "?? ????? ??? ????? ???????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "??????? ???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "??? ????? ???? ????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "?????/? ??????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "?????? ???? ???????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ?????"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "????? PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "???? ?? ????? ?????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_?????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "?????? ?? ????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???? ?? ???? ?????? ??? ?????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "???? ?? ????? ?????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "???? ?? ?????? ?????? ????? ?????? ??????? ?? XMPP."
+
 msgid "Buddy is idle"
 msgstr "??? ???? ??????"
 
@@ -13530,12 +13842,6 @@ msgstr ""
 "- ?? ???? ?? ?? ????? ?????\n"
 "- ?? ???? ????? ????? ???? ???? ??? ???????"
 
-msgid "Cursor Color"
-msgstr "??? ????"
-
-msgid "Secondary Cursor Color"
-msgstr "??? ???? ?? ????"
-
 msgid "Hyperlink Color"
 msgstr "??? ???????"
 
@@ -13546,6 +13852,10 @@ msgstr "??? ?????? ???? ?? msgid "Highlighted Message Name Color"
 msgstr "??? ?????? ???? ???????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "??? ?????-?????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "????? ?????"
 
@@ -13575,35 +13885,24 @@ msgstr "????? ????? ???? ? msgid "GTK+ Text Shortcut Theme"
 msgstr "????? ????? ???? ????????? ?? GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "???? ????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "???? ????? ?????"
 
-msgid "Widget Sizes"
-msgstr "???? ????? ????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "???? ??????? ?? GTK+ ?????'??"
 
+#, fuzzy
+msgid "Colors"
+msgstr "????"
+
 msgid "Fonts"
 msgstr "??????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "???? ????? Gtkrc"
 
@@ -13743,12 +14042,119 @@ msgstr "????? ???? ??????
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "????? ???? ??????? ?????? ??\"? ????? ??????? ?\"? ??????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "?? ?????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "?? ?????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "????? ?????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "???? ????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????? ?????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "????? "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "???? ????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??? ?????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "??? ???? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "????? ??????? ???? ?'??"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????? ???"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "???? ??????? ?? GTK+ ?????'??"
+
+#, fuzzy
+msgid "Contact"
+msgstr "???? ?? ??? ????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????? ???? ???"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????? ???? ???"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "???? ??????? ?? GTK+ ?????'??"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "???? ??????? ?? GTK+ ?????'??"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "???? ???? ???"
 
@@ -13950,6 +14356,21 @@ msgstr "???? ?? ?????? ??? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "???? ?? ?????? ?????? ????? ?????? ??????? ?? XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "???? ID ???????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "??? ????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??? ???? ?? ????"
+
+#~ msgid "Interface colors"
+#~ msgstr "???? ????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "???? ????? ????"
+
 #~ msgid "Invite message"
 #~ msgstr "????? ?????"
 
@@ -14389,9 +14810,6 @@ msgstr "???? ?? ?????? ??? #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "????? ?????? ?????? %d ????? ?? ??? ????? %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "????? ?? ????? ?????? ???? ???? ???"
-
 #~ msgid "I am applying to join"
 #~ msgstr "??? ????/? ??????"
 
@@ -14472,9 +14890,6 @@ msgstr "???? ?? ?????? ??? #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(????)</i>"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "????? ????? ?????? ?????"
-
 #~ msgid "TCP Address"
 #~ msgstr "????? TCP"
 
============================================================
--- po/hi.po	4addb8590bb047bb0eafb174cc65cab9e50adfe9
+++ po/hi.po	bdb3cf6b0d6ee290ec8848ff62a52dcef2fd4043
@@ -2,7 +2,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2005-05-29 20:43+0530\n"
 "Last-Translator: Akash <akash at ncb.ernet.in>\n"
 "Language-Team: Akash <matrubhasha at ncb.ernet.in>\n"
@@ -1919,6 +1919,8 @@ msgstr "%s ?????? ?? ?
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "?????? ??????"
 
@@ -2311,6 +2313,10 @@ msgstr "(%s) %s <????? ???msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????? ???? ???>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??????? ????? ??? ??????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3425,7 +3431,12 @@ msgstr "????? ???"
 msgid "Chat _name:"
 msgstr "????? ???"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "????? ?? ???? ???? ?? ????"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "????? ??? ??????"
 
@@ -3484,6 +3495,10 @@ msgstr "????-???? ??
 msgid "Gadu-Gadu User"
 msgstr "????-???? ??? ??????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "?????????? ?? ??????? ???? ????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?????? ????: %s"
@@ -3532,7 +3547,8 @@ msgstr "???????:(_P)"
 msgid "_Password:"
 msgstr "???????:(_P)"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "?? ?? ?? ??????? ??? ????????? ???? ?? ????"
 
 #. 1. connect to server
@@ -4024,6 +4040,9 @@ msgstr "????? ??? ??
 msgid "Server does not use any supported authentication method"
 msgstr "????? ??? ?? ??????? ?????????? ???? ?? ?????? ???? ????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "????? ?????? ???? ??????"
 
@@ -4322,6 +4341,14 @@ msgstr "?????"
 msgid "Resource"
 msgstr "?????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "??? ??? ?? ???? ??"
+
 msgid "Middle Name"
 msgstr "????????? ???"
 
@@ -4503,10 +4530,19 @@ msgstr "???? ?????"
 msgid "Find Rooms"
 msgstr "???? ?????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "??? ????? ??? ????? ????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "????? ???"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "???? ????????"
 
@@ -4527,7 +4563,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "????? ?? ?????? ???? ??? ?????"
 
 #, c-format
@@ -4556,9 +4592,6 @@ msgstr "??????????? msgid "Unregistration Failed"
 msgstr "??????????? ???? ???"
 
-msgid "Already Registered"
-msgstr "???? ?? ?????????? ??"
-
 msgid "State"
 msgstr "??????"
 
@@ -4572,6 +4605,9 @@ msgstr "??????"
 msgid "Date"
 msgstr "??????"
 
+msgid "Already Registered"
+msgstr "???? ?? ?????????? ??"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "????????"
@@ -4604,6 +4640,10 @@ msgstr "??????????? msgstr "??????????? ??????"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "????? ?? ?????? ???? ??? ?????"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "???? ??????? ?????? ??? ??????"
 
@@ -4999,13 +5039,13 @@ msgid ""
 msgstr "ban &lt;??????????&gt; [????]:  ???? ?????????? ?? ???? ?? ????? ?????"
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -5074,6 +5114,9 @@ msgstr "????? ??????msgid "File transfer proxies"
 msgstr "????? ????????? ?????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5502,6 +5545,10 @@ msgstr "?????? ?????msgid "Non-IM Contacts"
 msgstr "?????? ???????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5900,21 +5947,6 @@ msgstr "?????? ?????msgid "Windows Live ID authentication:Invalid response"
 msgstr "?????? ?????????? ?????"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s ??? ???? ??? ???? ??"
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-msgid "Unknown error."
-msgstr "?????? ???????"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?? %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ???? ????? ????? ??"
@@ -5923,52 +5955,29 @@ msgstr "%s ???? ????? 
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "?????? ??????"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "%s ?????????? ?? ????? ???? ??? ??????"
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "?????? ??????"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s ?????????? ?? ?????? ??? ?????? (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s ?????????? ?? ????? ???? ??? ?????? (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s ?????????? ?? ??????? ???? ??? ?????? (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ?? ???? ??? ???? ??????? ????? ???? ?? ???? ???"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?? ??? ???????? ???? ???? ???"
-
 #, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "?? ???? ?????? ??? ?? ?????? ???? ???"
-
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "????? ???? ???? ?? ??? ??????? ?????????? ??-???? ??"
 
-msgid "Unable to rename group"
-msgstr "???? ?? ??? ????? ??? ??????"
-
-msgid "Unable to delete group"
-msgstr "???? ?? ????? ??? ??????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6051,6 +6060,13 @@ msgstr ""
 "???? ?? ?? ?? ????? ???? ?????? ??? ?? ?????? ???? ??? ????? ??? ??? ????????? ?? ??? "
 "?????? ?????"
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+msgid "Unknown error."
+msgstr "?????? ???????"
+
 msgid "Handshaking"
 msgstr "???????????"
 
@@ -6069,6 +6085,14 @@ msgstr "????? ???? ?
 msgid "Retrieving buddy list"
 msgstr "????? ???? ?? ??? ??"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "???????? ?? ??????????"
 
@@ -6106,14 +6130,6 @@ msgstr "????? ???? ?
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "????? ???? ???? ?? ??? ??????? ?????? ?????? ???"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "?????????? %s ?? %s ???? ????? ???? ??? ?????? ?????? ????"
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "?????????? %s ?? %s ???? ????? ???? ??? ?????? ?????? ????"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "???  ?????? ??? ???? "
@@ -6147,6 +6163,52 @@ msgstr "? ?? ??/?? ?? 
 msgstr "? ?? ??/?? ?? ???? ????????? ??????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ??? ???? ??? ???? ??"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s ?????????? ?? ?????? ??? ?????? (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s ?????????? ?? ????? ???? ??? ?????? (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s ?????????? ?? ??????? ???? ??? ?????? (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ?? ???? ??? ???? ??????? ????? ???? ?? ???? ???"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?? ??? ???????? ???? ???? ???"
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "?? ???? ?????? ??? ?? ?????? ???? ???"
+
+msgid "Unable to rename group"
+msgstr "???? ?? ??? ????? ??? ??????"
+
+msgid "Unable to delete group"
+msgstr "???? ?? ????? ??? ??????"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "?????????? %s ?? %s ???? ????? ???? ??? ?????? ?????? ????"
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "?????????? %s ?? %s ???? ????? ???? ??? ?????? ?????? ????"
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -6181,6 +6243,8 @@ msgstr "???? ????? ?
 msgstr "???? ????? ?? ??????????? ?? ???? ????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "??? ?????????? ?????"
@@ -6231,12 +6295,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "???? ????? ?? ???????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6578,10 +6645,6 @@ msgstr "?????? ?????msgstr "?????? ??????????? ???? ?? ?????? ???? ??"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "???? ????? ?? ???????"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "??? ?????????? ?? ??? ???? ???? ?? ???? ????? ????? ???? ????"
 
@@ -6796,6 +6859,28 @@ msgstr "????? ?????"
 msgstr "????? ?????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "????? ?? ???? ????? ?????"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?? ???-??? ?????? ?? ????????? ??? ???? ???? ?? ???? ????????? ???? ??? ?????? ????? ??? ?? "
+"???? ???? ?????? ???? ??? ?? ???? ??????? ????????? ???? ???????"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "??????? ????? ??? ??????"
+
+msgid "Incorrect password."
+msgstr "??? ??????? "
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "?????? ???? ?? ????"
 
@@ -7098,15 +7183,38 @@ msgstr ""
 "???? ????? ?? ???? ???? ????? ?? ????? ???? ?????, ??? ?? ???? ??? ???? ?????, ???? ?? "
 "???? ??? ???? ??????"
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"?? ????? ????????? ?? ??????? ?? ?? ?? ??? ???? ?? ?? ? ?? ?? ?????? ???? ???????? "
+"??????? ?? ??? %s ??????"
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "??? ??? ? ?? ?? ????? ??? ???? ??? ?????? ????"
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"?? ????? ????????? ?? ??????? ?? ?? ?? ??? ???? ?? ?? ? ?? ?? ?????? ???? ???????? "
+"??????? ?? ??? %s ??????"
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "??? ??? ????? ??? ???? ??? ?????? ????"
+
+msgid "Could Not Connect"
+msgstr "?????? ???? ?? ????"
+
+msgid "Received authorization"
+msgstr "?????????? ????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "???? ??????????-???"
 
-msgid "Incorrect password."
-msgstr "??? ??????? "
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "???? ???? ??? ??????? ???"
@@ -7115,25 +7223,19 @@ msgstr "? ? ?? ?????? msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "? ? ?? ??????? ?????? ???? ?????? ??? ?? ?????? ???? ???"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "?? ??????? ?????? ???? ?????? ??? ????? ??????? ???? ??? ?? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "?? ???-??? ?????? ?? ????????? ??? ???? ???? ?? ???? ????????? ???? ??? ?????? ????? ??? ?? "
 "???? ???? ?????? ???? ??? ?? ???? ??????? ????????? ???? ???????"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "?? ??????? ?????? ???? ?????? ??? ????? ??????? ???? ??? ?? %s"
-
-msgid "Could Not Connect"
-msgstr "?????? ???? ?? ????"
-
-msgid "Received authorization"
-msgstr "?????????? ????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???? ??? ??????? ?? ?? ????? ???? ???"
 
@@ -7152,26 +7254,6 @@ msgstr "???"
 msgid "_OK"
 msgstr "???"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"?? ????? ????????? ?? ??????? ?? ?? ?? ??? ???? ?? ?? ? ?? ?? ?????? ???? ???????? "
-"??????? ?? ??? %s ??????"
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "??? ??? ? ?? ?? ????? ??? ???? ??? ?????? ????"
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"?? ????? ????????? ?? ??????? ?? ?? ?? ??? ???? ?? ?? ? ?? ?? ?????? ???? ???????? "
-"??????? ?? ??? %s ??????"
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "??? ??? ????? ??? ???? ??? ?????? ????"
-
 msgid "Password sent"
 msgstr "??????? ???? ????"
 
@@ -7675,6 +7757,7 @@ msgstr "?????????? ?msgid "Set User Info (web)..."
 msgstr "?????????? ?? ??????? ???? ????(?? ?? ??)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "??????? ????? (?? ?? ?? )"
@@ -7711,6 +7794,10 @@ msgstr "????? ?? ???
 msgid "Search for Buddy by Information"
 msgstr "????? ?? ??? ??????? ?????? ????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "?????????? ????? ???? ??"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -10183,10 +10270,6 @@ msgstr "????????"
 msgid "Auth Domain"
 msgstr "????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10210,6 +10293,40 @@ msgstr "????? ?? ???
 msgid "Add buddy rejected"
 msgstr "????? ?? ?????? ??? ?? ??? "
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "????? ?? ?? ?? ?? ??????? ????? ??? ???????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "??? ??????? "
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "?????? ?????? ????? %d? ???? ??? ???-?? ???? ?? ???? ??? ?? ????"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "?????????? ???? ??"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "?????? ?????? ????? %d? ???? ??? ???-?? ???? ?? ???? ??? ?? ????"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "???? ????? ?? ???????"
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10324,9 +10441,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "????? ?? ?? ?????????? ?????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "????? ????? ???? ?"
@@ -11153,18 +11269,19 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr ""
 
+#  And now for the buttons
 #, fuzzy
-msgid "Room _List"
-msgstr "???? ????"
+msgid "A_ccount"
+msgstr "????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "?????? ??? ??? ??? ?? ????? ???? ?????? ??? ???? ???? ??? ???? ??????? ?????\n"
 
-#  And now for the buttons
-msgid "_Account:"
-msgstr "????:(_A)"
+#, fuzzy
+msgid "Room _List"
+msgstr "???? ????"
 
 #, fuzzy
 msgid "_Block"
@@ -11675,6 +11792,117 @@ msgstr "/?????/?????
 msgid "/Buddies/Sort Buddies"
 msgstr "/?????/?????? ????? ???????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "????????? ???"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "???? ?? ?? ????? ?? ????? ???? ?? ????? ?????? ????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "??? ??? ?? ???? ??"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????????? ???"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "???????(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????????? ?? ??? ????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "?????????(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????????? ?? ??? ????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "???????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "???? ??? ????? ?? ??????? ????"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "???? ??? ????? ?? ??????? ????"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?????"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "???? ??? ????? ?? ??????? ????"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "???? ??? ????? ?? ??????? ????"
+
+msgid "Message Text"
+msgstr "?????? ????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "?????? ????????"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?????????? %s ???? ??????? ?????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -12266,6 +12494,10 @@ msgstr "?????????"
 msgstr "?????????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "??????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "??????????"
 
@@ -12371,6 +12603,9 @@ msgstr "???????"
 msgid "Swedish"
 msgstr "???????"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "???????"
@@ -12866,11 +13101,9 @@ msgstr "????? ????? 
 msgid "Save Image"
 msgstr "????? ????? ????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "????? ????? ????...(_S)"
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12961,10 +13194,6 @@ msgstr "????? ?? ???
 msgstr "????? ?? ?????"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "????????? ???"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "???????? ????? ???"
 
@@ -13288,6 +13517,10 @@ msgstr "???? ?????"
 msgid "Pounce on Whom"
 msgstr "???? ?????"
 
+#  And now for the buttons
+msgid "_Account:"
+msgstr "????:(_A)"
+
 msgid "_Buddy name:"
 msgstr "????? ???:(_B)"
 
@@ -13413,9 +13646,16 @@ msgstr "?????? ???? 
 msgid "Unknown.... Please report this!"
 msgstr "?????? ???? ????? ?????? ???? ??? ????!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "????? ???? ???? ??? ????: %s\n"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -14054,6 +14294,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "????? ??????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -14297,6 +14541,79 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "????? ???"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??????? ????? ??? ?????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??????? ????? ?? ???? ???? ?? ??? ????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????? ????????"
+
+#  Buddy List
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "????? ???? ?????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "?? ?????????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "?? ??? ???(_S):"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ?? ?????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>?????:</b> ??????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "??? ??????? ???? ????..."
+
+#, fuzzy
+msgid "_Browse"
+msgstr "???????(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "?????????? ???? ??"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "????? ??? ?? ??????? ?????????? ???? ?? ?????? ???? ????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "??? ??????? ???? ????..."
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "????? ????????? ???"
 
@@ -14893,12 +15210,6 @@ msgstr ""
 " - ?? ??? ??? ???? ?????? ?? ??? ???? ??\n"
 " -?? ???? ???? ?? ?????????? ?? ?? ?? ????? ???? ???, ????? ????? ????? ??."
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "????????? ???"
@@ -14911,6 +15222,11 @@ msgstr "????? ?????"
 msgid "Highlighted Message Name Color"
 msgstr "????? ?????"
 
+#  ---------- "Notification Removals" ----------
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "???? ?????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14947,38 +15263,33 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "???? ?? ????? ? ???(_o)"
+msgid "Disable Typing Notification Text"
+msgstr "??? ??? ?? ???????"
 
-msgid "Widget Sizes"
-msgstr ""
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "??? ????? ????????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "??? ????"
+
 #  And now for the buttons
 #, fuzzy
 msgid "Fonts"
 msgstr "????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -15138,12 +15449,143 @@ msgstr "??????????  
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "??????????  ?????? ????????? ?????? ?? ??? ???? ???? ???? ??????? ??? ??? ????? ??"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "????? ???? ??"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ?? ??? ??? ?????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???? ?? ??????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????(Opera)"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????????? ????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "??????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "?????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "??????? ??????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??????? ????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "???????????: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "??? ???? ???? ?? ????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????? ????? ????"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "??? ????? ????????"
+
+#  And now for the buttons
+#, fuzzy
+msgid "Contact"
+msgstr "???? ?????"
+
+#  Buddy List
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????? ????"
+
+#  Buddy List
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????? ????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "??? ????? ????????"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "??? ????? ????????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "????? ????"
 
@@ -15375,6 +15817,14 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "????? ?? ?? ?????????? ?????"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "???? ?? ????? ? ???(_o)"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "(1 ??????)"
 
@@ -15879,10 +16329,6 @@ msgstr ""
 #~ msgstr "?????????? ?? %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "???? ?? ?? ????? ?? ????? ???? ?? ????? ?????? ????"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "???? ????????? ??? ????"
 
@@ -15891,10 +16337,6 @@ msgstr ""
 #~ msgstr "%s ?? ??? ???-?? ???? ??"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "??????? ????? ??? ??????"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "? ?? ?? ??? ????? ???? ??? ??????"
 
@@ -16021,11 +16463,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "?????(_M)"
 
-#  And now for the buttons
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "????:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "??????? ????? ?? ????????? ??????"
 
@@ -16188,13 +16625,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>???????????:</b> ??????"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>?????:</b> ??????"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -16881,9 +17311,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "???? ??? ?????????? ?? ????? ?????"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "???? ??? ????? ?? ??????? ????"
-
 #~ msgid "_Chat"
 #~ msgstr "???(_C)"
 
@@ -17114,9 +17541,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "??????"
 
-#~ msgid "Message Text"
-#~ msgstr "?????? ????????"
-
 #~ msgid "Away Messages"
 #~ msgstr "?????????? ?????"
 
@@ -17216,9 +17640,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "???? ??????? ??? ?????? ??????\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "????? ?? ???? ???? ?? ????"
-
 #~ msgid "Send as message"
 #~ msgstr "????? ?? ??? ?????"
 
@@ -17424,9 +17845,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s ???-?? ?? ???? ???"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ?? ??? ??? ?????"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
============================================================
--- po/hu.po	7dc38e574243a0fbc596c4e5a6b09ebbbeb02aae
+++ po/hu.po	78517b5b299ba6aedd57bd03c7f074740efa16f4
@@ -9,7 +9,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-25 03:21+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome.hu>\n"
 "Language-Team: Hungarian <gnome at fsf.hu>\n"
@@ -1776,6 +1776,8 @@ msgstr "+++ %s kil?pett"
 msgid "+++ %s signed off"
 msgstr "+++ %s kil?pett"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -2178,6 +2180,10 @@ msgstr "(%s) %s <AUTOMATIKUS V?LASZ>: %
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATIKUS V?LASZ>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Hiba a kapcsolat l?trehoz?sakor"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "A(z) %s programot haszn?lja, de a b?v?tm?ny a k?vetkez?t ig?nyli: %s."
@@ -3155,6 +3161,11 @@ msgstr "Cseveg?s _neve:"
 msgid "Chat _name:"
 msgstr "Cseveg?s _neve:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Nem lehet a kiszolg?l?hoz kapcsol?dni."
+
 msgid "Chat error"
 msgstr "Cseveg?shiba"
 
@@ -3203,6 +3214,10 @@ msgstr "Gadu-Gadu felhaszn?l?"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu felhaszn?l?"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Kiszolg?l? lek?rdez?se"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ismeretlen parancs: %s"
@@ -3245,7 +3260,8 @@ msgstr "_Jelsz?:"
 msgid "_Password:"
 msgstr "_Jelsz?:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Az IRC becenevek nem tartalmazhatnak sz?k?zt"
 
 #. 1. connect to server
@@ -3728,6 +3744,9 @@ msgstr "A kiszolg?l? nem haszn?l egye
 msgid "Server does not use any supported authentication method"
 msgstr "A kiszolg?l? nem haszn?l egyetlen t?mogatott hiteles?t?si elj?r?st sem"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Titkos?t?st ig?nyel, de az nem ?ll rendelkez?sre ezen a kiszolg?l?n."
+
 msgid "Invalid challenge from server"
 msgstr "?rv?nytelen h?v?s a kiszolg?l?t?l"
 
@@ -4001,6 +4020,14 @@ msgstr "Er?forr?s"
 msgid "Resource"
 msgstr "Er?forr?s"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Bejelentkezve"
+
 msgid "Middle Name"
 msgstr "K?z?ps? n?v"
 
@@ -4168,9 +4195,18 @@ msgstr "Szob?k keres?se"
 msgid "Find Rooms"
 msgstr "Szob?k keres?se"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Titkos?t?st ig?nyel, de az nem ?ll rendelkez?sre ezen a kiszolg?l?n."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?ln?v:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Nem tal?lhat?k megfelel? felhaszn?l?k"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Funkci?"
+
 msgid "Ping timeout"
 msgstr "Ping id?t?ll?p?se"
 
@@ -4190,7 +4226,7 @@ msgstr "?rv?nytelen XMPP azonos?t?. 
 msgstr "?rv?nytelen XMPP azonos?t?. A tartom?nyt be kell ?ll?tani."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Nem siker?lt a kiszolg?l?hoz kapcsol?dni."
 
 #, c-format
@@ -4217,9 +4253,6 @@ msgstr "A regisztr?ci? megsz?ntet?se
 msgid "Unregistration Failed"
 msgstr "A regisztr?ci? megsz?ntet?se sikertelen"
 
-msgid "Already Registered"
-msgstr "M?r regisztr?lva van"
-
 msgid "State"
 msgstr "?llam"
 
@@ -4232,6 +4265,9 @@ msgstr "D?tum"
 msgid "Date"
 msgstr "D?tum"
 
+msgid "Already Registered"
+msgstr "M?r regisztr?lva van"
+
 msgid "Unregister"
 msgstr "Regisztr?ci? megsz?ntet?se"
 
@@ -4259,6 +4295,10 @@ msgstr "Regisztr?ci? m?dos?t?sa"
 msgid "Change Registration"
 msgstr "Regisztr?ci? m?dos?t?sa"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Nem siker?lt a kiszolg?l?hoz kapcsol?dni."
+
 msgid "Error unregistering account"
 msgstr "Hiba a fi?k regisztr?ci?j?nak megsz?ntet?se k?zben"
 
@@ -4623,16 +4663,18 @@ msgstr "ban &lt;felhaszn?l?&gt; [ok]: 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;felhaszn?l?&gt; [ok]:  Felhaszn?l? kitilt?sa a szob?b?l."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;felhaszn?l?&gt; &lt;owner|admin|member|outcast|none&gt;: Egy "
 "felhaszn?l? a szob?val fenn?ll? kapcsolat?nak be?ll?t?sa."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;felhaszn?l?&gt; &lt;moderator|participant|visitor|none&gt;: "
 "Be?ll?tja a felhaszn?l? szerep?t a szob?ban."
@@ -4696,6 +4738,9 @@ msgstr "F?jl?tviteli proxy-k"
 msgid "File transfer proxies"
 msgstr "F?jl?tviteli proxy-k"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5096,6 +5141,10 @@ msgstr "Nem azonnali ?zenetv?lt?si pa
 msgid "Non-IM Contacts"
 msgstr "Nem azonnali ?zenetv?lt?si partnerek"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s webkamera-megh?v?st k?ld?tt, ami m?g nem t?mogatott."
+
 msgid "Nudge"
 msgstr "B?k?s"
 
@@ -5443,63 +5492,26 @@ msgstr "Windows Live azonos?t? hiteles
 msgstr "Windows Live azonos?t? hiteles?t?se: ?rv?nytelen v?lasz"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ?rv?nytelen csoport."
-
-msgid "Unknown error."
-msgstr "Ismeretlen hiba."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ezen: %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s megb?kte!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Ismeretlen hiba (%d)"
 
 msgid "Unable to add user"
 msgstr "Nem vehet? fel a felhaszn?l?"
 
-msgid "The following users are missing from your addressbook"
-msgstr "A k?vetkez? felhaszn?l?k hi?nyoznak a c?mjegyz?k?b?l"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nem lehet felhaszn?l?t felvenni ehhez: %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Ismeretlen hiba (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nem lehet letiltani a felhaszn?l?t ezen: %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "A k?vetkez? felhaszn?l?k hi?nyoznak a c?mjegyz?k?b?l"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nem lehet enged?lyezni a felhaszn?l?t ezen: %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nem adhat? hozz?, mert a partnerlista tele van."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?rv?nytelen passport fi?k."
-
-msgid "Service Temporarily Unavailable."
-msgstr "A szolg?ltat?s ?tmenetileg nem ?rhet? el."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "A mobil?zenet nem k?ldhet? el, mert t?l hossz?."
 
-msgid "Unable to rename group"
-msgstr "Nem lehet ?tnevezni a csoportot"
-
-msgid "Unable to delete group"
-msgstr "Nem lehet t?r?lni a csoportot"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5588,6 +5600,9 @@ msgstr ""
 "Az ?n MSN partnerlist?ja ?tmenetileg nem ?rhet? el. K?rem v?rjon ?s pr?b?lja "
 "?jra k?s?bb."
 
+msgid "Unknown error."
+msgstr "Ismeretlen hiba."
+
 msgid "Handshaking"
 msgstr "K?zfog?s"
 
@@ -5606,6 +5621,14 @@ msgstr "Partnerlista fogad?sa"
 msgid "Retrieving buddy list"
 msgstr "Partnerlista fogad?sa"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s webkamera-megh?v?st k?ld?tt, ami m?g nem t?mogatott."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s webkamera-megh?v?st k?ld?tt, ami m?g nem t?mogatott."
+
 msgid "Away From Computer"
 msgstr "Nem vagyok a g?pn?l"
 
@@ -5646,14 +5669,6 @@ msgstr "Az ?zenet ismeretlen hiba miatt
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Az ?zenet ismeretlen hiba miatt lehet, hogy nem lett elk?ldve:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s felvette ?nt a partnerlist?j?ra."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s elt?vol?totta ?nt a partnerlist?j?r?l."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "T?rli a partnert a c?mjegyz?kb?l?"
 
@@ -5683,6 +5698,51 @@ msgstr "MSN protokollb?v?tm?ny"
 msgstr "MSN protokollb?v?tm?ny"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ?rv?nytelen csoport."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ezen: %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nem lehet felhaszn?l?t felvenni ehhez: %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nem lehet letiltani a felhaszn?l?t ezen: %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nem lehet enged?lyezni a felhaszn?l?t ezen: %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nem adhat? hozz?, mert a partnerlista tele van."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?rv?nytelen passport fi?k."
+
+msgid "Service Temporarily Unavailable."
+msgstr "A szolg?ltat?s ?tmenetileg nem ?rhet? el."
+
+msgid "Unable to rename group"
+msgstr "Nem lehet ?tnevezni a csoportot"
+
+msgid "Unable to delete group"
+msgstr "Nem lehet t?r?lni a csoportot"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s felvette ?nt a partnerlist?j?ra."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s elt?vol?totta ?nt a partnerlist?j?r?l."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Nincs ilyen felhaszn?l?: %s"
 
@@ -5711,6 +5771,8 @@ msgstr "A kapcsolat elveszett a kiszolg? msgstr "A kapcsolat elveszett a kiszolg?l?val"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "?j levelek"
 
@@ -5759,17 +5821,19 @@ msgstr "Protokollhiba, %d. k?d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollhiba, %d. k?d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s A jelszava %d karakter hossz?, ami nagyobb a MySpaceIM eset?n v?rt %d "
 "?rt?kn?l. R?vid?tse jelszav?t a k?vetkez? c?men: http://profileedit.myspace."
 "com/index.cfm?fuseaction=accountSettings.changePassword ?s pr?b?lkozzon ?jra."
 
+msgid "Incorrect username or password"
+msgstr "Hib?s felhaszn?l?n?v vagy jelsz?"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM hiba"
 
@@ -6090,9 +6154,6 @@ msgstr "A f?arch?vum hib?san van be?
 msgid "Master archive is misconfigured"
 msgstr "A f?arch?vum hib?san van be?ll?tva"
 
-msgid "Incorrect username or password"
-msgstr "Hib?s felhaszn?l?n?v vagy jelsz?"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "A megadott felhaszn?l?n?vhez tartoz? kiszolg?l? nem ismerhet? fel"
 
@@ -6309,6 +6370,28 @@ msgstr "Kiszolg?l? portja"
 msgid "Server port"
 msgstr "Kiszolg?l? portja"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "V?ratlan HTTP v?lasz ?rkezett a kiszolg?l?t?l."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?n t?l gyakran jelentkezik ki/be. V?rjon t?z percet ?s pr?b?lja meg ?jra. Ha "
+"tov?bb folytatja, m?g t?bbet kell majd v?rnia."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Hiba %s felold?sakor"
+
+msgid "Incorrect password."
+msgstr "Helytelen jelsz?."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Nem siker?lt kapcsol?dni a cseveg?szob?hoz"
 
@@ -6611,14 +6694,35 @@ msgstr ""
 "bet?vel kell kezd?dni?k ?s bet?ket, sz?mokat, sz?k?z?ket, vagy csak sz?mokat "
 "tartalmazhatnak."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Hamarosan megszakadhat a kapcsolat. Ebbben az esetben keressen friss?t?seket "
+"a k?vetkez? c?men: %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nem k?rhet? le ?rv?nyes AIM bel?p? hash."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Hamarosan megszakad a kapcsolat. Friss?t?sek?rt keresse fel a k?vetkez? "
+"c?met: %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nem k?rhet? le ?rv?nyes bel?p? hash."
+
+msgid "Could Not Connect"
+msgstr "Nem siker?lt kapcsol?dni"
+
+msgid "Received authorization"
+msgstr "A hiteles?t?s fogadva"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "?rv?nytelen felhaszn?l?n?v."
 
-msgid "Incorrect password."
-msgstr "Helytelen jelsz?."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "A fi?kja jelenleg fel van f?ggesztve."
@@ -6627,27 +6731,21 @@ msgstr "Az AOL azonnali ?zen? szolg?l
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Az AOL azonnali ?zen? szolg?ltat?s ?tmenetileg nem ?rhet? el."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"?n t?l gyakran jelentkezik ki/be. V?rjon t?z percet ?s pr?b?lja meg ?jra. Ha "
-"tov?bb folytatja, m?g t?bbet kell majd v?rnia."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A haszn?lt kliensprogram verzi?ja t?l r?gi. K?rem t?ltse le a friss?t?st a "
 "k?vetkez? helyr?l: %s"
 
-msgid "Could Not Connect"
-msgstr "Nem siker?lt kapcsol?dni"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"?n t?l gyakran jelentkezik ki/be. V?rjon t?z percet ?s pr?b?lja meg ?jra. Ha "
+"tov?bb folytatja, m?g t?bbet kell majd v?rnia."
 
-msgid "Received authorization"
-msgstr "A hiteles?t?s fogadva"
-
 msgid "The SecurID key entered is invalid."
 msgstr "A megadott SecurID kulcs ?rv?nytelen."
 
@@ -6663,24 +6761,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Hamarosan megszakadhat a kapcsolat. Ebbben az esetben keressen friss?t?seket "
-"a k?vetkez? c?men: %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nem k?rhet? le ?rv?nyes AIM bel?p? hash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Hamarosan megszakad a kapcsolat. Friss?t?sek?rt keresse fel a k?vetkez? "
-"c?met: %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nem k?rhet? le ?rv?nyes bel?p? hash."
-
 msgid "Password sent"
 msgstr "Jelsz? elk?ldve"
 
@@ -7204,6 +7284,7 @@ msgstr "Felhaszn?l?i inform?ci?k be? msgid "Set User Info (web)..."
 msgstr "Felhaszn?l?i inform?ci?k be?ll?t?sa (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Jelsz? m?dos?t?sa (web)"
 
@@ -7233,6 +7314,10 @@ msgstr "Partner keres?se inform?ci? a
 msgid "Search for Buddy by Information"
 msgstr "Partner keres?se inform?ci? alapj?n"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "A felhaszn?l? nincs bejelentkezve"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9520,10 +9605,6 @@ msgstr "Tartom?ny hiteles?t?se"
 msgid "Auth Domain"
 msgstr "Tartom?ny hiteles?t?se"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s webkamera-megh?v?st k?ld?tt, ami m?g nem t?mogatott."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9551,6 +9632,44 @@ msgstr "Partner felv?tele megtagadva"
 msgid "Add buddy rejected"
 msgstr "Partner felv?tele megtagadva"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "?rv?nytelen adatok ?rkeztek a kapcsolaton a kiszolg?l?t?l."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Hib?s jelsz?"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ismeretlen hibasz?m: %d. A Yahoo! weboldal?ra bejelentkezve tal?n "
+"megoldhatja ezt a probl?m?t."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "A felhaszn?l? nem l?tezik"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ismeretlen hibasz?m: %d. A Yahoo! weboldal?ra bejelentkezve tal?n "
+"megoldhatja ezt a probl?m?t."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Hib?s felhaszn?l?n?v vagy jelsz?"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9665,8 +9784,8 @@ msgstr "Firk?l?s megkezd?se"
 msgid "Start Doodling"
 msgstr "Firk?l?s megkezd?se"
 
-msgid "Activate which ID?"
-msgstr "Melyik azonos?t?t aktiv?lja?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kihez csatlakozik a cseveg?sben?"
@@ -10458,8 +10577,9 @@ msgstr "Friss?tse a sz?ks?ges mez?ke
 msgid "Please update the necessary fields."
 msgstr "Friss?tse a sz?ks?ges mez?ket."
 
-msgid "Room _List"
-msgstr "Sz_obalista"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Fi?k"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10468,8 +10588,8 @@ msgstr ""
 "Adja meg a megfelel? inform?ci?t arr?l a cseveg?sr?l, amelyhez csatlakozni "
 "k?v?n.\n"
 
-msgid "_Account:"
-msgstr "F_i?k:"
+msgid "Room _List"
+msgstr "Sz_obalista"
 
 msgid "_Block"
 msgstr "_Tilt?s"
@@ -10907,6 +11027,111 @@ msgstr "/Partnerek/Partnerek rendez?se"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Partnerek/Partnerek rendez?se"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "H?tt?rsz?n"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "H?tt?rsz?n"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Kibont?s"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "H?tt?rsz?n kiv?laszt?sa"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "?sszecs_uk?s"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "H?tt?rsz?n kiv?laszt?sa"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Billenty?parancs"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "El?rhet?"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "T?vol"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Kil?pett"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Hangulatsz?veg"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?zenet elk?ldve"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s felhaszn?l?inform?ci?inak m?dos?t?sa"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL kiszolg?l?k"
@@ -11410,6 +11635,10 @@ msgstr "magyar"
 msgid "Hungarian"
 msgstr "magyar"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "rom?n"
+
 msgid "Indonesian"
 msgstr "indon?z"
 
@@ -11507,6 +11736,9 @@ msgstr "sv?d"
 msgid "Swedish"
 msgstr "sv?d"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "tamil"
 
@@ -11937,11 +12169,9 @@ msgstr "K?p ment?se"
 msgid "Save Image"
 msgstr "K?p ment?se"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "K?p ment?_se..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Egy?ni hangulatjel hozz?ad?sa..."
 
@@ -12030,9 +12260,6 @@ msgstr "Bet?k?szlet"
 msgid "Font Face"
 msgstr "Bet?k?szlet"
 
-msgid "Background Color"
-msgstr "H?tt?rsz?n"
-
 msgid "Foreground Color"
 msgstr "El?t?rsz?n"
 
@@ -12359,6 +12586,9 @@ msgstr "Kin?l figyelmeztet"
 msgid "Pounce on Whom"
 msgstr "Kin?l figyelmeztet"
 
+msgid "_Account:"
+msgstr "F_i?k:"
+
 msgid "_Buddy name:"
 msgstr "_Partner neve:"
 
@@ -12469,9 +12699,18 @@ msgstr "Ismeretlen figyelmeztet?si esem
 msgid "Unknown.... Please report this!"
 msgstr "Ismeretlen figyelmeztet?si esem?ny. K?rj?k jelentse ezt!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "A hangulatjel-t?ma kicsomagol?sa meghi?sult."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "A hangulatjel-t?ma kicsomagol?sa meghi?sult."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "A hangulatjel-t?ma kicsomagol?sa meghi?sult."
+
 msgid "Install Theme"
 msgstr "T?ma telep?t?se"
 
@@ -13033,6 +13272,10 @@ msgstr "Egy?nihangulatjel-kezel?"
 msgid "Custom Smiley Manager"
 msgstr "Egy?nihangulatjel-kezel?"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Partner kiv?laszt?sa"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Kattintson a fi?k partnerikonj?nak m?dos?t?s?hoz."
 
@@ -13256,6 +13499,80 @@ msgstr "Statisztikai inform?ci?k megje
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Statisztikai inform?ci?k megjelen?t?se a partnerek el?rhet?s?g?r?l"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Kiszolg?l? c?me"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Adjon meg egy konferenciakiszolg?l?t"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "V?lassza ki a lek?rdezend? konferenciakiszolg?l?t"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "El?rhet? szolg?ltat?sok"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Partnerlista k?ld?se"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "A partner elmegy"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Napl?k?nyvt?r"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Hang kiv?laszt?sa"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub szolg?ltat?s"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Le?r?s"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Szolg?ltat?sfelt?rk?pez?si inform?ci?k"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_B?ng?sz?:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "A felhaszn?l? nem l?tezik"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "A kiszolg?l? nem t?mogatja a blokkol?st"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Szolg?ltat?sfelt?rk?pez?si inform?ci?k"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ez a b?v?tm?ny XMPP kiszolg?l?kban vagy kliensekben v?gzett hibakeres?shez "
+"hasznos."
+
 msgid "Buddy is idle"
 msgstr "A partner inakt?v"
 
@@ -13766,12 +14083,6 @@ msgstr ""
 "- Visszaford?t minden bej?v? sz?veget\n"
 "- ?zenetet k?ld a partnerlist?n l?v? partnereinek, amikor bel?pnek"
 
-msgid "Cursor Color"
-msgstr "Kurzor sz?ne"
-
-msgid "Secondary Cursor Color"
-msgstr "M?sodlagos kurzor sz?ne"
-
 msgid "Hyperlink Color"
 msgstr "Hiperhivatkoz?s sz?ne"
 
@@ -13781,6 +14092,10 @@ msgstr "Kiemelt ?zenet n?vsz?ne"
 msgid "Highlighted Message Name Color"
 msgstr "Kiemelt ?zenet n?vsz?ne"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "G?pel?s?rtes?t?s sz?ne"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView v?zszintes elv?laszt?s"
 
@@ -13810,35 +14125,24 @@ msgstr "GTK+ sz?veges gyorsbillenty? t
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ sz?veges gyorsbillenty? t?ma"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Fel?let sz?nei"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "G?pel?s?rtes?t?s enged?lyez?se"
 
-msgid "Widget Sizes"
-msgstr "Fel?leti elemek m?retei"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ t?mavez?rl?s"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Bez?r?s"
+
 msgid "Fonts"
 msgstr "Bet?k?szletek"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc f?jleszk?z?k"
 
@@ -13982,12 +14286,119 @@ msgstr ""
 "A felhaszn?l? ?ltal megadott szab?lyoknak megfelel?en cser?li a sz?veget a "
 "kimen? ?zenetekben."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Nincs bejelentkezve"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Nincs bejelentkezve"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Csatlakoz?s egy cseveg?shez"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Mell?z?s"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Hangosabb"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Enged?ly megadva"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Hiba "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Inform?ci?k"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "K?rd?s p?rbesz?dablak"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Figyelmeztet?si szint"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ?llapota"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Cseveg?szoba nyelve"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Ikon m?dos?t?sa"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ t?mavez?rl?s"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kapcsolatinform?ci?k"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Partnerlista"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Partnerlista"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ t?mavez?rl?s"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ t?mavez?rl?s"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Partnerfigyel?"
 
@@ -14194,6 +14605,21 @@ msgstr ""
 "Ez a b?v?tm?ny XMPP kiszolg?l?kban vagy kliensekben v?gzett hibakeres?shez "
 "hasznos."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Melyik azonos?t?t aktiv?lja?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kurzor sz?ne"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "M?sodlagos kurzor sz?ne"
+
+#~ msgid "Interface colors"
+#~ msgstr "Fel?let sz?nei"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Fel?leti elemek m?retei"
+
 #~ msgid "Invite message"
 #~ msgstr "Megh?v??zenet"
 
============================================================
--- po/hy.po	448a1668d0067c3f4e2e30c9b233d4aa11157a72
+++ po/hy.po	13bbcbd1c334ea88505f38cd915841088f5df972
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: am\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 20:21-0700\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-05-20 17:37+0400\n"
 "Last-Translator: David Avsharyan <avsharyan at gmail.com>\n"
 "Language-Team: \n"
@@ -2049,6 +2049,9 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+msgid "Error creating conference."
+msgstr ""
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2980,6 +2983,10 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#. should this be a settings error?
+msgid "Unable to resolve server"
+msgstr ""
+
 msgid "Chat error"
 msgstr ""
 
@@ -3028,6 +3035,9 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+msgid "GG server"
+msgstr ""
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -3070,7 +3080,7 @@ msgstr ""
 msgid "_Password:"
 msgstr ""
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3957,7 +3967,7 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr ""
 
 #, c-format
@@ -3984,9 +3994,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr ""
 
@@ -3999,6 +4006,9 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -4026,6 +4036,9 @@ msgstr ""
 msgid "Change Registration"
 msgstr ""
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4453,6 +4466,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4838,6 +4854,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5190,32 +5210,6 @@ msgstr ""
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
-msgid "Unknown error."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
@@ -5289,6 +5283,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5307,6 +5304,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5379,6 +5384,29 @@ msgstr ""
 msgid "%s on %s (%s)"
 msgstr ""
 
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
 msgid "Unable to rename group"
 msgstr ""
 
@@ -5470,12 +5498,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr ""
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -5789,9 +5819,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5991,6 +6018,25 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, c-format
+msgid "Error requesting "
+msgstr ""
+
+msgid "Incorrect password."
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6275,14 +6321,31 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr ""
 
-msgid "Incorrect password."
-msgstr ""
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6291,23 +6354,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr ""
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6323,20 +6379,6 @@ msgstr ""
 msgid "_OK"
 msgstr ""
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6777,6 +6819,7 @@ msgstr ""
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr ""
 
@@ -6806,6 +6849,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -8949,10 +8995,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -8985,7 +9027,9 @@ msgstr ""
 msgstr ""
 
 #. security lock from too many failed login attempts
-msgid "Account locked: Too many failed login attempts"
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #. the username does not exist
@@ -8993,7 +9037,9 @@ msgstr ""
 msgstr ""
 
 #. indicates a lock of some description
-msgid "Account locked: See the debug log"
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #. username or password missing
@@ -9100,7 +9146,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -10265,6 +10311,98 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+msgid "Background Color"
+msgstr ""
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+msgid "Layout"
+msgstr ""
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr ""
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+msgid "Contact Text"
+msgstr ""
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+msgid "On-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+msgid "Away Text"
+msgstr ""
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+msgid "Off-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+msgid "Idle Text"
+msgstr ""
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+msgid "Message Text"
+msgstr ""
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -11336,9 +11474,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-msgid "Background Color"
-msgstr ""
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -11728,9 +11863,15 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12483,6 +12624,62 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
+msgid "Enter an XMPP Server"
+msgstr ""
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+msgid "Add to Buddy List"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+msgid "_Browse"
+msgstr ""
+
+msgid "Server does not exist"
+msgstr ""
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -12957,12 +13154,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -12972,6 +13163,9 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13001,35 +13195,21 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+msgid "Disable Typing Notification Text"
 msgstr ""
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+msgid "Colors"
+msgstr ""
+
 msgid "Fonts"
 msgstr ""
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13162,12 +13342,100 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+msgid "Just logged in"
+msgstr ""
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "?????? ????????"
+
+msgid "Ignored"
+msgstr ""
+
+msgid "Founder"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Half Operator"
+msgstr ""
+
+msgid "Authorization dialog"
+msgstr ""
+
+msgid "Error dialog"
+msgstr ""
+
+msgid "Information dialog"
+msgstr ""
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+msgid "Warning dialog"
+msgstr ""
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+msgid "Status Icons"
+msgstr ""
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+msgid "Dialog Icons"
+msgstr ""
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
============================================================
--- po/id.po	3b24e05dd8a30f6473d063c2efa8e98afca21daa
+++ po/id.po	bb5c8e1df61cbb1cfff5f9a74981cb1516ad4eb7
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-10-28 02:39+0800\n"
 "Last-Translator: Rai S. Regawa <raireg at yahoo.com>\n"
 "Language-Team: Rai S. Regawa <raireg at yahoo.com>\n"
@@ -1806,6 +1806,8 @@ msgstr "+++ %s keluar"
 msgid "+++ %s signed off"
 msgstr "+++ %s keluar"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Kesalahan Tidak Dikenal"
 
@@ -2210,6 +2212,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Kesalahan membuat sambungan"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Anda menggunakan %s, tetapi plugin ini memerlukan %s."
@@ -3184,6 +3190,11 @@ msgstr "_Nama percakapan:"
 msgid "Chat _name:"
 msgstr "_Nama percakapan:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Tidak dapat menyambung ke server."
+
 msgid "Chat error"
 msgstr "Kesalahan percakapan"
 
@@ -3232,6 +3243,10 @@ msgstr "Pengguna Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Pengguna Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Atur Info Pengguna..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Perintah tidak dikenal: %s"
@@ -3274,7 +3289,8 @@ msgstr "_Kata sandi:"
 msgid "_Password:"
 msgstr "_Kata sandi:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Nama panggilan IRC tidak dapat mengandung sepasi"
 
 #. 1. connect to server
@@ -3759,6 +3775,9 @@ msgstr "Server tidak menggunakan metode 
 msgid "Server does not use any supported authentication method"
 msgstr "Server tidak menggunakan metode otentifikasi yang didukung"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Anda memerlukan enkripsi, tetapi tidak tersedia pada server ini."
+
 msgid "Invalid challenge from server"
 msgstr "Tantangan tidak valid dari server"
 
@@ -4029,6 +4048,14 @@ msgstr "Sumber Daya"
 msgid "Resource"
 msgstr "Sumber Daya"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Terlogin"
+
 msgid "Middle Name"
 msgstr "Nama Tengah"
 
@@ -4197,10 +4224,19 @@ msgstr "Cari Kamar"
 msgid "Find Rooms"
 msgstr "Cari Kamar"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Anda memerlukan enkripsi, tetapi tidak tersedia pada server ini."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Nama Alias:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Pengguna yang sesuai tidak ditemukan"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Peranan"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Teks biasa"
 
@@ -4220,7 +4256,7 @@ msgstr "ID XMPP Tidak Valid. Domain haru
 msgstr "ID XMPP Tidak Valid. Domain harus diset."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Gagal tersambung ke server."
 
 #, c-format
@@ -4247,9 +4283,6 @@ msgstr "Daftar Keluar Gagal"
 msgid "Unregistration Failed"
 msgstr "Daftar Keluar Gagal"
 
-msgid "Already Registered"
-msgstr "Sudah Terdaftar"
-
 msgid "State"
 msgstr "Negara"
 
@@ -4262,6 +4295,9 @@ msgstr "Tanggal"
 msgid "Date"
 msgstr "Tanggal"
 
+msgid "Already Registered"
+msgstr "Sudah Terdaftar"
+
 msgid "Unregister"
 msgstr "Daftar Keluar"
 
@@ -4291,6 +4327,10 @@ msgstr "Rubah Registrasi"
 msgid "Change Registration"
 msgstr "Rubah Registrasi"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Gagal tersambung ke server."
+
 msgid "Error unregistering account"
 msgstr "Kesalahan dalam membatalkan registrasi akun"
 
@@ -4655,16 +4695,18 @@ msgstr "ban &lt;user&gt; [kamar]:  Ban p
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [kamar]:  Ban pengguna dari kamar."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "afiliasi &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Atur afiliasi "
 "pengguna dengan kamar."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "peranan &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Atur "
 "peranan pengguna dalam kamar."
@@ -4730,6 +4772,9 @@ msgstr "Port Transfer File"
 msgid "File transfer proxies"
 msgstr "Port Transfer File"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5133,6 +5178,10 @@ msgstr "Hilangkan Kontak"
 msgid "Non-IM Contacts"
 msgstr "Hilangkan Kontak"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s telah mengirimkan anda undangan webcam yang belum didukung."
+
 msgid "Nudge"
 msgstr "Senggol"
 
@@ -5489,65 +5538,28 @@ msgstr "Otentikasi Windows Live ID:Tidak
 msgstr "Otentikasi Windows Live ID:Tidak dapat tersambung"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s bukan kelompok yang valid."
-
-msgid "Unknown error."
-msgstr "Kesalahan tidak dikenal."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s pada %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s barusan mengirim anda Sikutan!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Kesalahan Tidak Dikenal (%d)"
 
 msgid "Unable to add user"
 msgstr "Tidak dapat menambahkan pengguna"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Kesalahan Tidak Dikenal (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Berikut ini adalah hasil pencarian anda"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Tidak dapat menambahkan pengguna pada %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Tidak dapat memblokir pengguna pada %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Tidak dapat mengijinkan pengguna pada %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s tidak dapat ditambahkan karena daftar teman anda penuh."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s adalah kata sandi akun yang tidak valid."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Layanan Sementara Tidak Tersedia."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Pesan tidak dapat dikirim, karena anda tidak tersambung."
 
-msgid "Unable to rename group"
-msgstr "Tidak dapan mengubah nama kelompok"
-
-msgid "Unable to delete group"
-msgstr "TIdak dapat menghapus kelompok"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5635,6 +5647,9 @@ msgstr ""
 msgstr ""
 "Daftar teman MSN anda sementara tidak tersedia. Mohon tunggu dan coba lagi."
 
+msgid "Unknown error."
+msgstr "Kesalahan tidak dikenal."
+
 msgid "Handshaking"
 msgstr "Jabat Tangan"
 
@@ -5653,6 +5668,14 @@ msgstr "Mengambil daftar teman"
 msgid "Retrieving buddy list"
 msgstr "Mengambil daftar teman"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s telah mengirimkan anda undangan webcam yang belum didukung."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s telah mengirimkan anda undangan webcam yang belum didukung."
+
 msgid "Away From Computer"
 msgstr "Menjauh Dari Komputer"
 
@@ -5691,14 +5714,6 @@ msgstr "Pesan mungkin tidak terkirim kar
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Pesan mungkin tidak terkirim karena kesalahan tidak dikenal terjadi:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s telah menambahkan anda pada daftar temannya."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s menghilangkan anda dari daftar temannya."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Tambahkan ke Buku Alamat"
@@ -5732,6 +5747,51 @@ msgstr "Plugin Protokol AIM"
 msgstr "Plugin Protokol AIM"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s bukan kelompok yang valid."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s pada %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Tidak dapat menambahkan pengguna pada %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Tidak dapat memblokir pengguna pada %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Tidak dapat mengijinkan pengguna pada %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s tidak dapat ditambahkan karena daftar teman anda penuh."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s adalah kata sandi akun yang tidak valid."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Layanan Sementara Tidak Tersedia."
+
+msgid "Unable to rename group"
+msgstr "Tidak dapan mengubah nama kelompok"
+
+msgid "Unable to delete group"
+msgstr "TIdak dapat menghapus kelompok"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s telah menambahkan anda pada daftar temannya."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s menghilangkan anda dari daftar temannya."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Tidak ada pengguna: %s"
 
@@ -5764,6 +5824,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Pesan surat baru"
 
@@ -5814,12 +5876,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Nama layar atau kata sandi salah."
+
 msgid "MySpaceIM Error"
 msgstr "Kesalahan MySpaceIM"
 
@@ -6141,10 +6206,6 @@ msgstr "Arsip utama salah konfigurasi"
 msgstr "Arsip utama salah konfigurasi"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Nama layar atau kata sandi salah."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Tidak dapat mengenali host dari nama layar yang anda masukkan"
 
@@ -6363,6 +6424,29 @@ msgstr "Port Server"
 msgstr "Port Server"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Menerima respon HTTP tidak terduga dari server."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Anda telah menyambung dan memutuskan terlalu sering. Tunggu sepuluh menit "
+"dan coba lagi. Apabila anda meneruskan mencoba, anda akan harus menuggu "
+"lebih lama"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Kesalahan dalam memohon token login"
+
+msgid "Incorrect password."
+msgstr "Kata sandi salah."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Tidak dapat menyambung"
 
@@ -6666,15 +6750,32 @@ msgstr ""
 "huruf dan mengandung hanya huruf, angka dan sepasi, atau mengandung hanya "
 "nomor."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Anda dapat terputus sebentar lagi.  Periksa %s untuk pembaharuan."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Tidak berhasil mendapatkan hash login AIM yang valid."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Anda dapat terputus sebentar lagi.  Periksa %s untuk pembaharuan."
+
+msgid "Unable to get a valid login hash."
+msgstr "Tidak berhasil mendapatkan hash login yang valid."
+
+msgid "Could Not Connect"
+msgstr "Tidak Dapat Menyambung"
+
+msgid "Received authorization"
+msgstr "Menerima Otorisasi"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Nama tidak valid"
 
-msgid "Incorrect password."
-msgstr "Kata sandi salah."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Akun anda sementara ditahan."
@@ -6683,27 +6784,21 @@ msgstr "Layanan AOL Instant Messenger se
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Layanan AOL Instant Messenger sementara tidak tersedia."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+"Versi klien yang anda gunakan adalah terlalu lama. Mohon perbaharui di %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Anda telah menyambung dan memutuskan terlalu sering. Tunggu sepuluh menit "
 "dan coba lagi. Apabila anda meneruskan mencoba, anda akan harus menuggu "
 "lebih lama"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"Versi klien yang anda gunakan adalah terlalu lama. Mohon perbaharui di %s"
-
-msgid "Could Not Connect"
-msgstr "Tidak Dapat Menyambung"
-
-msgid "Received authorization"
-msgstr "Menerima Otorisasi"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
@@ -6719,20 +6814,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Anda dapat terputus sebentar lagi.  Periksa %s untuk pembaharuan."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Tidak berhasil mendapatkan hash login AIM yang valid."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Anda dapat terputus sebentar lagi.  Periksa %s untuk pembaharuan."
-
-msgid "Unable to get a valid login hash."
-msgstr "Tidak berhasil mendapatkan hash login yang valid."
-
 msgid "Password sent"
 msgstr "Kata sandi terkirim"
 
@@ -7246,6 +7327,7 @@ msgstr "Atur Info Pengguna (URL)..."
 msgid "Set User Info (web)..."
 msgstr "Atur Info Pengguna (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Rubah Kata Sandi (URL)"
@@ -7278,6 +7360,10 @@ msgstr "Cari Teman berdasarkan Informasi
 msgstr "Cari Teman berdasarkan Informasi"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "Pengguna tidak sedang login"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9619,10 +9705,6 @@ msgstr "Otorisasi Domain"
 msgid "Auth Domain"
 msgstr "Otorisasi Domain"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s telah mengirimkan anda undangan webcam yang belum didukung."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9650,6 +9732,44 @@ msgstr "Penambahan teman ditolak"
 msgid "Add buddy rejected"
 msgstr "Penambahan teman ditolak"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Menerima data tidak valid pada sambungan dengan server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Kata sandi salah"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Kesalahan nomor tidak dikenal %d. Login ke situs Yahoo! dapat memperbaiki "
+"ini."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Pengguna tidak pernah ada"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Kesalahan nomor tidak dikenal %d. Login ke situs Yahoo! dapat memperbaiki "
+"ini."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nama layar atau kata sandi salah."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9763,8 +9883,8 @@ msgstr "Mulai Doodling"
 msgid "Start Doodling"
 msgstr "Mulai Doodling"
 
-msgid "Activate which ID?"
-msgstr "Aktifkan ID yang mana?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Gabung siapa dalam percakapan?"
@@ -10558,8 +10678,8 @@ msgstr "Mohon perbaharui bagian yang dip
 msgstr "Mohon perbaharui bagian yang diperlukan."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Daftar Kamar"
+msgid "A_ccount"
+msgstr "A_kun:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10568,8 +10688,9 @@ msgstr ""
 "Mohon masukkan informasi yang sesuai mengenai percakapan ke mana anda ingin "
 "bergabung.\n"
 
-msgid "_Account:"
-msgstr "_Akun:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Daftar Kamar"
 
 msgid "_Block"
 msgstr "_Blokir"
@@ -11023,6 +11144,112 @@ msgstr "/Teman-teman/Atur Teman-teman"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Teman-teman/Atur Teman-teman"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Warna Latar Belakang"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Kelompok ini telah ditambahkan ke daftar teman anda"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Warna Latar Belakang"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Lebarkan"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Pilih Warna Latar Belakanga"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Ringkas"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Pilih Warna Latar Belakanga"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Urut"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Menjauh"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Teks Mood"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Pesan terkirim"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Rubah informasi pengguna untuk %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Server SSL"
@@ -11529,6 +11756,10 @@ msgstr "Hongaria"
 msgid "Hungarian"
 msgstr "Hongaria"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumania"
+
 msgid "Indonesian"
 msgstr "Indonesia"
 
@@ -11628,6 +11859,9 @@ msgstr "Swedia"
 msgid "Swedish"
 msgstr "Swedia"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -12071,11 +12305,10 @@ msgstr "Simpan Gambar"
 msgid "Save Image"
 msgstr "Simpan Gambar"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Simpan Gambar..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Tampilkan senyuman kustom"
 
@@ -12163,9 +12396,6 @@ msgstr "Muka Huruf"
 msgid "Font Face"
 msgstr "Muka Huruf"
 
-msgid "Background Color"
-msgstr "Warna Latar Belakang"
-
 msgid "Foreground Color"
 msgstr "Warna Latar Depan"
 
@@ -12504,6 +12734,9 @@ msgstr "Tos pada Siapa"
 msgid "Pounce on Whom"
 msgstr "Tos pada Siapa"
 
+msgid "_Account:"
+msgstr "_Akun:"
+
 msgid "_Buddy name:"
 msgstr "_Nama Teman:"
 
@@ -12614,9 +12847,18 @@ msgstr "Peristiwa tos tak dikenal. Mohon
 msgid "Unknown.... Please report this!"
 msgstr "Peristiwa tos tak dikenal. Mohon laporkan ini!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Tema senyuman gagal dibuka."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Tema senyuman gagal dibuka."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Tema senyuman gagal dibuka."
+
 msgid "Install Theme"
 msgstr "Pasang Tema"
 
@@ -13192,6 +13434,10 @@ msgstr "Manajer Sertifikat"
 msgstr "Manajer Sertifikat"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Pilih Teman"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Gunakan _ikon teman ini untuk akun ini:"
 
@@ -13424,6 +13670,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Alamat Server"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Masukkan Server Konferensi"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Pilih server konferensi untuk dicari"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Layanan Online"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Kirim Daftar Teman"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Pergi menjauh"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Direktori Log"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Pilihan Suara"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Layanan PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Deskripsi"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Layani Info Temuan"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Pengguna tidak pernah ada"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server tidak menggunakan metode otentifikasi yang didukung"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Layani Info Temuan"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
+
 msgid "Buddy is idle"
 msgstr "Teman sedang diam"
 
@@ -13938,12 +14256,6 @@ msgstr ""
 "- Membalikkan semua teks masuk\n"
 "- Mengirim pesan kepada orang-orang di daftar anda begitu mereka bergabung"
 
-msgid "Cursor Color"
-msgstr "Warna Kursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Warna Kedua Kursor"
-
 msgid "Hyperlink Color"
 msgstr "Warna Hyperlink"
 
@@ -13955,6 +14267,10 @@ msgstr "Pesan-pesan yang Ditandai"
 msgid "Highlighted Message Name Color"
 msgstr "Pesan-pesan yang Ditandai"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Penghilangan Pemberitahuan"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Pemisah Horisontal GtkTreeView"
 
@@ -13984,35 +14300,24 @@ msgstr "Tema Tekx Shortcut GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema Tekx Shortcut GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Warna antarmuka"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Pemberitahuan email baru"
 
-msgid "Widget Sizes"
-msgstr "Ukuran Widget"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kontrol Tema GTK+ Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Tutup"
+
 msgid "Fonts"
 msgstr "Huruf"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Piranti Arsip Gtkrc"
 
@@ -14156,12 +14461,119 @@ msgstr ""
 "Mengganti teks dalam pesan yang dikirim menurut aturan yang didefinisikan "
 "pengguna."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Tidak ter-login"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Tidak ter-login"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Gabung Percakapan"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Acuhkan"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Lebih Keras"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Otorisasi Diberikan"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Kesalahan "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informasi"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Dialog Pengajuan"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Tingkat Peringatan"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status untuk %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Kamar Pengguna Lokal"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Simpan Ikon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kontrol Tema GTK+ Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Info Kontak"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Daftar Teman"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Daftar Teman"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kontrol Tema GTK+ Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kontrol Tema GTK+ Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Penanda Teman"
 
@@ -14366,6 +14778,21 @@ msgstr "Plugin ini berguna untuk debug s
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktifkan ID yang mana?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Warna Kursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Warna Kedua Kursor"
+
+#~ msgid "Interface colors"
+#~ msgstr "Warna antarmuka"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Ukuran Widget"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Masukkan dalam pesan"
@@ -14910,9 +15337,6 @@ msgstr "Plugin ini berguna untuk debug s
 #~ msgstr ""
 #~ "Permohonan anda untuk gabung kelompok %d telah diterima oleh admin %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Kelompok ini telah ditambahkan ke daftar teman anda"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Saya mengajukan untuk bergabung"
 
@@ -14934,9 +15358,6 @@ msgstr "Plugin ini berguna untuk debug s
 #~ msgid "Enter your reason:"
 #~ msgstr "Masukkan alasan anda:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Kesalahan dalam memohon token login"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Tidak dapat login, periksa log debug"
 
@@ -14990,9 +15411,6 @@ msgstr "Plugin ini berguna untuk debug s
 #~ "panggilan,  untuk teman ini. Nama alias akan ditampilkan pada tempat nama "
 #~ "layar asal memungkinkan.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "A_kun:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "_Nama layar:"
 
============================================================
--- po/it.po	970fc47204455f04563999140c2b28603a9c5cd0
+++ po/it.po	b89f228ac0981fd8cdad73bc9385898c9b062573
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-08-26 14:12+0100\n"
 "Last-Translator: Claudio Satriano <satriano at na.infn.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -1793,6 +1793,8 @@ msgstr "+++ %s si ? disconnesso"
 msgid "+++ %s signed off"
 msgstr "+++ %s si ? disconnesso"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -2201,6 +2203,10 @@ msgstr "(%s) %s <RISPOSTA AUTOMATICA>: %
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RISPOSTA AUTOMATICA>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Errore nella creazione della connessione"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Stai usando %s, ma questo plugin richiede %s."
@@ -3183,6 +3189,11 @@ msgstr "_Nome chat:"
 msgid "Chat _name:"
 msgstr "_Nome chat:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Impossibile connettersi al server."
+
 msgid "Chat error"
 msgstr "Errore nella chat"
 
@@ -3231,6 +3242,10 @@ msgstr "Utente Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Utente Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Imposta le informazioni utente..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando sconosciuto: %s"
@@ -3273,7 +3288,8 @@ msgstr "_Password:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "I nick IRC non devono contenere spazi bianchi"
 
 #. 1. connect to server
@@ -3753,6 +3769,9 @@ msgstr "Il server non usa nessun metodo 
 msgid "Server does not use any supported authentication method"
 msgstr "Il server non usa nessun metodo di autenticazione supportato"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Hai richiesto la criptatura, ma non ? disponibile su questo server."
+
 msgid "Invalid challenge from server"
 msgstr "Challenge non valido dal server"
 
@@ -4044,6 +4063,14 @@ msgstr "Risorsa"
 msgid "Resource"
 msgstr "Risorsa"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Connesso"
+
 msgid "Middle Name"
 msgstr "Secondo nome"
 
@@ -4210,9 +4237,18 @@ msgstr "Cerca stanze"
 msgid "Find Rooms"
 msgstr "Cerca stanze"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Hai richiesto la criptatura, ma non ? disponibile su questo server."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Non ? stato trovato nessun utente corrispondente"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Ruolo"
+
 msgid "Ping timeout"
 msgstr "Timeout per il ping"
 
@@ -4232,7 +4268,7 @@ msgstr "ID XMPP invalido. Deve essere im
 msgstr "ID XMPP invalido. Deve essere impostato il dominio."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Impossibile connettersi al server."
 
 #, c-format
@@ -4259,9 +4295,6 @@ msgstr "Rimozione dell'iscrizione fallit
 msgid "Unregistration Failed"
 msgstr "Rimozione dell'iscrizione fallita"
 
-msgid "Already Registered"
-msgstr "Gi? registrato"
-
 msgid "State"
 msgstr "Stato"
 
@@ -4274,6 +4307,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Gi? registrato"
+
 msgid "Unregister"
 msgstr "Rimuovi iscrizione"
 
@@ -4301,6 +4337,10 @@ msgstr "Modifica la registrazione"
 msgid "Change Registration"
 msgstr "Modifica la registrazione"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Impossibile connettersi al server."
+
 msgid "Error unregistering account"
 msgstr "Errore nella rimozione dell'account"
 
@@ -4667,16 +4707,18 @@ msgstr "ban &lt;utente&gt; [motivo]: All
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;utente&gt; [motivo]: Allontana un utente dalla stanza."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;utente&gt; &lt;owner|admin|member|outcast|none&gt;: Imposta "
 "un'affiliazione per l'utente nella stanza."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;utente&gt; &lt;moderator|participant|visitor|none&gt;: Imposta un "
 "ruolo per l'utente nella stanza."
@@ -4742,6 +4784,9 @@ msgstr "Server proxy per il trasferiment
 msgid "File transfer proxies"
 msgstr "Server proxy per il trasferimento file"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5144,6 +5189,12 @@ msgstr "Rimuovi lista"
 msgid "Non-IM Contacts"
 msgstr "Rimuovi lista"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non ? "
+"ancora supportata."
+
 msgid "Nudge"
 msgstr "Trillo"
 
@@ -5493,64 +5544,27 @@ msgstr "Autenticazione Windows Live ID: 
 msgstr "Autenticazione Windows Live ID: risposta non valida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s non ? un gruppo valido"
-
-msgid "Unknown error."
-msgstr "Errore sconosciuto."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s su %s: (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ti ha appena inviato un trillo!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Errore sconosciuto (%d)"
 
 msgid "Unable to add user"
 msgstr "Impossibile aggiungere l'utente"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Errore sconosciuto (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Ecco i risultati della tua ricerca"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Impossibile aggiungere l'utente su %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Impossibile bloccare l'utente su %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Impossibile autorizzare l'utente su %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s non pu? essere aggiunto perch? la tua lista contatti ? piena."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s non ? un profilo passport valido"
-
-msgid "Service Temporarily Unavailable."
-msgstr "Servizio temporaneamente non disponibile."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Il messaggio mobile non ? stato inviato perch? ? troppo lungo."
 
-msgid "Unable to rename group"
-msgstr "Impossibile rinominare il gruppo"
-
-msgid "Unable to delete group"
-msgstr "Impossibile cancellare il gruppo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5641,6 +5655,9 @@ msgstr ""
 "La tua lista contatti MSN ? temporaneamente non disponibile. Riprova pi? "
 "tardi."
 
+msgid "Unknown error."
+msgstr "Errore sconosciuto."
+
 msgid "Handshaking"
 msgstr "Handshake in corso"
 
@@ -5659,6 +5676,18 @@ msgstr "Ricezione della lista contatti i
 msgid "Retrieving buddy list"
 msgstr "Ricezione della lista contatti in corso"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non ? "
+"ancora supportata."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non ? "
+"ancora supportata."
+
 msgid "Away From Computer"
 msgstr "Lontano dal computer"
 
@@ -5704,14 +5733,6 @@ msgstr ""
 "Il messaggio potrebbe non essere stato inviato a causa di un errore "
 "sconosciuto:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ti ha aggiunto alla sua lista contatti."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ti ha rimosso dalla sua lista contatti."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Aggiungi alla rubrica"
@@ -5743,6 +5764,51 @@ msgstr "Plugin per il protocollo MSN"
 msgstr "Plugin per il protocollo MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s non ? un gruppo valido"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s su %s: (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Impossibile aggiungere l'utente su %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Impossibile bloccare l'utente su %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Impossibile autorizzare l'utente su %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s non pu? essere aggiunto perch? la tua lista contatti ? piena."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s non ? un profilo passport valido"
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servizio temporaneamente non disponibile."
+
+msgid "Unable to rename group"
+msgstr "Impossibile rinominare il gruppo"
+
+msgid "Unable to delete group"
+msgstr "Impossibile cancellare il gruppo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ti ha aggiunto alla sua lista contatti."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ti ha rimosso dalla sua lista contatti."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Utente inesistente: %s"
 
@@ -5778,6 +5844,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nuovi messaggi di posta"
 
@@ -5826,18 +5894,20 @@ msgstr "Errore di protocollo. Codice %d:
 msgid "Protocol error, code %d: %s"
 msgstr "Errore di protocollo. Codice %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s La tua password ? di %d caratteri, pi? grande della lunghezza massima "
 "attesa di %d per MySpaceIM. Accorcia la tua password, collegandoti su http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "e riprova."
 
+msgid "Incorrect username or password"
+msgstr "Password o nome utente non corretti"
+
 msgid "MySpaceIM Error"
 msgstr "Errore MySpaceIM"
 
@@ -6164,9 +6234,6 @@ msgstr "L'archivio principale non ? con
 msgid "Master archive is misconfigured"
 msgstr "L'archivio principale non ? configurato propriamente"
 
-msgid "Incorrect username or password"
-msgstr "Password o nome utente non corretti"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Impossibile riconoscere l'host del nome utente inserito"
 
@@ -6389,6 +6456,28 @@ msgstr "Porta del server"
 msgid "Server port"
 msgstr "Porta del server"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "? stata ricevuta da parte del server una risposta HTTP inattesa."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
+"riprova. Se continui a provare, avrai bisogno di aspettare ancora di pi?."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Errore nella risoluzione di %s"
+
+msgid "Incorrect password."
+msgstr "Password non corretta."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Impossibile entrare nella chat room"
 
@@ -6695,14 +6784,31 @@ msgstr ""
 "validi. In alternativa devono iniziare con una lettera e contenere solo "
 "lettere, numeri e spazi; oppure devono contenere solo numeri."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Impossibile ottenere un hash di login valido per AIM."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
+
+msgid "Unable to get a valid login hash."
+msgstr "Impossibile ottenere un hash di login valido."
+
+msgid "Could Not Connect"
+msgstr "Impossibile connettersi"
+
+msgid "Received authorization"
+msgstr "Autorizzazione ricevuta"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Nome utente non valido."
 
-msgid "Incorrect password."
-msgstr "Password non corretta."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Il tuo account ? attualmente sospeso."
@@ -6711,26 +6817,20 @@ msgstr "Il servizio AOL Instant Messenge
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Il servizio AOL Instant Messenger ? temporaneamente non disponibile."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
-"riprova. Se continui a provare, avrai bisogno di aspettare ancora di pi?."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versione del client che stai usando ? troppo vecchia. Aggiornala su %s"
 
-msgid "Could Not Connect"
-msgstr "Impossibile connettersi"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
+"riprova. Se continui a provare, avrai bisogno di aspettare ancora di pi?."
 
-msgid "Received authorization"
-msgstr "Autorizzazione ricevuta"
-
 msgid "The SecurID key entered is invalid."
 msgstr "La chiave SecurID immessa non ? valida."
 
@@ -6746,20 +6846,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Impossibile ottenere un hash di login valido per AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
-
-msgid "Unable to get a valid login hash."
-msgstr "Impossibile ottenere un hash di login valido."
-
 msgid "Password sent"
 msgstr "Password inviata"
 
@@ -7284,6 +7370,7 @@ msgstr "Imposta le informazioni utente (
 msgid "Set User Info (web)..."
 msgstr "Imposta le informazioni utente (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Cambia la password (web)"
 
@@ -7313,6 +7400,10 @@ msgstr "Cerca un contatto per informazio
 msgid "Search for Buddy by Information"
 msgstr "Cerca un contatto per informazione"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "L'utente non ? connesso"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9674,12 +9765,6 @@ msgstr "Dominio Auth"
 msgid "Auth Domain"
 msgstr "Dominio Auth"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non ? "
-"ancora supportata."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9707,6 +9792,44 @@ msgstr "Aggiungi un contatto rifiutato"
 msgid "Add buddy rejected"
 msgstr "Aggiungi un contatto rifiutato"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Ricevuti dati non validi durante la connessione con il server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Password non corretta"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
+"effettuando il login sul sito web di Yahoo!."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "L'utente non esiste"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
+"effettuando il login sul sito web di Yahoo!."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Password o nome utente non corretti"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9823,8 +9946,8 @@ msgstr "_Prima porta:"
 msgid "Start Doodling"
 msgstr "_Prima porta:"
 
-msgid "Activate which ID?"
-msgstr "Quale ID vuoi attivare?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "A chi vuoi unirti nella chat?"
@@ -10618,8 +10741,9 @@ msgstr "Aggiorna i campi necessari."
 msgid "Please update the necessary fields."
 msgstr "Aggiorna i campi necessari."
 
-msgid "Room _List"
-msgstr "_Lista delle stanze"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Account"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10627,8 +10751,8 @@ msgstr ""
 msgstr ""
 "Inserisci le informazioni appropriate per la chat nella quale vuoi entrare.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+msgid "Room _List"
+msgstr "_Lista delle stanze"
 
 msgid "_Block"
 msgstr "_Blocca"
@@ -11069,6 +11193,112 @@ msgstr "/Contatti/Ordina contatti"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contatti/Ordina contatti"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Colore dello sfondo"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Questo gruppo ? stato aggiunto alla tua lista dei contatti."
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Colore dello sfondo"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "M_assimizza"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Scegli il colore dello sfondo"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Minimizza"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Scegli il colore dello sfondo"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Scorciatoia"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Assente"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Non connesso"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Testo identificato"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Messaggio inviato"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Modifica le informazioni utente per %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Server SSL"
@@ -11576,6 +11806,10 @@ msgstr "Ungherese"
 msgid "Hungarian"
 msgstr "Ungherese"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumeno"
+
 msgid "Indonesian"
 msgstr "Indonesiano"
 
@@ -11674,6 +11908,9 @@ msgstr "Svedese"
 msgid "Swedish"
 msgstr "Svedese"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -12110,11 +12347,9 @@ msgstr "Salva l'immagine"
 msgid "Save Image"
 msgstr "Salva l'immagine"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Salva l'immagine..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Aggiungi uno smiley personalizzato..."
 
@@ -12204,9 +12439,6 @@ msgstr "Tipo di carattere"
 msgid "Font Face"
 msgstr "Tipo di carattere"
 
-msgid "Background Color"
-msgstr "Colore dello sfondo"
-
 msgid "Foreground Color"
 msgstr "Colore del carattere"
 
@@ -12540,6 +12772,9 @@ msgstr "Contatto da controllare"
 msgid "Pounce on Whom"
 msgstr "Contatto da controllare"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "Nome del _contatto:"
 
@@ -12650,9 +12885,18 @@ msgstr "Evento sconosciuto. Per piacere 
 msgid "Unknown.... Please report this!"
 msgstr "Evento sconosciuto. Per piacere riporta questo errore!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Impossibile spacchettare il tema degli smiley."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Impossibile spacchettare il tema degli smiley."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Impossibile spacchettare il tema degli smiley."
+
 msgid "Install Theme"
 msgstr "Installa tema"
 
@@ -13220,6 +13464,10 @@ msgstr "Gestione degli smiley personaliz
 msgstr "Gestione degli smiley personalizzati"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Seleziona il contatto"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Utilizza per questo account la seguente _icona:"
 
@@ -13447,6 +13695,79 @@ msgstr "Mostra informazioni statistiche 
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Mostra informazioni statistiche sulla disponibilit? dei tuoi contatti"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Indirizzo del server"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Inserisci il nome del server per le conferenze"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Scegli un server per le conferenze al quale connettersi"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Servizi on line"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Invia la lista contatti"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "? assente"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Percorso dei log"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Scegli un suono"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Servizio non disponibile"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Descrizione"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "/Conversazione/_Info"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "L'utente non esiste"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Il server non usa nessun metodo di autenticazione supportato"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "/Conversazione/_Info"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Questo plugin ? utile per effettuare il debug dei server o dei client XMPP."
+
 msgid "Buddy is idle"
 msgstr "Il contatto ? inattivo"
 
@@ -13964,12 +14285,6 @@ msgstr ""
 "- Inverte il testo dei messaggi in arrivo\n"
 "- Invia un messaggio ai tuoi contatti non appena questi si connettono"
 
-msgid "Cursor Color"
-msgstr "Colore del cursore"
-
-msgid "Secondary Cursor Color"
-msgstr "Colore per il cursore secondario"
-
 msgid "Hyperlink Color"
 msgstr "Colore per i collegamenti"
 
@@ -13982,6 +14297,10 @@ msgstr "Messaggi evidenziati"
 msgstr "Messaggi evidenziati"
 
 #, fuzzy
+msgid "Typing Notification Color"
+msgstr "Colore per la notifica di scrittura"
+
+#, fuzzy
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Una versione a scorrimento orizzontale della lista contatti."
 
@@ -14012,35 +14331,24 @@ msgstr "Controllo del tema GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Controllo del tema GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Colori dell'interfaccia"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Abilita la notifica di scrittura"
 
-msgid "Widget Sizes"
-msgstr "Dimensioni dei widget"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Controllo del tema GTK+ per Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Chiudi"
+
 msgid "Fonts"
 msgstr "Caratteri"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Strumenti per il file gtkrc"
 
@@ -14186,12 +14494,119 @@ msgstr ""
 "Sostituisce il testo nei messaggi in uscita secondo delle regole definite "
 "dall'utente."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Non connesso"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Non connesso"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Entra in chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignora"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Pi? alto"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizzazione concessa"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Errore"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informazione"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Finestra di richiesta"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Livello di richiamo"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Stato per %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Lingua della chat room"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Salva l'icona"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Controllo del tema GTK+ per Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informazioni sul contatto"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lista contatti"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista contatti"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Controllo del tema GTK+ per Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Controllo del tema GTK+ per Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Ticker contatti"
 
@@ -14398,6 +14813,21 @@ msgstr ""
 msgstr ""
 "Questo plugin ? utile per effettuare il debug dei server o dei client XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Quale ID vuoi attivare?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Colore del cursore"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Colore per il cursore secondario"
+
+#~ msgid "Interface colors"
+#~ msgstr "Colori dell'interfaccia"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Dimensioni dei widget"
+
 #~ msgid "Invite message"
 #~ msgstr "Messaggio di invito"
 
@@ -14852,9 +15282,6 @@ msgstr ""
 #~ "La tua richiesta di entrare nel gruppo %d ? stata approvata "
 #~ "dall'amministratore %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Questo gruppo ? stato aggiunto alla tua lista dei contatti."
-
 #~ msgid "I am applying to join"
 #~ msgstr "Ho richiesto di entrare"
 
============================================================
--- po/ja.po	fd5bb18fe773d91a2db6200a6f776c20ef9ac8a7
+++ po/ja.po	1441271ead0dec80dc1535f67378f707353b7898
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-06-30 14:57+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana at gmail.com>\n"
 "Language-Team: Japanese <gnome-translation at gnome.gr.jp>\n"
@@ -1801,6 +1801,8 @@ msgstr "+++ %s ?????????msgid "+++ %s signed off"
 msgstr "+++ %s ??????????????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????????"
 
@@ -2203,6 +2205,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "????????????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s ??????????????????? %s ??????"
@@ -3175,6 +3181,11 @@ msgstr "?????(_N):"
 msgid "Chat _name:"
 msgstr "?????(_N):"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "???????????"
+
 msgid "Chat error"
 msgstr "????????"
 
@@ -3223,6 +3234,10 @@ msgstr "Gadu-Gadu ???"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ???"
 
+#, fuzzy
+msgid "GG server"
+msgstr "?????????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "???????: %s"
@@ -3265,7 +3280,8 @@ msgstr "?????(_P):"
 msgid "_Password:"
 msgstr "?????(_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ??????????????????????????"
 
 #. 1. connect to server
@@ -3749,6 +3765,9 @@ msgstr "??????????? msgid "Server does not use any supported authentication method"
 msgstr "???????????????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "????????? challenge ??"
 
@@ -4048,6 +4067,14 @@ msgstr "????"
 msgid "Resource"
 msgstr "????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???????????"
+
 msgid "Middle Name"
 msgstr "???????"
 
@@ -4216,10 +4243,19 @@ msgstr "?????"
 msgid "Find Rooms"
 msgstr "?????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "??????????????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "???????"
 
@@ -4239,7 +4275,7 @@ msgstr "XMPP ID ????????
 msgstr "XMPP ID ???????? (????????????)"
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "??????????????"
 
 #, c-format
@@ -4268,9 +4304,6 @@ msgstr "?????"
 msgid "Unregistration Failed"
 msgstr "?????"
 
-msgid "Already Registered"
-msgstr "??????????"
-
 msgid "State"
 msgstr "?"
 
@@ -4283,6 +4316,9 @@ msgstr "??"
 msgid "Date"
 msgstr "??"
 
+msgid "Already Registered"
+msgstr "??????????"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "??"
@@ -4314,6 +4350,10 @@ msgstr "?????"
 msgstr "?????"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "??????????????"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "????????????"
 
@@ -4693,16 +4733,18 @@ msgstr ""
 "ban &lt;???&gt; [???]:  ???????????????????????"
 "?"
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;???&gt; &lt;owner|admin|member|outcast|none&gt;: ?????"
 "????????"
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;???&gt; &lt;moderator|participant|visitor|none&gt;: ??????"
 "???????????"
@@ -4771,6 +4813,9 @@ msgstr "??????????? msgid "File transfer proxies"
 msgstr "????????????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5182,6 +5227,10 @@ msgstr "????????"
 msgid "Non-IM Contacts"
 msgstr "????????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5542,65 +5591,28 @@ msgstr "??: ????????
 msgstr "??: ?????????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ???????????????"
-
-msgid "Unknown error."
-msgstr "??????????"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s (%3$s) ? %1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ???????????????!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "????????"
 
 msgid "Unable to add user"
 msgstr "???????????"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "????????"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "??????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) ????????????"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) ??????????????"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) ????????????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "????????????%s ?????????????"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ???????????????????????"
-
-msgid "Service Temporarily Unavailable."
-msgstr "????????????????"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "?????????????????????????????????:"
 
-msgid "Unable to rename group"
-msgstr "?????????????"
-
-msgid "Unable to delete group"
-msgstr "????????????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5688,6 +5700,9 @@ msgstr ""
 "???? MSN ????????????????????????????????"
 "???????"
 
+msgid "Unknown error."
+msgstr "??????????"
+
 msgid "Handshaking"
 msgstr "??????????"
 
@@ -5706,6 +5721,14 @@ msgstr "??????????? msgid "Retrieving buddy list"
 msgstr "?????????????"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "?????????????"
 
@@ -5745,14 +5768,6 @@ msgstr "??????????? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????????????????????????????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ????????????????????"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ?????????????????????"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "??????????"
@@ -5785,6 +5800,51 @@ msgstr "MSN ??????????msgstr "MSN ???????????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ???????????????"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s (%3$s) ? %1$s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) ????????????"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) ??????????????"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) ????????????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "????????????%s ?????????????"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ???????????????????????"
+
+msgid "Service Temporarily Unavailable."
+msgstr "????????????????"
+
+msgid "Unable to rename group"
+msgstr "?????????????"
+
+msgid "Unable to delete group"
+msgstr "????????????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ????????????????????"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ?????????????????????"
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5821,6 +5881,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "??????????"
@@ -5870,12 +5932,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "??????????????????????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6217,10 +6282,6 @@ msgstr "??????????? msgstr "?????????????????????"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "??????????????????????"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "?????????????????????????"
 
@@ -6434,6 +6495,28 @@ msgstr "???????"
 msgstr "???????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "????????? HTTP ??????????"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"????????????????10 ?????????????????????"
+"???????????????????????????"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "????????????"
+
+msgid "Incorrect password."
+msgstr "??????????????"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "??????????"
 
@@ -6737,15 +6820,32 @@ msgstr ""
 "??????????????????????????????????????"
 "???????????"
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "?????????????????????%s ???????????"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "??? AIM ????? hash ??????????????????"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "?????????????????????%s ???????????"
+
+msgid "Unable to get a valid login hash."
+msgstr "???????? hash ?????????????"
+
+msgid "Could Not Connect"
+msgstr "??????????"
+
+msgid "Received authorization"
+msgstr "?????????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "??????????"
 
-msgid "Incorrect password."
-msgstr "??????????????"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "?????????????????"
@@ -6754,25 +6854,19 @@ msgstr "AOL ??????????msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL ??????????????????????????????"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "???????????????????%s ??????????????"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "????????????????10 ?????????????????????"
 "???????????????????????????"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "???????????????????%s ??????????????"
-
-msgid "Could Not Connect"
-msgstr "??????????"
-
-msgid "Received authorization"
-msgstr "?????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???????? ID ???????"
 
@@ -6788,20 +6882,6 @@ msgstr "OK(_O)"
 msgid "_OK"
 msgstr "OK(_O)"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "?????????????????????%s ???????????"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "??? AIM ????? hash ??????????????????"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "?????????????????????%s ???????????"
-
-msgid "Unable to get a valid login hash."
-msgstr "???????? hash ?????????????"
-
 msgid "Password sent"
 msgstr "?????????"
 
@@ -7315,6 +7395,7 @@ msgstr "?????????(URL)
 msgid "Set User Info (web)..."
 msgstr "?????????(URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "??????? (URL)"
@@ -7347,6 +7428,10 @@ msgstr "????????..."
 msgstr "????????..."
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "??????????????"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9689,10 +9774,6 @@ msgstr "??????"
 msgid "Auth Domain"
 msgstr "??????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9719,6 +9800,44 @@ msgstr "?????????"
 msgid "Add buddy rejected"
 msgstr "?????????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "????????????????????????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "?????????????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"???????? %d ???Yahoo! ??????????????????????"
+"?????"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "????????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"???????? %d ???Yahoo! ??????????????????????"
+"?????"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??????????????????????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9834,9 +9953,8 @@ msgstr "????????"
 msgid "Start Doodling"
 msgstr "????????"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "?? ID ?????????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "??????????????"
@@ -10639,16 +10757,17 @@ msgstr "??????????? msgstr "?????????????"
 
 #, fuzzy
-msgid "Room _List"
-msgstr "??????"
+msgid "A_ccount"
+msgstr "?????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "??????????????????????????\n"
 
-msgid "_Account:"
-msgstr "?????(_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "??????"
 
 msgid "_Block"
 msgstr "????(_B)"
@@ -11112,6 +11231,113 @@ msgstr "/??/???????"
 msgid "/Buddies/Sort Buddies"
 msgstr "/??/???????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "?????????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "?????????????????????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "?????????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "???(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "??(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "???"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "????????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ?????????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11621,6 +11847,10 @@ msgstr "??????"
 msgid "Hungarian"
 msgstr "??????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "??????"
+
 msgid "Indonesian"
 msgstr "???????"
 
@@ -11722,6 +11952,9 @@ msgstr "???????"
 msgid "Swedish"
 msgstr "???????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "????"
 
@@ -12166,11 +12399,10 @@ msgstr "?????"
 msgid "Save Image"
 msgstr "?????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "?????(_S)..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "?????????????"
 
@@ -12261,10 +12493,6 @@ msgstr "??????????? msgstr "?????????????"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "?????????"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "?????????????"
 
@@ -12620,6 +12848,9 @@ msgstr "??????????? msgid "Pounce on Whom"
 msgstr "??????????????..."
 
+msgid "_Account:"
+msgstr "?????(_A):"
+
 msgid "_Buddy name:"
 msgstr "?????(_B):"
 
@@ -12730,9 +12961,18 @@ msgstr "??? \"???\" ??? msgid "Unknown.... Please report this!"
 msgstr "??? \"???\" ??????????????????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "????????????????????"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "????????????????????"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "????????????????????"
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13311,6 +13551,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "?????"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "?????????????(_I):"
 
@@ -13543,6 +13787,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "????????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??????????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "??????????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "????????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "???????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "???????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "??"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?????????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "????(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "????????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???????????????????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?????????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"??? XMPP ???????????????????????????????"
+
 msgid "Buddy is idle"
 msgstr "??????"
 
@@ -14043,12 +14359,6 @@ msgstr ""
 "- ?????????????????\n"
 "- ?????????????????????????????????"
 
-msgid "Cursor Color"
-msgstr "??????"
-
-msgid "Secondary Cursor Color"
-msgstr "??????????"
-
 msgid "Hyperlink Color"
 msgstr "?????????"
 
@@ -14060,6 +14370,10 @@ msgstr "??????????? msgid "Highlighted Message Name Color"
 msgstr "???????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "?????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ???????????"
 
@@ -14089,35 +14403,24 @@ msgstr "GTK+ ?????????
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ????????????????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "?????????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??????????"
 
-msgid "Widget Sizes"
-msgstr "?????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "GTK+ ??????????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "???"
+
 msgid "Fonts"
 msgstr "????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -14258,12 +14561,119 @@ msgstr "??????????? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "??????????????????????????????????"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "??????????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "??????????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "??????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "???????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "???"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "??????????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "?????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ???"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "???????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "GTK+ ??????????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "??????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "GTK+ ??????????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "GTK+ ??????????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "?????"
 
@@ -14470,6 +14880,22 @@ msgstr ""
 "??? XMPP ???????????????????????????????"
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "?? ID ?????????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "??????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??????????"
+
+#~ msgid "Interface colors"
+#~ msgstr "?????????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "?????????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "????????????"
 
@@ -14990,9 +15416,6 @@ msgstr ""
 #~ msgstr ""
 #~ "???? %d ??????????????? %d ???????????"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "?????????????????????"
-
 #~ msgid "I am applying to join"
 #~ msgstr "I am applying to join"
 
@@ -15017,10 +15440,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "??????????:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "????????????"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "????????? (???????????????)"
 
@@ -15146,10 +15565,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "?????(_M):"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "?????:"
-
 #~ msgid "Commands are not supported yet. Message was NOT sent."
 #~ msgstr "????????????????? (???????????????)"
 
============================================================
--- po/ka.po	2ad41f69403e4a4c4d3d7be97888adbbcaf242e3
+++ po/ka.po	cf62f47bf349eff67580a6f786314c6561f2a957
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0 CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2006-02-05 23:19+0100\n"
 "Last-Translator: Ubuntu Georgian Translators <>\n"
 "Language-Team: Georgian <ka at li.org>\n"
@@ -1811,6 +1811,8 @@ msgstr "+++ %s ?????? ??
 msgid "+++ %s signed off"
 msgstr "+++ %s ?????? ????????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "?????? ???????"
 
@@ -2191,6 +2193,10 @@ msgstr "(%s) %s <????-????msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????-??????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??? ????? ???????????? (%s)."
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3155,6 +3161,11 @@ msgstr "????? _?????
 msgid "Chat _name:"
 msgstr "????? _??????:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "??????????? ????????? ???????????"
+
 msgid "Chat error"
 msgstr "????? ???????"
 
@@ -3204,6 +3215,10 @@ msgstr "Gadu-Gadu ????????msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ????????????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???????????? ??????????? ??????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?????? ????????: %s"
@@ -3248,7 +3263,7 @@ msgstr "_??????:"
 msgid "_Password:"
 msgstr "_??????:"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3685,6 +3700,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3975,6 +3993,14 @@ msgstr "???????"
 msgid "Resource"
 msgstr "???????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?????????????"
+
 msgid "Middle Name"
 msgstr "??????? ??????"
 
@@ -4143,10 +4169,19 @@ msgstr "????? ??????msgid "Find Rooms"
 msgstr "????? ???????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "????????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "??? ?????? ???????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "????"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "??????"
 
@@ -4167,7 +4202,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "??????????? ????????? ???????????"
 
 #, c-format
@@ -4196,9 +4231,6 @@ msgstr "??????????? msgid "Unregistration Failed"
 msgstr "??????????? ??? ????????"
 
-msgid "Already Registered"
-msgstr "???? ????????????????"
-
 #, fuzzy
 msgid "State"
 msgstr "???????????"
@@ -4213,6 +4245,9 @@ msgstr "??????"
 msgid "Date"
 msgstr "??????"
 
+msgid "Already Registered"
+msgstr "???? ????????????????"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "????????????"
@@ -4244,6 +4279,10 @@ msgstr "??????????? msgstr "???????????? ???????"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "??????????? ????????? ???????????"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "??????? ???????? ??????????"
 
@@ -4626,13 +4665,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4696,6 +4735,9 @@ msgstr "???????? ???msgid "File transfer proxies"
 msgstr "???????? ??????????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5097,6 +5139,10 @@ msgstr "???????? ???msgid "Non-IM Contacts"
 msgstr "???????? ?????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5461,64 +5507,27 @@ msgstr "??????????? msgid "Windows Live ID authentication:Invalid response"
 msgstr "??????????? ???????????? ??????? ??? ????????!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr "?????? ???????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "???????????? ????????"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "?????? ???????"
 
 msgid "Unable to add user"
 msgstr ""
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "?????? ???????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr "??????? ??????? ????????????."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr "??? ????? ?????? ??????"
-
-msgid "Unable to delete group"
-msgstr "??? ???? ?????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5588,6 +5597,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "?????? ???????."
+
 msgid "Handshaking"
 msgstr "?????????"
 
@@ -5606,6 +5618,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "?????????????? ??????"
 
@@ -5642,14 +5662,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "???????????? ?????? ????????"
@@ -5681,6 +5693,51 @@ msgstr "AIM/ICQ ????????
 msgstr "AIM/ICQ ?????????? ???????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr "??????? ??????? ????????????."
+
+msgid "Unable to rename group"
+msgstr "??? ????? ?????? ??????"
+
+msgid "Unable to delete group"
+msgstr "??? ???? ?????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5715,6 +5772,8 @@ msgstr "?? ??? ?????
 msgstr "?? ??? ????????????? ?????????."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "???????????? ????????"
@@ -5763,12 +5822,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "????????? ????????? ?? ??????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6102,10 +6164,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "????????? ????????? ?? ??????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6306,6 +6364,26 @@ msgstr "???????-????msgstr "???????-?????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "???????? ???????? ??????"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "??????? ????????? ???????????"
+
+msgid "Incorrect password."
+msgstr "???????? ??????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "??? ????????????"
 
@@ -6598,15 +6676,34 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "??? ????????? ????? %s."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "??? ????????? ????? %s."
+
+msgid "Could Not Connect"
+msgstr "??? ????????????"
+
+msgid "Received authorization"
+msgstr "?????? ???????????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "????????"
 
-msgid "Incorrect password."
-msgstr "???????? ??????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6615,23 +6712,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr "??? ????????????"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr "?????? ???????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6648,22 +6738,6 @@ msgstr "OK"
 msgid "_OK"
 msgstr "OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "??? ????????? ????? %s."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "??? ????????? ????? %s."
-
 msgid "Password sent"
 msgstr "?????? ???????????"
 
@@ -7108,6 +7182,7 @@ msgstr "??????????? msgid "Set User Info (web)..."
 msgstr "???????????? ??????????? ?????? (URL)"
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "??????? ?????? (URL)"
@@ -7138,6 +7213,10 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "???????????? ?? ???? ?????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9421,10 +9500,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9448,6 +9523,38 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "??????????? ????????? ???????????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "???????? ??????."
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "???????????? ?? ????????"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "????????? ????????? ?? ??????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9549,7 +9656,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -10313,16 +10420,17 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "???????? ???"
+msgid "A_ccount"
+msgstr "????????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "_????????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "???????? ???"
 
 msgid "_Block"
 msgstr "_?????????"
@@ -10789,6 +10897,110 @@ msgstr "/?????????/?
 msgid "/Buddies/Sort Buddies"
 msgstr "/?????????/?????????? ?????????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "????? ????"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "??????? ???????????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????? ????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????? ????? ??????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????? ????? ??????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?????? ????????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "????????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "??????????? ???????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "??????????? ?????? %s ?????????????????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11315,6 +11527,10 @@ msgstr "???????"
 msgstr "???????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "????????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "???????????"
 
@@ -11420,6 +11636,9 @@ msgstr "???????"
 msgid "Swedish"
 msgstr "???????"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "????????"
@@ -11844,11 +12063,9 @@ msgstr "??????? ????msgid "Save Image"
 msgstr "??????? ???????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "??????? ???????...."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11936,10 +12153,6 @@ msgstr "?????"
 msgstr "?????"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "????? ????"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "?????? ????"
 
@@ -12247,6 +12460,9 @@ msgstr ""
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_????????:"
+
 msgid "_Buddy name:"
 msgstr "_???????? ??????:"
 
@@ -12357,9 +12573,16 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "??????????? ?????? ?????"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12940,6 +13163,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "?????? ??????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13165,6 +13392,75 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "???????? ?????????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "????????? ?????????????? ???????"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "????? ?????????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "?????????? ???"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??????? ???????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "?????????????? ??????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "???? ??????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>??????:</b> Spooky"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "???????????? ?? ????????"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Jabber"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "???????????? ???????????"
 
@@ -13665,12 +13961,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr "???????? ????"
-
-msgid "Secondary Cursor Color"
-msgstr "??????? ???????? ????"
-
 msgid "Hyperlink Color"
 msgstr "?????? ????"
 
@@ -13682,6 +13972,10 @@ msgstr "??????????? msgid "Highlighted Message Name Color"
 msgstr "???????????? ????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "????? ??.?????? ?????????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13715,36 +14009,23 @@ msgstr "?????? ?????msgid "GTK+ Text Shortcut Theme"
 msgstr "?????? ?????????? ?????????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "??????????? ??????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "????? ??.?????? ?????????????"
 
+msgid "GTK+ Theme Control Settings"
+msgstr ""
+
 #, fuzzy
-msgid "Widget Sizes"
-msgstr "Widget ??????"
+msgid "Colors"
+msgstr "???????"
 
 msgid "Fonts"
 msgstr "???????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin - ?? ????????????"
@@ -13881,12 +14162,115 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???????????? ?? ???? ?????"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???????? ??????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "??????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "?????????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "??????????? ?????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "???????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "?????????? ?????????? ???????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "???????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "???????? ????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "???????"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "??????? ???????"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "?????????? ????????? ???????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????????? ???"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????????? ???"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin-?? ????????????"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -14090,7 +14474,20 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cursor Color"
+#~ msgstr "???????? ????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??????? ???????? ????"
+
+#~ msgid "Interface colors"
+#~ msgstr "??????????? ??????"
+
 #, fuzzy
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget ??????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "??????? ????? ???????????"
 
@@ -14259,10 +14656,6 @@ msgstr ""
 #~ msgstr "??????? ???????"
 
 #, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "Jabber"
-
-#, fuzzy
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
@@ -14339,10 +14732,6 @@ msgstr ""
 #~ msgstr "???????????? ???????"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "??????? ????????? ???????????"
-
-#, fuzzy
 #~ msgid "TCP Address"
 #~ msgstr "IP ?????????"
 
@@ -14410,10 +14799,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_???????????:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "????????:"
-
 #~ msgid "TCP port"
 #~ msgstr "TCP ?????"
 
@@ -14486,13 +14871,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>??????:</b> Spooky"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -14562,9 +14940,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>???????:</b> %s"
 
-#~ msgid "Pidgin User"
-#~ msgstr "Pidgin-?? ????????????"
-
 #~ msgid "Invalid Jabber ID"
 #~ msgstr "???????? Jabber ID"
 
============================================================
--- po/km.po	c4b9414b0f2f78576ca3dea05d6ffcd111d891d9
+++ po/km.po	6df632b182a2afe847b9bf48546a0f1d6884bd66
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-25 11:49+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
@@ -1740,6 +1740,8 @@ msgstr "+++ %s ??????"
 msgid "+++ %s signed off"
 msgstr "+++ %s ??????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "??????????????"
 
@@ -2124,6 +2126,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?????????????????????????????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "????????????? %s ????????????????????????????? %s ?"
@@ -3079,6 +3085,11 @@ msgstr "?????????? msgid "Chat _name:"
 msgstr "???????????? ?"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "???????????????????????????????????? ?"
+
 msgid "Chat error"
 msgstr "?????????????????"
 
@@ -3127,6 +3138,10 @@ msgstr "???????? Gadu
 msgid "Gadu-Gadu User"
 msgstr "???????? Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??????????????"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "??????????????????? ? %s"
@@ -3169,7 +3184,8 @@ msgstr "???????? msgid "_Password:"
 msgstr "???????????? ?"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "????????? IRC ???????????????"
 
 #. 1. connect to server
@@ -3633,6 +3649,9 @@ msgstr "??????????? msgid "Server does not use any supported authentication method"
 msgstr "?????????????????????????????????????????????????????????????????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "???????????????????????? ????????????????????????????????????????? ?"
+
 msgid "Invalid challenge from server"
 msgstr "??????????????????????????????????????"
 
@@ -3901,6 +3920,14 @@ msgstr "?????"
 msgid "Resource"
 msgstr "?????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "??????"
+
 msgid "Middle Name"
 msgstr "???????????"
 
@@ -4067,9 +4094,18 @@ msgstr "????????"
 msgid "Find Rooms"
 msgstr "????????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "???????????????????????? ????????????????????????????????????????? ?"
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??????????????? ?"
 
+#, fuzzy
+msgid "No users found"
+msgstr "?????????????????????????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??????"
+
 msgid "Ping timeout"
 msgstr "Ping ??????"
 
@@ -4089,7 +4125,7 @@ msgstr "?????????? X
 msgstr "?????????? XMPP ????????????? ? ?????????????????? ?"
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?????????????????????????????????????? ?"
 
 #, c-format
@@ -4116,9 +4152,6 @@ msgstr "?????????? msgid "Unregistration Failed"
 msgstr "???????????????????????????????"
 
-msgid "Already Registered"
-msgstr "?????????????????"
-
 msgid "State"
 msgstr "????????"
 
@@ -4131,6 +4164,9 @@ msgstr "????????? msgid "Date"
 msgstr "???????????"
 
+msgid "Already Registered"
+msgstr "?????????????????"
+
 msgid "Unregister"
 msgstr "???????????"
 
@@ -4158,6 +4194,10 @@ msgstr "?????????? msgid "Change Registration"
 msgstr "??????????????????????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?????????????????????????????????????? ?"
+
 msgid "Error unregistering account"
 msgstr "???????????????????????????????"
 
@@ -4520,16 +4560,18 @@ msgstr "??????? &lt;??
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "??????? &lt;????????&gt; [??????] ?  ??????????????????????? ?"
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "?????? &lt;????????&gt; &lt;??????|?????????????|??????|outcast|?????&gt; ? ???????????????"
 "?????????????????????????? ?"
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "?????? &lt;????????&gt; &lt;?????????????|??????????|??????????|?????&gt; ? ???????????????????"
 "????????????????? ?"
@@ -4591,6 +4633,9 @@ msgstr "?????????? msgid "File transfer proxies"
 msgstr "?????????????????????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4983,6 +5028,10 @@ msgstr "??????????? msgid "Non-IM Contacts"
 msgstr "????????????????????? IM"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ???????????????????????????????????????????? ??????????????????????????? ?"
+
 msgid "Nudge"
 msgstr "?????"
 
@@ -5322,63 +5371,26 @@ msgstr "?????????? msgstr "??????????????????????????????????????????? Windows Live ? ???????????????????????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ????????????????????????? ?"
-
-msgid "Unknown error."
-msgstr "?????????????? ?"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ???? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ???????????????????????????????????? !"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "?????????????? (%d)"
 
 msgid "Unable to add user"
 msgstr "?????????????????????????"
 
-msgid "The following users are missing from your addressbook"
-msgstr "???????????????????????????????????????????????"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "???????????????????????? %s (%s) ?????"
+msgid "Unknown error (%d)"
+msgstr "?????????????? (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "??????????????????????????? %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "???????????????????????????????????????????????"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "?????????????????????????? %s (%s) ?????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ????????????????????????? ????????????????????????????????????? ?"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ???????????????????????????????????? ?"
-
-msgid "Service Temporarily Unavailable."
-msgstr "??????????????????????????????? ?"
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "???????????????????????? ???????????????? ?"
 
-msgid "Unable to rename group"
-msgstr "??????????????????????????"
-
-msgid "Unable to delete group"
-msgstr "???????????????????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5456,6 +5468,9 @@ msgstr "????????? "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "??????????????????????? MSN ??????????????????????????? ? ????????? ????????????????? ?"
 
+msgid "Unknown error."
+msgstr "?????????????? ?"
+
 msgid "Handshaking"
 msgstr "?????????"
 
@@ -5474,6 +5489,14 @@ msgstr "????????? msgid "Retrieving buddy list"
 msgstr "???????????????????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ???????????????????????????????????????????? ??????????????????????????? ?"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ???????????????????????????????????????????? ??????????????????????????? ?"
+
 msgid "Away From Computer"
 msgstr "????????????????????"
 
@@ -5512,14 +5535,6 @@ msgstr "???????? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "??????????????????? ???????????????????????????????????? ?"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?????????????????????????????????????????? ?"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ????????????????????????????????????? ?"
-
 msgid "Delete Buddy from Address Book?"
 msgstr "????????????????????????????? ?"
 
@@ -5549,6 +5564,51 @@ msgstr "?????????? msgstr "???????????????????????? MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ????????????????????????? ?"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ???? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "???????????????????????? %s (%s) ?????"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "??????????????????????????? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "?????????????????????????? %s (%s) ?????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ????????????????????????? ????????????????????????????????????? ?"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ???????????????????????????????????? ?"
+
+msgid "Service Temporarily Unavailable."
+msgstr "??????????????????????????????? ?"
+
+msgid "Unable to rename group"
+msgstr "??????????????????????????"
+
+msgid "Unable to delete group"
+msgstr "???????????????????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?????????????????????????????????????????? ?"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ????????????????????????????????????? ?"
+
+#, c-format
 msgid "No such user: %s"
 msgstr "????????????????????? ? %s"
 
@@ -5577,6 +5637,8 @@ msgstr "?????????? msgstr "??????????????????????????????????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "??????????????"
 
@@ -5622,17 +5684,19 @@ msgstr "?????????? msgid "Protocol error, code %d: %s"
 msgstr "???????????? ??? %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s ??????????????????????? %d ??????? ???????????????????????????????????? %d ??????? "
 "MySpaceIM ? ???????????????????????????????????? http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings ? ??????????????????????? ????????????????? ?"
 
+msgid "Incorrect username or password"
+msgstr "????????????? ??????????????????????????"
+
 msgid "MySpaceIM Error"
 msgstr "????? MySpaceIM"
 
@@ -5948,9 +6012,6 @@ msgstr "?????????? msgid "Master archive is misconfigured"
 msgstr "?????????????? misconfigured"
 
-msgid "Incorrect username or password"
-msgstr "????????????? ??????????????????????????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "??????????????????????????????????????????????????"
 
@@ -6155,6 +6216,28 @@ msgstr "?????????? msgid "Server port"
 msgstr "????????????????"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "????????????????? HTTP ?????????????? ?"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"???????????????????????? ???????????????????? ? ????????????? ????????????????? ? ????????????????"
+"????????????? ??????????????????????????? ?"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "????????????????????? %s"
+
+msgid "Incorrect password."
+msgstr "????????????????????????? ?"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "????????????????????????????????"
 
@@ -6454,14 +6537,32 @@ msgstr ""
 "?????????????? ? ??????????? %s ????????????????????????????????? ? ???????????????????????????"
 "?????? ?????????????????? ????????????? ??? ????????? ????????? ?"
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"???????????????????????????????????????????? ? ?????????????????? ????????????????????? %s ?"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "???????????????? AIM ???????????? ?"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "???????????????????????????????????????????? ? ????????????????????? %s ?"
+
+msgid "Unable to get a valid login hash."
+msgstr "??????????????????????????????? ?"
+
+msgid "Could Not Connect"
+msgstr "??????????????????"
+
+msgid "Received authorization"
+msgstr "??????????????????????????????????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "?????????????????????????? ?"
 
-msgid "Incorrect password."
-msgstr "????????????????????????? ?"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "???????????????????????????????????? ?"
@@ -6470,25 +6571,19 @@ msgstr "?????????? msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????????????????????????? AOL ??????????????????????? ?"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "??????????????????????????????????????? ? ?????????????????? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "???????????????????????? ???????????????????? ? ????????????? ????????????????? ? ????????????????"
 "????????????? ??????????????????????????? ?"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "??????????????????????????????????????? ? ?????????????????? %s"
-
-msgid "Could Not Connect"
-msgstr "??????????????????"
-
-msgid "Received authorization"
-msgstr "??????????????????????????????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "?? SecurID ????????????????????????? ?"
 
@@ -6504,21 +6599,6 @@ msgstr "???????"
 msgid "_OK"
 msgstr "???????"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"???????????????????????????????????????????? ? ?????????????????? ????????????????????? %s ?"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "???????????????? AIM ???????????? ?"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "???????????????????????????????????????????? ? ????????????????????? %s ?"
-
-msgid "Unable to get a valid login hash."
-msgstr "??????????????????????????????? ?"
-
 msgid "Password sent"
 msgstr "???????????????????"
 
@@ -6992,6 +7072,7 @@ msgstr "?????????? msgid "Set User Info (web)..."
 msgstr "???????????????????????? (??????)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "??????????????????????? (??????)"
 
@@ -7021,6 +7102,10 @@ msgstr "?????????? msgid "Search for Buddy by Information"
 msgstr "???????????????????????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "???????????????????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9254,10 +9339,6 @@ msgstr "??????????? msgid "Auth Domain"
 msgstr "??????????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ???????????????????????????????????????????? ??????????????????????????? ?"
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9283,6 +9364,40 @@ msgstr "?????????? msgid "Add buddy rejected"
 msgstr "??????????????????????????????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "??????????????????????????????????????????????????????????? ? "
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "?????????????????????????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "????????????????? %d ? ??????????????????? ! ?????????????? ?"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "????????????????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "????????????????? %d ? ??????????????????? ! ?????????????? ?"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "????????????? ??????????????????????????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9391,8 +9506,8 @@ msgstr "????????? Dood
 msgid "Start Doodling"
 msgstr "????????? Doodling"
 
-msgid "Activate which ID?"
-msgstr "?????????????????????????????? ?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "???????????????????????? ?"
@@ -10154,16 +10269,17 @@ msgstr "????????? msgid "Please update the necessary fields."
 msgstr "??????????????????????????????? ?"
 
-msgid "Room _List"
-msgstr "???????????"
+#, fuzzy
+msgid "A_ccount"
+msgstr "????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "???????????????????????????????????????????????? ?\n"
 
-msgid "_Account:"
-msgstr "???? ?"
+msgid "Room _List"
+msgstr "???????????"
 
 msgid "_Block"
 msgstr "?????????"
@@ -10593,6 +10709,111 @@ msgstr "/??????????/
 msgid "/Buddies/Sort Buddies"
 msgstr "/??????????/????????????????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "???????????????"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???????????????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "??????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????????????????????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "???"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????????????????????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "????????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "????????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??????????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??????????????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "??????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "????????????????????????????????? %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "????????????? SSL"
@@ -11092,6 +11313,10 @@ msgstr "???????"
 msgid "Hungarian"
 msgstr "???????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "???????"
+
 msgid "Indonesian"
 msgstr "??????????"
 
@@ -11189,6 +11414,9 @@ msgstr "???????"
 msgid "Swedish"
 msgstr "???????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "?????"
 
@@ -11605,11 +11833,9 @@ msgstr "????????? msgid "Save Image"
 msgstr "??????????????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "??????????????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "???????????????????????????????..."
 
@@ -11696,9 +11922,6 @@ msgstr "?????????? msgid "Font Face"
 msgstr "????????????????"
 
-msgid "Background Color"
-msgstr "???????????????"
-
 msgid "Foreground Color"
 msgstr "?????????????"
 
@@ -12017,6 +12240,9 @@ msgstr "????????? msgid "Pounce on Whom"
 msgstr "???????????????"
 
+msgid "_Account:"
+msgstr "???? ?"
+
 msgid "_Buddy name:"
 msgstr "??????????????? ?"
 
@@ -12127,9 +12353,18 @@ msgstr "?????????? msgid "Unknown.... Please report this!"
 msgstr "??????????????????????????? ? ????????????? !"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "????????????????????????????????????????? ?"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "????????????????????????????????????????? ?"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "????????????????????????????????????????? ?"
+
 msgid "Install Theme"
 msgstr "??????????"
 
@@ -12684,6 +12919,10 @@ msgstr "?????????? msgid "Custom Smiley Manager"
 msgstr "?????????????????????????????????????????"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "???????????????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "???????????????????????????????????????????????????????????? ?"
 
@@ -12898,6 +13137,78 @@ msgstr "?????????? msgid "Displays statistical information about your buddies' availability"
 msgstr "????????????????????????????????????????????????????????"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "?????????????????????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??????????????????????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "?????????????????????????????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "????????????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "???????????????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "????????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "???????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "?????????????"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "???? PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "??????????????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "????????????????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "????????????? ?"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "????????????????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???????????????????????????????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "????????????????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "????????????????????????????????????????????????????????? ????????????? XMPP ?"
+
 msgid "Buddy is idle"
 msgstr "???????????????"
 
@@ -13387,12 +13698,6 @@ msgstr ""
 "- ???????????????????????????\n"
 "- ??????????????????????????????????????????? ?????????????"
 
-msgid "Cursor Color"
-msgstr "???????????????"
-
-msgid "Secondary Cursor Color"
-msgstr "????????????????????"
-
 msgid "Hyperlink Color"
 msgstr "???????????"
 
@@ -13402,6 +13707,10 @@ msgstr "?????????? msgid "Highlighted Message Name Color"
 msgstr "???????????????????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "??????????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "????????????????? GtkTreeView"
 
@@ -13431,35 +13740,24 @@ msgstr "GTK+ ????????
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ????????????????????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "???????????????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??????????????????????"
 
-msgid "Widget Sizes"
-msgstr "?????????????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "????????????? GTK+ ????????????????????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "???"
+
 msgid "Fonts"
 msgstr "??????????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "??????????? Gtkrc"
 
@@ -13594,12 +13892,119 @@ msgstr "?????????? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "???????????????????????? ?????????????????????????????? ?"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "???????????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "??????????????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??????????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "???????????????????????????????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "?????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "???????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "??????????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "????????????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "??????????????? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "??????????????????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "???????????????????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "????????????? GTK+ ????????????????????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "?????????????????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "???????????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "???????????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "????????????? GTK+ ????????????????????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "????????????? GTK+ ????????????????????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "???????????????????????????"
 
@@ -13801,6 +14206,21 @@ msgstr "?????????? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "????????????????????????????????????????????????????????? ????????????? XMPP ?"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "?????????????????????????????? ?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "???????????????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "????????????????????"
+
+#~ msgid "Interface colors"
+#~ msgstr "???????????????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "?????????????????"
+
 #~ msgid "Invite message"
 #~ msgstr "?????????"
 
============================================================
--- po/kn.po	d1c61d37cc0b7926eac5f46b9a2a73158626d01b
+++ po/kn.po	218ac61efee00fab0e6d690b8bd2a59c7d398d76
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:38-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-01-28 17:51+0530\n"
 "Last-Translator: Kannada Localization Team <translation at sampada.info>\n"
 "Language-Team: Kannada <translation at sampada.info>\n"
@@ -1806,6 +1806,8 @@ msgstr "+++ %s ????????"
 msgid "+++ %s signed off"
 msgstr "+++ %s ????????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "?????????? ???"
 
@@ -2185,6 +2187,10 @@ msgstr "(%s) %s <??????-??msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <??????-?????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?????? ?????????? ???"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3140,6 +3146,11 @@ msgstr "??????? ????msgid "Chat _name:"
 msgstr "??????? ?????(n)"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?????? ????? ?????????? ???????"
+
 msgid "Chat error"
 msgstr "??????? ???"
 
@@ -3188,6 +3199,10 @@ msgstr "Gadu-Gadu ???????"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ???????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???????? ?????? ????.."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?????????? ????: %s"
@@ -3231,7 +3246,7 @@ msgstr "????????:(P)"
 msgid "_Password:"
 msgstr "????????:(P)"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3667,6 +3682,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3955,6 +3973,14 @@ msgstr "????????"
 msgid "Resource"
 msgstr "????????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?????? ?????? ?????????"
+
 msgid "Middle Name"
 msgstr "??????  ?????"
 
@@ -4122,10 +4148,19 @@ msgstr "?????????? ?msgid "Find Rooms"
 msgstr "?????????? ??????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "???????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "???????? ????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "?????"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "???? ????"
 
@@ -4145,7 +4180,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?????? ????? ?????????? ???????"
 
 #, c-format
@@ -4174,9 +4209,6 @@ msgstr "?????? ????"
 msgid "Unregistration Failed"
 msgstr "?????? ????"
 
-msgid "Already Registered"
-msgstr "?????? ???????????? "
-
 msgid "State"
 msgstr "??????"
 
@@ -4189,6 +4221,9 @@ msgstr "??????"
 msgid "Date"
 msgstr "??????"
 
+msgid "Already Registered"
+msgstr "?????? ???????????? "
+
 #, fuzzy
 msgid "Unregister"
 msgstr "?????????"
@@ -4221,6 +4256,10 @@ msgstr "??????????? msgstr "??????????? ???? ??????(s):"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?????? ????? ?????????? ???????"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "?????????? ??????????? ???"
 
@@ -4590,13 +4629,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4659,6 +4698,9 @@ msgstr "??? ????????msgid "File transfer proxies"
 msgstr "??? ???????? ??????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5058,6 +5100,10 @@ msgstr "??????????? msgid "Non-IM Contacts"
 msgstr "??????????? ??????????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5410,66 +5456,29 @@ msgstr "??????? ????msgid "Windows Live ID authentication:Invalid response"
 msgstr "??????? ??????? ????"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr "?????????? ???"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s  ?? %s (%s) ????  "
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ????? ????? ?????????????"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "?????????? ???"
 
 msgid "Unable to add user"
 msgstr "???????????? ?????????????"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "?????????? ???"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "????? ??????????? ?????????? ???????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr " %s (%s) ???? ???????????? ??????? ???????"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s)???? ???????????? ????????? ???????"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "????? ?????? ????? ??????????????? %s ?????????????"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr "???? ???????? ?????"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "??? ????????????? ???? ???????????????????? ?????????? ???????????? "
 
-msgid "Unable to rename group"
-msgstr "?????? ????? ??????? ???????"
-
-msgid "Unable to delete group"
-msgstr "???????? ?????? ???????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5543,6 +5552,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "?????????? ???"
+
 msgid "Handshaking"
 msgstr "?? ???????????????"
 
@@ -5561,6 +5573,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 "&#3223;&#3235;&#3221;&#3238;&#3263;&#3202;&#3238; &#3238;&#3266;&#3248;"
@@ -5598,14 +5618,6 @@ msgstr "?????? ?????msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????? ?????????? ??? ?????????????? ??????? ?????????????????????."
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ????????? ???? ?????? ??????? ????????????"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ????????? ???? ??????????????? ???????????????? "
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "??????????????? ??????"
@@ -5638,6 +5650,51 @@ msgstr "???? ???????msgstr "???? ?????????? ???????????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s  ?? %s (%s) ????  "
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr " %s (%s) ???? ???????????? ??????? ???????"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s)???? ???????????? ????????? ???????"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "????? ?????? ????? ??????????????? %s ?????????????"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr "???? ???????? ?????"
+
+msgid "Unable to rename group"
+msgstr "?????? ????? ??????? ???????"
+
+msgid "Unable to delete group"
+msgstr "???????? ?????? ???????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ????????? ???? ?????? ??????? ????????????"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ????????? ???? ??????????????? ???????????????? "
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5671,6 +5728,8 @@ msgstr "????????? ??msgstr "????????? ?????? ????????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "???? ????? ?????(m)"
@@ -5718,12 +5777,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "????? ????????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6058,10 +6120,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "????? ????????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6265,6 +6323,25 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?????? ?????????? ???"
+
+msgid "Incorrect password."
+msgstr "????? ????????"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "????????????????"
@@ -6555,15 +6632,34 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "%s ??? ???? ???????"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "%s ??? ???? ???????"
+
+msgid "Could Not Connect"
+msgstr "?????? ????????????"
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "????? ?????"
 
-msgid "Incorrect password."
-msgstr "????? ????????"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6572,21 +6668,14 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
-msgstr "?????? ????????????"
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
 msgid "The SecurID key entered is invalid."
@@ -6605,22 +6694,6 @@ msgstr "???"
 msgid "_OK"
 msgstr "???"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "%s ??? ???? ???????"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "%s ??? ???? ???????"
-
 msgid "Password sent"
 msgstr "???????? ????????????"
 
@@ -7070,6 +7143,7 @@ msgstr "???????? ???msgid "Set User Info (web)..."
 msgstr "???????? ?????? ????.."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "???????? ??????"
@@ -7100,6 +7174,10 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "????????? ?????? ??????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9362,10 +9440,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9389,6 +9463,41 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????? ????????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"?????????? ??? ?????? %d. ????! ??????? ?????? ?????????? ?????? ????????????. "
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "????????? ????????????????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"?????????? ??? ?????? %d. ????! ??????? ?????? ?????????? ?????? ????????????. "
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "????? ????????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9490,7 +9599,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -10255,16 +10364,17 @@ msgstr "???????? ???msgstr "???????? ???? ?????? ?????????? ???????????"
 
 #, fuzzy
-msgid "Room _List"
-msgstr "?????? ?????"
+msgid "A_ccount"
+msgstr "????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "???? ???????? ??????? ?????? ?????? ????.\n"
 
-msgid "_Account:"
-msgstr "_????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "?????? ?????"
 
 msgid "_Block"
 msgstr "????????(B)"
@@ -10731,6 +10841,113 @@ msgstr "/???????/???
 msgid "/Buddies/Sort Buddies"
 msgstr "/???????/?????????? ????????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "???????? ????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "%d ????? ???? ??????????????? ????????????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "????????????? ??????? "
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???????? ????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_?????????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "???????? ????????? ???????????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_????????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "???????? ????????? ???????????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "??????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "????????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "????????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "????? ?????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "????? ??????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ??????? ?????? ????????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11249,6 +11466,10 @@ msgstr "?????????"
 msgstr "?????????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "?????????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "?????????????"
 
@@ -11353,6 +11574,9 @@ msgstr "????????"
 msgid "Swedish"
 msgstr "????????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "?????"
 
@@ -11776,11 +12000,9 @@ msgstr "????? ?????"
 msgid "Save Image"
 msgstr "????? ?????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_????? ?????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11868,10 +12090,6 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Background Color"
-msgstr "???????? ????"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "???????? ????????? ????"
 
@@ -12175,6 +12393,9 @@ msgstr "??? ???? ???
 msgid "Pounce on Whom"
 msgstr "??? ???? ???? ??????"
 
+msgid "_Account:"
+msgstr "_????:"
+
 msgid "_Buddy name:"
 msgstr "_?????? ?????:"
 
@@ -12285,9 +12506,16 @@ msgstr "??????????? msgid "Unknown.... Please report this!"
 msgstr "??????????????? ?????? ??????; ?????? ???? ????!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "??????? ??? ???????."
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12867,6 +13095,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "?????????? ???????????"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "? ????? ??????????? ? ?????? ????"
 
@@ -13087,6 +13319,76 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "?????? ?????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??????????? ????? ???????"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "???????? ???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "?????? ????? ?????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??? ?????(w)"
+
+#, fuzzy
+msgid "Directory"
+msgstr "???? ??????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "?????? ?????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>????:</b> ????? ????????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "??????? ??????  ???????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_?????????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "????????? ????????????????"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "??????? ??????  ???????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13578,12 +13880,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr "????????? ????"
 
@@ -13595,6 +13891,10 @@ msgstr "??????? ????msgid "Highlighted Message Name Color"
 msgstr "??????? ????????? ???????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "????? ??????????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13624,35 +13924,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??? ?????? ?????"
+
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "?????????"
 
 msgid "Fonts"
 msgstr "????????????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "???? ???  ????????"
@@ -13792,12 +14080,117 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "?????? ???????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "????????? ??????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "?????? ??????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????? ????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "???"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "????? ??????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "????? ??????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "????????(??/??)"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ? ??????"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "????????????? ??????  URL"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "?????????? ?????"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "????? ??????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "???????? ?????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "???????? ?????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "???? ???????"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -14372,10 +14765,6 @@ msgstr ""
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr " %d ???????? ????? ????? ???????????  %d ?????????? ???????????????."
 
-#, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "%d ????? ???? ??????????????? ????????????"
-
 #~ msgid "I am applying to join"
 #~ msgstr "???? ????? ??????????????."
 
@@ -14390,10 +14779,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "????? ????????? ???????:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "?????? ?????????? ???"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "?????? ??????????? , ??????????? ???? ??????"
 
@@ -14483,10 +14868,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_?????:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "????:"
-
 #~ msgid ""
 #~ "\n"
 #~ "Idle: %s"
@@ -14543,13 +14924,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>????:</b> ????? ????????"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -14648,9 +15022,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>?????:</b> %s"
 
-#~ msgid "Pidgin User"
-#~ msgstr "???? ???????"
-
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
 
============================================================
--- po/ko.po	62db3209d47e6f84bac2f7ebf1895c4ad833ef66
+++ po/ko.po	e9808d9d65afee81eda3a85186796ac4e59fc739
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-10-01 16:15+0900\n"
 "Last-Translator: sushizang <sushizang at empal.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation at gnome.or.kr>\n"
@@ -1828,6 +1828,8 @@ msgstr "+++ %s ?? ??? ??? msgid "+++ %s signed off"
 msgstr "+++ %s ?? ??? ?????."
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "? ? ?? ??"
 
@@ -2223,6 +2225,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?? ?? ? ??"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s ?(?) ???? ???, ? ????? %s ?(?) ?????."
@@ -3198,6 +3204,11 @@ msgstr "???(_N):"
 msgid "Chat _name:"
 msgstr "???(_N):"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "??? ??? ? ????."
+
 msgid "Chat error"
 msgstr "?? ??"
 
@@ -3246,6 +3257,10 @@ msgstr "Gadu-Gadu ???"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ???"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??? ?? ??..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "? ? ?? ??: %s"
@@ -3288,7 +3303,8 @@ msgstr "????(_P):"
 msgid "_Password:"
 msgstr "????(_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ??? ??? ???? ?? ?? ????."
 
 #. 1. connect to server
@@ -3768,6 +3784,9 @@ msgstr "??? ???? ?? ? msgid "Server does not use any supported authentication method"
 msgstr "??? ???? ?? ?? ??? ???? ????."
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "?????? ??? challenge ???."
 
@@ -4066,6 +4085,14 @@ msgstr "??"
 msgid "Resource"
 msgstr "??"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?? ??"
+
 msgid "Middle Name"
 msgstr "??? ??"
 
@@ -4236,10 +4263,19 @@ msgstr "??? ??"
 msgid "Find Rooms"
 msgstr "??? ??"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "???? ???? ?? ?????."
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "?? ???"
 
@@ -4260,7 +4296,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?? ??? ??????."
 
 #, c-format
@@ -4289,9 +4325,6 @@ msgstr "?? ??"
 msgid "Unregistration Failed"
 msgstr "?? ??"
 
-msgid "Already Registered"
-msgstr "?? ???? ????."
-
 msgid "State"
 msgstr "?"
 
@@ -4304,6 +4337,9 @@ msgstr "??"
 msgid "Date"
 msgstr "??"
 
+msgid "Already Registered"
+msgstr "?? ???? ????."
+
 #, fuzzy
 msgid "Unregister"
 msgstr "??"
@@ -4336,6 +4372,10 @@ msgstr "?? ??? ??(_S):"
 msgstr "?? ??? ??(_S):"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?? ??? ??????."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "?? ?? ?? ??"
 
@@ -4714,16 +4754,18 @@ msgstr "ban &lt;???&gt; [???
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;???&gt; [???]:  ??? ?????? ???? ?????."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;???&gt; &lt;owner|admin|member|outcast|none&gt;: ??? ??"
 "? ?????."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;???&gt; &lt;moderator|participant|visitor|none&gt;: ????? ?"
 "?? ?????."
@@ -4792,6 +4834,9 @@ msgstr "?? ?? ??"
 msgid "File transfer proxies"
 msgstr "?? ?? ??"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5205,6 +5250,10 @@ msgstr "??? ??"
 msgid "Non-IM Contacts"
 msgstr "??? ??"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5561,66 +5610,29 @@ msgstr "Windows Live ID ??: ??? msgstr "Windows Live ID ??: ??? ? ??"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ?(?) ??? ??? ????."
-
-msgid "Unknown error."
-msgstr "? ? ?? ?????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s (%3$s) ? %1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ?? ??? ??? ?? ???!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "? ? ?? ??"
 
 msgid "Unable to add user"
 msgstr "???? ??? ? ????."
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "? ? ?? ??"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "?? ?????."
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) ???? ??? ? ????."
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) ???? ??? ? ????."
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) ???? ??? ? ????."
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "?? ??? ?? ??, %s ?? ??? ? ?????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?? ???? ??? ???? ????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "???? ????? ??? ? ????."
-
 # msgstr[1] "%2$s ?????? %1$hu ?? ???? ???? ?? ?? ?????."
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "%2$s ?????? %1$hu?? ???? ?? ?? ?? ?????."
 
-msgid "Unable to rename group"
-msgstr "???? ??? ? ????."
-
-msgid "Unable to delete group"
-msgstr "??? ??? ? ????."
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5707,6 +5719,9 @@ msgstr ""
 "?? ?? MSN ?? ??? ????? ???? ?? ?????. ?? ? ?? "
 "??? ??? ????."
 
+msgid "Unknown error."
+msgstr "? ? ?? ?????."
+
 msgid "Handshaking"
 msgstr "??? ?? ????."
 
@@ -5725,6 +5740,14 @@ msgstr "?? ??? ???? ? msgid "Retrieving buddy list"
 msgstr "?? ??? ???? ????."
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "?????? ??? ????."
 
@@ -5761,14 +5784,6 @@ msgstr "? ? ?? ??? ?? 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "? ? ?? ??? ?? ???? ??? ?????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?? ?? ?? ??? ??????."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ?? ?? ?? ???? ??????."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "???? ??"
@@ -5801,6 +5816,51 @@ msgstr "MSN ???? ????"
 msgstr "MSN ???? ????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ?(?) ??? ??? ????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s (%3$s) ? %1$s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) ???? ??? ? ????."
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) ???? ??? ? ????."
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) ???? ??? ? ????."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "?? ??? ?? ??, %s ?? ??? ? ?????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?? ???? ??? ???? ????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "???? ????? ??? ? ????."
+
+msgid "Unable to rename group"
+msgstr "???? ??? ? ????."
+
+msgid "Unable to delete group"
+msgstr "??? ??? ? ????."
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?? ?? ?? ??? ??????."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ?? ?? ?? ???? ??????."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5836,6 +5896,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "??? ???(_M)"
@@ -5884,12 +5946,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "??? ?? ????? ????."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6228,10 +6293,6 @@ msgstr "Master archive ??? ???msgstr "Master archive ??? ?????."
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "??? ?? ????? ????."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "??? ???? ???? ??? ? ?????."
 
@@ -6444,6 +6505,28 @@ msgstr "?? ??"
 msgstr "?? ??"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "????? ??? ?? HTTP ??? ?????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"??? ??? ?? ??????. 10? ?? ? ?? ??? ??? ????. ?"
+"?? ???? ? ?? ???? ???."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s ?(?) ???? ? ??"
+
+msgid "Incorrect password."
+msgstr "????? ????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "??? ? ?????."
 
@@ -6744,15 +6827,32 @@ msgstr ""
 "??? ? ? ????: ???? ??? ??? %s (?)?? ??? ? ????"
 "?. ???? ? ??? ??, ??? ??? ?? ?? ???? ?????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "? ??? ????. ??? ?? %s ?(?) ??????."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "??? AIM ??? hash? ??? ? ????."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "? ??? ????. ??? ?? %s ?(?) ??????."
+
+msgid "Unable to get a valid login hash."
+msgstr "??? ??? hash? ??? ? ????."
+
+msgid "Could Not Connect"
+msgstr "??? ? ?????."
+
+msgid "Received authorization"
+msgstr "??? ?????."
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "??? ???????."
 
-msgid "Incorrect password."
-msgstr "????? ????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "?? ?? ??? ?? ?? ????."
@@ -6761,25 +6861,19 @@ msgstr "AOL ???? ??? ?? msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL ???? ??? ???? ????? ??? ? ????."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "????? ??? ?? ?? ?????. %s (?)? ????? ????."
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "??? ??? ?? ??????. 10? ?? ? ?? ??? ??? ????. ?"
 "?? ???? ? ?? ???? ???."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "????? ??? ?? ?? ?????. %s (?)? ????? ????."
-
-msgid "Could Not Connect"
-msgstr "??? ? ?????."
-
-msgid "Received authorization"
-msgstr "??? ?????."
-
 msgid "The SecurID key entered is invalid."
 msgstr "??? ?? ID ?? ???????."
 
@@ -6795,20 +6889,6 @@ msgstr "??(_O)"
 msgid "_OK"
 msgstr "??(_O)"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "? ??? ????. ??? ?? %s ?(?) ??????."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "??? AIM ??? hash? ??? ? ????."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "? ??? ????. ??? ?? %s ?(?) ??????."
-
-msgid "Unable to get a valid login hash."
-msgstr "??? ??? hash? ??? ? ????."
-
 msgid "Password sent"
 msgstr "???? ?? ?"
 
@@ -7301,6 +7381,7 @@ msgstr "??? ?? ??(URL)..."
 msgid "Set User Info (web)..."
 msgstr "??? ?? ??(URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "???? ?? (URL)"
@@ -7333,6 +7414,10 @@ msgstr "??? ?? ??..."
 msgstr "??? ?? ??..."
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "???? ?? ?? ????."
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9680,10 +9765,6 @@ msgstr "??? ??"
 msgid "Auth Domain"
 msgstr "??? ??"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9711,6 +9792,44 @@ msgstr "??? ?? ??"
 msgid "Add buddy rejected"
 msgstr "??? ?? ??"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "??? ???? ??? ??? ???? ?????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????? ????."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"? ? ?? ?? ?? %d ???. Yahoo! ????? ????? ??? ?? ??"
+"??."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "???? ????."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"? ? ?? ?? ?? %d ???. Yahoo! ????? ????? ??? ?? ??"
+"??."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??? ?? ????? ????."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9824,9 +9943,8 @@ msgstr "?? ??"
 msgid "Start Doodling"
 msgstr "?? ??"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "?? ID ? ??? ???????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 #, fuzzy
 msgid "Join whom in chat?"
@@ -10619,16 +10737,17 @@ msgstr "??? ??? ??? ? msgstr "??? ??? ??? ????."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "??? ??"
+msgid "A_ccount"
+msgstr "??"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "??? ??? ?? ??? ??? ??? ????.\n"
 
-msgid "_Account:"
-msgstr "??(_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "??? ??"
 
 msgid "_Block"
 msgstr "??(_B)"
@@ -11088,6 +11207,112 @@ msgstr "/??/?? ??"
 msgid "/Buddies/Sort Buddies"
 msgstr "/??/?? ??"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "???"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "? ??? ?? ??? ???? ????."
+
+#, fuzzy
+msgid "Layout"
+msgstr "????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "???(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??? ??"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "???(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??? ??"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?? ??"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "???"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "?? ??"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "???"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "???? ?????."
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ? ??? ?? ??"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ??"
@@ -11598,6 +11823,10 @@ msgstr "????"
 msgstr "????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "?????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "??????"
 
@@ -11703,6 +11932,9 @@ msgstr "????"
 msgid "Swedish"
 msgstr "????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "???"
 
@@ -12136,11 +12368,10 @@ msgstr "??? ??"
 msgid "Save Image"
 msgstr "??? ??"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "??? ??(_S)..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "??? ???? ??"
 
@@ -12227,9 +12458,6 @@ msgstr "?? ??"
 msgid "Font Face"
 msgstr "?? ??"
 
-msgid "Background Color"
-msgstr "???"
-
 msgid "Foreground Color"
 msgstr "???"
 
@@ -12564,6 +12792,9 @@ msgstr "??? ?? ??"
 msgid "Pounce on Whom"
 msgstr "??? ?? ??"
 
+msgid "_Account:"
+msgstr "??(_A):"
+
 msgid "_Buddy name:"
 msgstr "?? ??(_B):"
 
@@ -12675,9 +12906,18 @@ msgstr "? ? ?? \"??\" ??
 msgid "Unknown.... Please report this!"
 msgstr "? ? ?? \"??\" ??????. ? ??? ????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "???? ??? ? ? ????."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "???? ??? ? ? ????."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "???? ??? ? ? ????."
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13252,6 +13492,10 @@ msgstr "?? ???"
 msgstr "?? ???"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "?? ??"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "?? ??? ??:"
 
@@ -13485,6 +13729,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "?? ??"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "?? ?? ??"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??? ?? ?? ??"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "??? ???"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "?? ?? ???"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "?? ??? ??? ?(_W)"
+
+#, fuzzy
+msgid "Directory"
+msgstr "?? ?? ??"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "?? ??"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "??"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?? ?? ??"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "????(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "???? ????."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "??? ???? ?? ?? ??? ???? ????."
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?? ?? ??"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"??? XMPP ?? ?? ?????? ??? ? ?? ??? ???????."
+
 msgid "Buddy is idle"
 msgstr "?? ?? ??"
 
@@ -13985,12 +14301,6 @@ msgstr ""
 "- ??? ?? ??? ??????.\n"
 "- ????? ?? ??? ????? ???? ?? ????."
 
-msgid "Cursor Color"
-msgstr "?? ??"
-
-msgid "Secondary Cursor Color"
-msgstr "??? ?? ??"
-
 msgid "Hyperlink Color"
 msgstr "????? ??"
 
@@ -14002,6 +14312,10 @@ msgstr "?? ?? ???"
 msgid "Highlighted Message Name Color"
 msgstr "?? ?? ???"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "??? ??? ??"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ???? ???"
 
@@ -14031,35 +14345,24 @@ msgstr "GTK+ ?? ?? ?? ??
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ?? ?? ?? ??"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "????? ??"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "? ?? ??"
 
-msgid "Widget Sizes"
-msgstr "Widget ??"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ ?? ??"
 
+#, fuzzy
+msgid "Colors"
+msgstr "??"
+
 msgid "Fonts"
 msgstr "??"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -14202,12 +14505,119 @@ msgstr "???? ??? ???
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "???? ??? ??? ?? ??? ??? ???? ?????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "????? ?? ????."
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "????? ?? ????."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "?? ??"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "??? ??"
+
+#, fuzzy
+msgid "Founder"
+msgstr "?? ??"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "??? ?????."
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "??"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "?? ?? ??"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "?? ??"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ? ??"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "??? ??"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "??? ??"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ ?? ??"
+
+#, fuzzy
+msgid "Contact"
+msgstr "??? ??"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?? ??"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?? ??"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ ?? ??"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ ?? ??"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
@@ -14411,6 +14821,22 @@ msgstr ""
 "??? XMPP ?? ?? ?????? ??? ? ?? ??? ???????."
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "?? ID ? ??? ???????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "?? ??"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??? ?? ??"
+
+#~ msgid "Interface colors"
+#~ msgstr "????? ??"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget ??"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "??? ?? ??"
 
@@ -15222,9 +15648,6 @@ msgstr ""
 #~ msgid "You [%d] has exit group \"%d\""
 #~ msgstr "? [%d] ?(?) ?? \"%d\" (?)??? ??????."
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "? ??? ?? ??? ???? ????."
-
 #~ msgid "I am applying to join"
 #~ msgstr "?? ?? ?? ????."
 
============================================================
# po/ku.po is binary
============================================================
--- po/lo.po	e42cc2fcb936966d2a85a694930a501d6093c6bc
+++ po/lo.po	9b01edd0c51fc91797dee5dffa230f48e056d163
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: lo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 22:29-0700\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-04-29 09:28+0700\n"
 "Last-Translator: Anousak Souphavanh <anousak at gmail.com>\n"
 "Language-Team: Lao <lo at li.org>\n"
@@ -2037,6 +2037,9 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+msgid "Error creating conference."
+msgstr ""
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2968,6 +2971,10 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#. should this be a settings error?
+msgid "Unable to resolve server"
+msgstr ""
+
 msgid "Chat error"
 msgstr ""
 
@@ -3016,6 +3023,9 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+msgid "GG server"
+msgstr ""
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -3058,7 +3068,7 @@ msgstr ""
 msgid "_Password:"
 msgstr ""
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3946,7 +3956,7 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr ""
 
 #, c-format
@@ -3973,9 +3983,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr ""
 
@@ -3988,6 +3995,9 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -4015,6 +4025,9 @@ msgstr ""
 msgid "Change Registration"
 msgstr ""
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4442,6 +4455,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4827,6 +4843,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5179,32 +5199,6 @@ msgstr ""
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
-msgid "Unknown error."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
@@ -5278,6 +5272,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5296,6 +5293,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5368,6 +5373,29 @@ msgstr ""
 msgid "%s on %s (%s)"
 msgstr ""
 
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
 msgid "Unable to rename group"
 msgstr ""
 
@@ -5459,12 +5487,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr ""
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -5778,9 +5808,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5980,6 +6007,25 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, c-format
+msgid "Error requesting "
+msgstr ""
+
+msgid "Incorrect password."
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6264,14 +6310,31 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr ""
 
-msgid "Incorrect password."
-msgstr ""
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6280,23 +6343,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr ""
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6312,20 +6368,6 @@ msgstr ""
 msgid "_OK"
 msgstr ""
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6766,6 +6808,7 @@ msgstr ""
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr ""
 
@@ -6795,6 +6838,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -8939,10 +8985,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -8975,7 +9017,9 @@ msgstr ""
 msgstr ""
 
 #. security lock from too many failed login attempts
-msgid "Account locked: Too many failed login attempts"
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #. the username does not exist
@@ -8983,7 +9027,9 @@ msgstr ""
 msgstr ""
 
 #. indicates a lock of some description
-msgid "Account locked: See the debug log"
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #. username or password missing
@@ -9090,7 +9136,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -10256,6 +10302,98 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+msgid "Background Color"
+msgstr ""
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+msgid "Layout"
+msgstr ""
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr ""
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+msgid "Contact Text"
+msgstr ""
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+msgid "On-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+msgid "Away Text"
+msgstr ""
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+msgid "Off-line Text"
+msgstr ""
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+msgid "Idle Text"
+msgstr ""
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+msgid "Message Text"
+msgstr ""
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -11328,9 +11466,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-msgid "Background Color"
-msgstr ""
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -11720,9 +11855,15 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12475,6 +12616,63 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
+msgid "Enter an XMPP Server"
+msgstr ""
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+msgid "Add to Buddy List"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Directory"
+msgstr ""
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?????:"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+msgid "_Browse"
+msgstr ""
+
+msgid "Server does not exist"
+msgstr ""
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -12949,12 +13147,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -12964,6 +13156,9 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -12993,35 +13188,21 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+msgid "Disable Typing Notification Text"
 msgstr ""
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+msgid "Colors"
+msgstr ""
+
 msgid "Fonts"
 msgstr ""
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13154,12 +13335,99 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+msgid "Just logged in"
+msgstr ""
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr ""
+
+msgid "Ignored"
+msgstr ""
+
+msgid "Founder"
+msgstr ""
+
+msgid "Operator"
+msgstr ""
+
+msgid "Half Operator"
+msgstr ""
+
+msgid "Authorization dialog"
+msgstr ""
+
+msgid "Error dialog"
+msgstr ""
+
+msgid "Information dialog"
+msgstr ""
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+msgid "Warning dialog"
+msgstr ""
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+msgid "Status Icons"
+msgstr ""
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+msgid "Dialog Icons"
+msgstr ""
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
============================================================
--- po/lt.po	5632588ea94119ade9eef74a8d11cfd2131ef4c0
+++ po/lt.po	bec17dfe9f40cada30005f57031c27b6a6ae1878
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-24 09:02+0100\n"
 "Last-Translator: Laurynas Biveinis <laurynas.biveinis at gmail.com>\n"
 "Language-Team:\n"
@@ -1814,6 +1814,8 @@ msgstr "+++ %s atsijung?"
 msgid "+++ %s signed off"
 msgstr "+++ %s atsijung?"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Ne?inoma klaida"
 
@@ -2218,6 +2220,10 @@ msgstr "(%s) %s <AUTOMATINIS-ATSAKYMAS>:
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATINIS-ATSAKYMAS>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Jungties k?rimo klaida"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "J?s naudojat?s %s, bet ?iam papildiniui reikia %s."
@@ -3244,6 +3250,11 @@ msgstr "Ka_nalo pavadinimas:"
 msgid "Chat _name:"
 msgstr "Ka_nalo pavadinimas:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Nepavyko prisijungti prie serverio."
+
 msgid "Chat error"
 msgstr "Pokalbi? kambario klaida"
 
@@ -3292,6 +3303,10 @@ msgstr "Gadu-Gadu vartotojas"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu vartotojas"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Gaunamas serveris"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ne?inoma komanda: %s"
@@ -3334,7 +3349,8 @@ msgstr "Sla_pta?odis:"
 msgid "_Password:"
 msgstr "Sla_pta?odis:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC vardai negali tur?ti matom? tarp?"
 
 #. 1. connect to server
@@ -3825,6 +3841,9 @@ msgstr "Serveris nenaudoja jokio Pidgin 
 msgid "Server does not use any supported authentication method"
 msgstr "Serveris nenaudoja jokio Pidgin palaikomo tapatyb?s nustatymo metodo"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "J?s reikalaujate ?ifravimo, bet jo ?is serveris nesi?lo."
+
 msgid "Invalid challenge from server"
 msgstr "Neteisingas serverio i???kis"
 
@@ -4104,6 +4123,14 @@ msgstr "I?teklius"
 msgid "Resource"
 msgstr "I?teklius"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Prisijung?s"
+
 msgid "Middle Name"
 msgstr "Antras vardas"
 
@@ -4273,9 +4300,18 @@ msgstr "Rasti kambarius"
 msgid "Find Rooms"
 msgstr "Rasti kambarius"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "J?s reikalaujate ?ifravimo, bet jo ?is serveris nesi?lo."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alternatyvusis vardas:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Ie?kot? vartotoj? nerasta"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Pareigos"
+
 msgid "Ping timeout"
 msgstr "Baig?si skimbtel?jimo laukimo laikas"
 
@@ -4295,7 +4331,7 @@ msgstr "Neteisingas XMPP ID.  Sritis pri
 msgstr "Neteisingas XMPP ID.  Sritis privalo b?ti nustatyta."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Nepavyko prisijungti prie serverio."
 
 #, c-format
@@ -4322,9 +4358,6 @@ msgstr "I?siregistravimas nepavyko"
 msgid "Unregistration Failed"
 msgstr "I?siregistravimas nepavyko"
 
-msgid "Already Registered"
-msgstr "Jau registruota"
-
 msgid "State"
 msgstr "Valstija"
 
@@ -4337,6 +4370,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Jau registruota"
+
 msgid "Unregister"
 msgstr "I?siregistruoti"
 
@@ -4365,6 +4401,10 @@ msgstr "Pakeisti registracij?"
 msgid "Change Registration"
 msgstr "Pakeisti registracij?"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Nepavyko prisijungti prie serverio."
+
 msgid "Error unregistering account"
 msgstr "Paskyros i?registravimo klaida"
 
@@ -4730,16 +4770,18 @@ msgstr ""
 msgstr ""
 "ban &lt;vartotojas&gt; [prie?astis]:  u?drausti vartotojui ateiti ? kambar?."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affilliate &lt;vartotojas;&gt; &lt;owner|admin|member|outcast|none&gt;:  "
 "nustatyti vartotojo status? kambaryje."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;vartotojas&gt; &lt;moderator|participant|visitor|none&gt;: "
 "nustatyti vartotojo vaidmen? kambaryje."
@@ -4807,6 +4849,9 @@ msgstr "Fail? perdavimo tarpininkaujant
 msgid "File transfer proxies"
 msgstr "Fail? perdavimo tarpininkaujantys serveriai"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5207,6 +5252,12 @@ msgstr "Kontaktai ne i? greit?j? ?in
 msgid "Non-IM Contacts"
 msgstr "Kontaktai ne i? greit?j? ?inu?i? tinkl?"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s atsiunt? kvietim? internetin?s vaizdo kameros pokalbiui, ko Pidgin dar "
+"nepalaiko."
+
 msgid "Nudge"
 msgstr "Bakstel?jimas"
 
@@ -5554,64 +5605,26 @@ msgstr "Windows Live ID tapatyb?s nusta
 msgstr "Windows Live ID tapatyb?s nustatymas: neteisingas atsakas"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s n?ra teisinga grup?"
-
-msgid "Unknown error."
-msgstr "Ne?inoma klaida."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s. Vartotojas %s (%s)."
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s nori bakstel?jo Jums!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Ne?inoma klaida (%d)"
 
 msgid "Unable to add user"
 msgstr "Nepavyko prid?ti vartotojo"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Tolesni? vartotoj? n?ra J?s? adres? knygoje"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Negalima prid?ti vartotojo paskyroje %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Ne?inoma klaida (%d)"
 
-#  Data is assumed to be the destination sn
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Negalima blokuoti vartotojo paskyroje %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "Tolesni? vartotoj? n?ra J?s? adres? knygoje"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Negalima leisti vartotojo paskyroje %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Negalima prid?ti %s, nes J?s? bi?iuli? s?ra?as pilnas."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s n?ra teisinga Microsoft .NET paso paskyra"
-
-msgid "Service Temporarily Unavailable."
-msgstr "Tarnyba laikinai neprieinama"
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilioji ?inut? nebuvo i?si?sta, nes ji per ilga."
 
-msgid "Unable to rename group"
-msgstr "Negalima pervadinti grup?s"
-
-msgid "Unable to delete group"
-msgstr "Negalima pa?alinti grup?s"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5704,6 +5717,9 @@ msgstr ""
 "J?s? MSN bi?iuli? s?ra?as yra laikinai neprieinamas. Pra?ome palaukti ir "
 "pabandyti i? naujo."
 
+msgid "Unknown error."
+msgstr "Ne?inoma klaida."
+
 msgid "Handshaking"
 msgstr "Pasisveikinimas"
 
@@ -5722,6 +5738,18 @@ msgstr "Gaunamas bi?iuli? s?ra?as"
 msgid "Retrieving buddy list"
 msgstr "Gaunamas bi?iuli? s?ra?as"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s atsiunt? kvietim? internetin?s vaizdo kameros pokalbiui, ko Pidgin dar "
+"nepalaiko."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s atsiunt? kvietim? internetin?s vaizdo kameros pokalbiui, ko Pidgin dar "
+"nepalaiko."
+
 msgid "Away From Computer"
 msgstr "Pasitrauk?s nuo kompiuterio"
 
@@ -5760,14 +5788,6 @@ msgstr "?inut? nei?si?sta, nes ?vyk
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?inut? nei?si?sta, nes ?vyko ne?inoma klaida:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Vartotojas %s ?trauk? Jus ? savo bi?iuli? s?ra?o."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Vartotojas %s pa?alino Jus i? savo bi?iuli? s?ra?o."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Ar pa?alinti bi?iul? i? adres? knygos?"
 
@@ -5797,6 +5817,52 @@ msgstr "MSN protokolo papildinys"
 msgstr "MSN protokolo papildinys"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s n?ra teisinga grup?"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s. Vartotojas %s (%s)."
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Negalima prid?ti vartotojo paskyroje %s (%s)"
+
+#  Data is assumed to be the destination sn
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Negalima blokuoti vartotojo paskyroje %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Negalima leisti vartotojo paskyroje %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Negalima prid?ti %s, nes J?s? bi?iuli? s?ra?as pilnas."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s n?ra teisinga Microsoft .NET paso paskyra"
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tarnyba laikinai neprieinama"
+
+msgid "Unable to rename group"
+msgstr "Negalima pervadinti grup?s"
+
+msgid "Unable to delete group"
+msgstr "Negalima pa?alinti grup?s"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Vartotojas %s ?trauk? Jus ? savo bi?iuli? s?ra?o."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Vartotojas %s pa?alino Jus i? savo bi?iuli? s?ra?o."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Naudotojas nerastas: %s"
 
@@ -5825,6 +5891,8 @@ msgstr "Prarastas prisijungimas prie ser
 msgstr "Prarastas prisijungimas prie serverio"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nauji lai?kai"
 
@@ -5876,18 +5944,20 @@ msgstr "Protokolo klaida, kodas %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Protokolo klaida, kodas %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s J?s? slapta?odis yra %d simboli?, daugiau negu did?iausias MySpaceIM "
 "leid?iamas ilgis %d.  Sutrumpinkite savo slapta?od? adresu http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "ir pabandykite i? naujo."
 
+msgid "Incorrect username or password"
+msgstr "Neteisingas naudotojo vardas ar slapta?odis"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM klaida"
 
@@ -6203,9 +6273,6 @@ msgstr "Pagrindinis archyvas yra blogai 
 msgid "Master archive is misconfigured"
 msgstr "Pagrindinis archyvas yra blogai sukonfig?ruotas"
 
-msgid "Incorrect username or password"
-msgstr "Neteisingas naudotojo vardas ar slapta?odis"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nepavyko atpa?inti mazgo, priklausan?io ?iam naudotojo vardui"
 
@@ -6421,6 +6488,29 @@ msgstr "Serverio prievadas"
 msgid "Server port"
 msgstr "Serverio prievadas"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Gautas nelauktas HTTP atsakymas i? serverio."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"J?s per da?nai prisijungin?jote ir atsijungin?jote. Palaukite de?imt minu?i? "
+"ir bandykite v?l. Jei vis tiek bandysite jungtis, Jums reik?s laukti dar "
+"ilgiau."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Klaida nustatant %s"
+
+msgid "Incorrect password."
+msgstr "Neteisingas slapta?odis."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Nepavyko prisijungti prie pokalbi? kambario"
 
@@ -6745,14 +6835,33 @@ msgstr ""
 "arba prasid?ti raide ir tur?ti tik raides, skaitmenis ir tarpus, arba tur?ti "
 "tik skaitmenis."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Jus netrukus gali atjungti.  Jei taip atsitiks, patikrinkite %s, ar n?ra "
+"atnaujinim?."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nepavyko gauti teisingos AIM prisijungimo mai?os."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Jus netrukus gali atjungti.  Patikrinkite %s, ar n?ra atnaujinim?."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nepavyko gauti teisingos prisijungimo mai?os."
+
+msgid "Could Not Connect"
+msgstr "Nepavyko prisijungti"
+
+msgid "Received authorization"
+msgstr "Gauta prieigos teis?"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Neteisingas naudotojo vardas"
 
-msgid "Incorrect password."
-msgstr "Neteisingas slapta?odis."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "J?s? abonentas ?iuo metu suspenduotas."
@@ -6761,28 +6870,22 @@ msgstr "AOL IM tarnyba laikinai nepriein
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL IM tarnyba laikinai neprieinama"
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"J?s per da?nai prisijungin?jote ir atsijungin?jote. Palaukite de?imt minu?i? "
-"ir bandykite v?l. Jei vis tiek bandysite jungtis, Jums reik?s laukti dar "
-"ilgiau."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "J?s? naudojama kliento programos versija yra per sena. Pra?ome atnaujinti "
 "svetain?je %s"
 
-msgid "Could Not Connect"
-msgstr "Nepavyko prisijungti"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"J?s per da?nai prisijungin?jote ir atsijungin?jote. Palaukite de?imt minu?i? "
+"ir bandykite v?l. Jei vis tiek bandysite jungtis, Jums reik?s laukti dar "
+"ilgiau."
 
-msgid "Received authorization"
-msgstr "Gauta prieigos teis?"
-
 msgid "The SecurID key entered is invalid."
 msgstr "?vestas SecurID raktas yra neteisingas."
 
@@ -6798,22 +6901,6 @@ msgstr "_Gerai"
 msgid "_OK"
 msgstr "_Gerai"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Jus netrukus gali atjungti.  Jei taip atsitiks, patikrinkite %s, ar n?ra "
-"atnaujinim?."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nepavyko gauti teisingos AIM prisijungimo mai?os."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Jus netrukus gali atjungti.  Patikrinkite %s, ar n?ra atnaujinim?."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nepavyko gauti teisingos prisijungimo mai?os."
-
 msgid "Password sent"
 msgstr "I?si?stas slapta?odis"
 
@@ -7357,6 +7444,7 @@ msgstr "Nustatyti naudotojo informacij?
 msgid "Set User Info (web)..."
 msgstr "Nustatyti naudotojo informacij? (?iniatinklis)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Pakeisti slapta?od? (?iniatinklis)..."
 
@@ -7386,6 +7474,10 @@ msgstr "Ie?koti bi?iulio pagal informa
 msgid "Search for Buddy by Information"
 msgstr "Ie?koti bi?iulio pagal informacij?"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Vartotojas neprisijung?s"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9706,12 +9798,6 @@ msgstr "Sritis prieigos teis?s tikrinim
 msgid "Auth Domain"
 msgstr "Sritis prieigos teis?s tikrinimui"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s atsiunt? kvietim? internetin?s vaizdo kameros pokalbiui, ko Pidgin dar "
-"nepalaiko."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9738,6 +9824,44 @@ msgstr "Bi?iulio prid?jimas atmestas"
 msgid "Add buddy rejected"
 msgstr "Bi?iulio prid?jimas atmestas"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Jungtimi su serveriu gauti neteisingi duomenys."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Neteisingas slapta?odis"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ne?inomas klaidos numeris %d.  Prisijungimas prie Yahoo! svetain?s galb?t "
+"tai pataisys."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Vartotojas neegzistuoja"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ne?inomas klaidos numeris %d.  Prisijungimas prie Yahoo! svetain?s galb?t "
+"tai pataisys."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Neteisingas naudotojo vardas ar slapta?odis"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9850,8 +9974,8 @@ msgstr "Prad?ti pai?in?jim?"
 msgid "Start Doodling"
 msgstr "Prad?ti pai?in?jim?"
 
-msgid "Activate which ID?"
-msgstr "Kur? ID aktyvuoti?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Prisijungti prie ko ? pokalb??"
@@ -10656,8 +10780,9 @@ msgstr "Pataisykite b?tinus laukus."
 msgid "Please update the necessary fields."
 msgstr "Pataisykite b?tinus laukus."
 
-msgid "Room _List"
-msgstr "Ka_mbari? s?ra?as"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Paskyra"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10666,8 +10791,8 @@ msgstr ""
 "Pra?ome ?vesti atitinkam? informacij? apie pokalb?, prie kurio norite "
 "prisijungti\n"
 
-msgid "_Account:"
-msgstr "P_askyra:"
+msgid "Room _List"
+msgstr "Ka_mbari? s?ra?as"
 
 #  Block button
 msgid "_Block"
@@ -11131,6 +11256,111 @@ msgstr "/Bi?iuliai/Surikiuoti bi?iuliu
 msgid "/Buddies/Sort Buddies"
 msgstr "/Bi?iuliai/Surikiuoti bi?iulius"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Fono spalva"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laosie?i? kalba"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Fono spalva"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "I?skl_eisti"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Pasirinkti fono spalv?"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Suskleisti"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Pasirinkti fono spalv?"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Klavi?? seka"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Prisijung?s"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Pasitrauk?s"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Atsijung?s"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Nuotaikos tekstas"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "I?si?sta ?inut?"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Pakeisti vartotojo %s informacij?"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL serveriai"
@@ -11642,6 +11872,10 @@ msgstr "Vengr? kalba"
 msgid "Hungarian"
 msgstr "Vengr? kalba"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumun? kalba"
+
 msgid "Indonesian"
 msgstr "Indonezie?i? kalba"
 
@@ -11739,6 +11973,9 @@ msgstr "?ved? kalba"
 msgid "Swedish"
 msgstr "?ved? kalba"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil? kalba"
 
@@ -12175,11 +12412,9 @@ msgstr "?ra?yti vaizd?"
 msgid "Save Image"
 msgstr "?ra?yti vaizd?"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "?ra?yti vai_zd?..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Prid?ti tinkint? ?ypsen?l?"
 
@@ -12269,9 +12504,6 @@ msgstr "?rifto garnit?ras"
 msgid "Font Face"
 msgstr "?rifto garnit?ras"
 
-msgid "Background Color"
-msgstr "Fono spalva"
-
 msgid "Foreground Color"
 msgstr "?rifto spalva"
 
@@ -12604,6 +12836,9 @@ msgstr "? k? reaguoti"
 msgid "Pounce on Whom"
 msgstr "? k? reaguoti"
 
+msgid "_Account:"
+msgstr "P_askyra:"
+
 msgid "_Buddy name:"
 msgstr "_Bi?iulio vardas:"
 
@@ -12715,9 +12950,18 @@ msgstr "Ne?inomas reakcijos veiksmas. P
 msgid "Unknown.... Please report this!"
 msgstr "Ne?inomas reakcijos veiksmas. Pra?ome apie tai prane?ti!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Nepavyko i?pakuoti ?ypsen?li? apipavidalinimo failo."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Nepavyko i?pakuoti ?ypsen?li? apipavidalinimo failo."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Nepavyko i?pakuoti ?ypsen?li? apipavidalinimo failo."
+
 msgid "Install Theme"
 msgstr "?diegti apipavidalinim?"
 
@@ -13306,6 +13550,10 @@ msgstr "Tinkint? ?ypsen?li? tvarkytu
 msgid "Custom Smiley Manager"
 msgstr "Tinkint? ?ypsen?li? tvarkytuv?"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Pasirinkti bi?iul?"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Paspauskite, kad pakeistum?te savo paveiksliuk? ?iai paskyrai."
 
@@ -13530,6 +13778,78 @@ msgstr "Rodo statistik? apie bi?iuli?
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Rodo statistik? apie bi?iuli? prieinamum?"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Serverio adresas"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "?veskite konferencij? server?"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Pasirinkite konferencij? server? u?klausai"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Tiesiogin?s tarnybos"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Nusi?sti bi?iuli? s?ra??"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "pasitraukia"
+
+#, fuzzy
+msgid "Directory"
+msgstr "?urnal? katalogas"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Garso i?rinkimas"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub paslauga"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Apra?ymas"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Paslaug? paie?kos informacija"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Nar?ykl?:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Vartotojas neegzistuoja"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Serveris nepalaiko blokavimo"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Paslaug? paie?kos informacija"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "?is papildinys naudingas XMPP serveri? ir klient? derinimui."
+
 msgid "Buddy is idle"
 msgstr "bi?iulis yra neveiklus"
 
@@ -14113,12 +14433,6 @@ msgstr ""
 "- jis apsuka vis? gaunam? tekst?\n"
 "- jis nusiun?ia ?inut? J?s? bi?iuliams i?kart, kai jie prisijungia."
 
-msgid "Cursor Color"
-msgstr "?ymeklio spalva"
-
-msgid "Secondary Cursor Color"
-msgstr "Antrin? ?ymeklio spalva"
-
 msgid "Hyperlink Color"
 msgstr "Hipersaito spalva"
 
@@ -14128,6 +14442,11 @@ msgstr "Vardo pary?kintoje ?inut?je s
 msgid "Highlighted Message Name Color"
 msgstr "Vardo pary?kintoje ?inut?je spalva"
 
+#  ---------- "Notification Removals" ----------
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Prane?imo apie pa?nekovo renkam? ?inut? spalva"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horizontalus atskyrimo tarpas"
 
@@ -14158,35 +14477,31 @@ msgstr "GTK+ prieigos klavi?? parinkti
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ prieigos klavi?? parinktis"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "S?sajos spalvos"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Rodyti prane?imus apie pa?nekov? renkamas ?inutes"
 
-msgid "Widget Sizes"
-msgstr "S?sajos element? dyd?iai"
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ apipavidalinimo parinktys"
 
+#, fuzzy
+msgid "Colors"
+msgstr "U?verti"
+
 msgid "Fonts"
 msgstr "?riftai"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc fail? ?rankiai"
 
@@ -14349,12 +14664,140 @@ msgstr ""
 msgstr ""
 "Pakei?ia tekst? i?siun?iamose ?inut?se pagal vartotojo sukurtas taisykles."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Neprisijung?s"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Neprisijung?s"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Prisijungti prie pokalbio"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignoruoti"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Garsiau"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Suteikta prieigos teis?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Klaidos "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informacija"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "U?klausos dialogas"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Persp?jimo lygis"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Paskyros %s b?sena"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Pokalbi? kambario lokal?"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Pakeisti paveiksliuk?"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ apipavidalinimo parinktys"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktin? informacija"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Bi?iuli? s?ra?as"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Bi?iuli? s?ra?as"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ apipavidalinimo parinktys"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ apipavidalinimo parinktys"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Bi?iuli? juosta"
 
@@ -14569,6 +15012,21 @@ msgstr "?is papildinys naudingas XMPP s
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "?is papildinys naudingas XMPP serveri? ir klient? derinimui."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Kur? ID aktyvuoti?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "?ymeklio spalva"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Antrin? ?ymeklio spalva"
+
+#~ msgid "Interface colors"
+#~ msgstr "S?sajos spalvos"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "S?sajos element? dyd?iai"
+
 #~ msgid "Invite message"
 #~ msgstr "Pakvietimo ?inut?"
 
============================================================
--- po/mk.po	ff229f0706f3dcc5b59ed236cdc725ef4c5a4ce6
+++ po/mk.po	a586aabe3597544c0cfa222d523b861ce4c91cae
@@ -11,7 +11,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-05-07 12:24+0200\n"
 "Last-Translator: Arangel Angov <ufo at linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members at hedona.on.net.mk>\n"
@@ -1768,6 +1768,8 @@ msgstr "+++ %s ?? ??????"
 msgid "+++ %s signed off"
 msgstr "+++ %s ?? ??????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????????? ??????"
 
@@ -2178,6 +2180,10 @@ msgstr "(%s) %s <?????????? ?
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <?????????? ???????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?????? ?? ?????????? ?? ?????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "??? ????????? %s, ?? ???? ????????? ???? %s."
@@ -3158,6 +3164,11 @@ msgstr "_??? ?? ????????:"
 msgid "Chat _name:"
 msgstr "_??? ?? ????????:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?? ????? ?? ?? ??????? ?? ????????."
+
 msgid "Chat error"
 msgstr "?????? ?? ??????????"
 
@@ -3206,6 +3217,10 @@ msgstr "Gadu-Gadu ????????"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ????????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??????? ?? ???????????? ?? ??????????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "????????? ???????: %s"
@@ -3248,7 +3263,8 @@ msgstr "_???????:"
 msgid "_Password:"
 msgstr "_???????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ????????? ?? ????? ?? ??????? ?????? ?????"
 
 #. 1. connect to server
@@ -3722,6 +3738,9 @@ msgstr "???????? ?? ?????
 msgid "Server does not use any supported authentication method"
 msgstr "???????? ?? ??????? ???????? ????? ?? ????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "?????? ??????????, ?? ?? ? ???????? ?? ???? ??????."
+
 msgid "Invalid challenge from server"
 msgstr "????????? ????????? ?? ????????"
 
@@ -3992,6 +4011,14 @@ msgstr "??????"
 msgid "Resource"
 msgstr "??????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???????"
+
 msgid "Middle Name"
 msgstr "?????? ???"
 
@@ -4160,9 +4187,18 @@ msgstr "???????? ????"
 msgid "Find Rooms"
 msgstr "???????? ????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "?????? ??????????, ?? ?? ? ???????? ?? ???? ??????."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "???j??:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "???? ?????????? ?????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "?????"
+
 msgid "Ping timeout"
 msgstr "??????? ?? ping ??????"
 
@@ -4182,7 +4218,7 @@ msgstr "????????? XMPP ??. ?
 msgstr "????????? XMPP ??. ???? ?? ????????? ?????."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?? ????? ?? ?? ??????? ?? ????????."
 
 #, c-format
@@ -4209,9 +4245,6 @@ msgstr "????????????????
 msgid "Unregistration Failed"
 msgstr "???????????????? ?? ?????"
 
-msgid "Already Registered"
-msgstr "???? ??? ????????????"
-
 msgid "State"
 msgstr "????????"
 
@@ -4224,6 +4257,9 @@ msgstr "?????"
 msgid "Date"
 msgstr "?????"
 
+msgid "Already Registered"
+msgstr "???? ??? ????????????"
+
 msgid "Unregister"
 msgstr "?????????????"
 
@@ -4255,6 +4291,10 @@ msgstr "??????? ????????? msgid "Change Registration"
 msgstr "??????? ????????????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?? ????? ?? ?? ??????? ?? ????????."
+
 msgid "Error unregistering account"
 msgstr "?????? ??? ?????????????? ?? ????????"
 
@@ -4618,16 +4658,18 @@ msgstr "ban &lt;user&gt; [???????
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [???????]:  ??????? ?? ?????????? ?? ??????"
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ??????? ?? "
 "??????? ?? ?????????? ?? ??????."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ??????? ?? "
 "??????? ?? ?????????? ?? ??????."
@@ -4692,6 +4734,9 @@ msgstr "Proxy ??????? ?? ???
 msgid "File transfer proxies"
 msgstr "Proxy ??????? ?? ?????? ?? ????????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5094,6 +5139,10 @@ msgstr "???????? ???????"
 msgid "Non-IM Contacts"
 msgstr "???????? ???????"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ?? ??????? ?????? ?? webcam ?? ??? ?????? ?? ? ?????????."
+
 msgid "Nudge"
 msgstr "Nudge"
 
@@ -5446,65 +5495,28 @@ msgstr "????????????? ?? 
 msgstr "????????????? ?? Windows Live ID:?? ?????? ?? ?? ?????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ?? ? ??????? ?????."
-
-msgid "Unknown error."
-msgstr "????????? ??????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ??????? ?? ??????? Nudge!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "????????? ?????? (%d)"
 
 msgid "Unable to add user"
 msgstr "?? ?????? ?? ?? ??????? ??????????"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "????????? ?????? (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "???????? ?? ??????????? ?? ?????? ???????????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "?? ????? ?? ?? ??????? ?????????? ?? %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "?? ????? ?? ?? ???????? ?????????? ?? %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "?? ????? ?? ?? ????? ??????? ?? ?????????? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ?? ???? ?? ?? ??????, ??????? ??????? ? ?????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?? ? ??????? passport ??????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "???????? ? ?????????? ??????????."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "???????? ?? ???? ?? ?? ??????? ??????? ?? ??? ????????."
 
-msgid "Unable to rename group"
-msgstr "?? ????? ?? ?? ??????????? ???????"
-
-msgid "Unable to delete group"
-msgstr "?? ????? ?? ?? ???????? ???????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5598,6 +5610,9 @@ msgstr ""
 "?????? ????? ?? ????????? ?? MSN ? ?????????? ??????????. ?? ????? ????????? "
 "? ???????? ???."
 
+msgid "Unknown error."
+msgstr "????????? ??????."
+
 msgid "Handshaking"
 msgstr "????????"
 
@@ -5616,6 +5631,14 @@ msgstr "????? ????? ?? ??? msgid "Retrieving buddy list"
 msgstr "????? ????? ?? ?????????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ?? ??????? ?????? ?? webcam ?? ??? ?????? ?? ? ?????????."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ?? ??????? ?????? ?? webcam ?? ??? ?????? ?? ? ?????????."
+
 msgid "Away From Computer"
 msgstr "???????/? ?? ???????????"
 
@@ -5658,14 +5681,6 @@ msgstr "???????? ???? ?? ? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "???????? ???? ?? ?? ? ????????? ??????? ?? ?????? ????????? ??????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?? ?????? ?? ????????/????????? ????? ?? ?????????."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ?? ???????? ?? ????????/????????? ????? ?? ?? ?????????."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "????? ?? ???????"
@@ -5697,6 +5712,51 @@ msgstr "????????? ?? MSN ??
 msgstr "????????? ?? MSN ??????????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ?? ? ??????? ?????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "?? ????? ?? ?? ??????? ?????????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "?? ????? ?? ?? ???????? ?????????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "?? ????? ?? ?? ????? ??????? ?? ?????????? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ?? ???? ?? ?? ??????, ??????? ??????? ? ?????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?? ? ??????? passport ??????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "???????? ? ?????????? ??????????."
+
+msgid "Unable to rename group"
+msgstr "?? ????? ?? ?? ??????????? ???????"
+
+msgid "Unable to delete group"
+msgstr "?? ????? ?? ?? ???????? ???????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?? ?????? ?? ????????/????????? ????? ?? ?????????."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ?? ???????? ?? ????????/????????? ????? ?? ?? ?????????."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "???? ????? ????????: %s"
 
@@ -5728,6 +5788,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "???? ?????"
 
@@ -5775,12 +5837,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "??????? ?????? ??? ???????"
+
 msgid "MySpaceIM Error"
 msgstr "?????? ?? MySpaceIM"
 
@@ -6094,9 +6158,6 @@ msgstr "???????? ?????? ?
 msgid "Master archive is misconfigured"
 msgstr "???????? ?????? ? ???????? ?????????????"
 
-msgid "Incorrect username or password"
-msgstr "??????? ?????? ??? ???????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "?? ????? ?? ?? ????????? ?????? ?? ???????????? ??? ??? ?? ????????"
 
@@ -6315,6 +6376,28 @@ msgstr "????? ?? ????????
 msgid "Server port"
 msgstr "????? ?? ????????"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "????? ?????????? HTTP ??????? ?? ????????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?? ?????????? ? ??????????? ????????. ????????? ????? ?????? ? ??????? ?? "
+"????????. ??? ?????????? ?? ????e??, ?? ????? ?? ?????? ???? ??????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?????? ??? ???????? ?? ??????? ?? ??????"
+
+msgid "Incorrect password."
+msgstr "?????? ???????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "?? ????? ?? ?? ????????? ?? ?????? ?? ???"
 
@@ -6614,14 +6697,31 @@ msgstr ""
 "????????? ? ?????????.  ??????? ?? ?????? ???? ?? ??????????? ?? ????? ? ?? "
 "??????? ???? ?????, ?????? ? ?????? ????? ??? ??? ?? ??????? ???? ??????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "???? ?? ?????? ???????? ?????????.  ????????? %s ?? ?????????.."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "?? ????? ?? ??????? ??????? AIM ??? ?? ??????."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "???? ?? ?????? ???????? ?????????.  ????????? %s ?? ?????????.."
+
+msgid "Unable to get a valid login hash."
+msgstr "?? ????? ?? ??????? ??????? ??? ?? ??????."
+
+msgid "Could Not Connect"
+msgstr "?? ????? ?? ?? ???????"
+
+msgid "Received authorization"
+msgstr "??????? ? ????????????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "????????? ?????????? ???."
 
-msgid "Incorrect password."
-msgstr "?????? ???????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "?????? ?????? ? ?????????? ????????????."
@@ -6630,26 +6730,20 @@ msgstr "AOL ???????? ?? ???
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL ???????? ?? ??????? ?????? ? ?????????? ??????????."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"?? ?????????? ? ??????????? ????????. ????????? ????? ?????? ? ??????? ?? "
-"????????. ??? ?????????? ?? ????e??, ?? ????? ?? ?????? ???? ??????."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "????????? ?? ???????? ??? ?? ????????? ? ????????. ?? ?????, ?????????? ?? %s"
 
-msgid "Could Not Connect"
-msgstr "?? ????? ?? ?? ???????"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"?? ?????????? ? ??????????? ????????. ????????? ????? ?????? ? ??????? ?? "
+"????????. ??? ?????????? ?? ????e??, ?? ????? ?? ?????? ???? ??????."
 
-msgid "Received authorization"
-msgstr "??????? ? ????????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "SecurID ?????? ??? ?? ???????? ? ?????????."
 
@@ -6665,20 +6759,6 @@ msgstr "_?? ???"
 msgid "_OK"
 msgstr "_?? ???"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "???? ?? ?????? ???????? ?????????.  ????????? %s ?? ?????????.."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "?? ????? ?? ??????? ??????? AIM ??? ?? ??????."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "???? ?? ?????? ???????? ?????????.  ????????? %s ?? ?????????.."
-
-msgid "Unable to get a valid login hash."
-msgstr "?? ????? ?? ??????? ??????? ??? ?? ??????."
-
 msgid "Password sent"
 msgstr "????????? ? ???????"
 
@@ -7212,6 +7292,7 @@ msgstr "??????? ????????? msgid "Set User Info (web)..."
 msgstr "??????? ?????????? ?????????? (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "??????? ??????? (web)"
 
@@ -7241,6 +7322,10 @@ msgstr "????? ???????? ??
 msgid "Search for Buddy by Information"
 msgstr "????? ???????? ?? ?????? ???????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "?????????? ?? ? ???????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9588,10 +9673,6 @@ msgstr "????? ?? ????????
 msgid "Auth Domain"
 msgstr "????? ?? ????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ?? ??????? ?????? ?? webcam ?? ??? ?????? ?? ? ?????????."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9617,6 +9698,44 @@ msgstr "?????????? ?? ???
 msgid "Add buddy rejected"
 msgstr "?????????? ?? ???????? ? ???????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "?????? ????????? ???????? ?? ??????? ?? ????????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "?????? ???????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"????????? ?????? ?? ???? %d. ??????????? ?? ?????????? ?? Yahoo! ???? ?? ?? "
+"??????? ???."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "?????????? ?? ??????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"????????? ?????? ?? ???? %d. ??????????? ?? ?????????? ?? Yahoo! ???? ?? ?? "
+"??????? ???."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??????? ?????? ??? ???????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9731,8 +9850,8 @@ msgstr "??????? ?? ??????
 msgid "Start Doodling"
 msgstr "??????? ?? ???????"
 
-msgid "Activate which ID?"
-msgstr "??? ID. ?? ?? ??????????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?? ??? ?? ?? ?? ????????? ?? ???????????"
@@ -10531,8 +10650,9 @@ msgstr "?? ????? ????????
 msgid "Please update the necessary fields."
 msgstr "?? ????? ?????????? ?? ?????????? ??????."
 
-msgid "Room _List"
-msgstr "????? ?? _????"
+#, fuzzy
+msgid "A_ccount"
+msgstr "??????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10541,8 +10661,8 @@ msgstr ""
 "??????? ?? ??????????? ?????????? ?? ?????????? ?? ??? ??? ?????? ?? ?? "
 "??????????.\n"
 
-msgid "_Account:"
-msgstr "_??????:"
+msgid "Room _List"
+msgstr "????? ?? _????"
 
 msgid "_Block"
 msgstr "_????????"
@@ -10982,6 +11102,112 @@ msgstr "/?????????/??????
 msgid "/Buddies/Sort Buddies"
 msgstr "/?????????/??????? ?????????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "???? ?? ????????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "???? ????? ? ???????? ?? ?????? ????? ?? ?????????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???? ?? ????????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_??????? ??"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "?????? ???? ?? ????????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_?????? ??"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "?????? ???? ?? ????????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "???????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "????????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "????? ?? ????????????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "???????? ? ?????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "??????? ?????????? ???? ?? %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ???????"
@@ -11489,6 +11715,10 @@ msgstr "Hungarian"
 msgid "Hungarian"
 msgstr "Hungarian"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
 msgid "Indonesian"
 msgstr "Indonesian"
 
@@ -11587,6 +11817,9 @@ msgstr "Swedish"
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -12030,11 +12263,10 @@ msgstr "??????? ?? ??????
 msgid "Save Image"
 msgstr "??????? ?? ???????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_??????? ?????..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "??????? ??????? ??????"
 
@@ -12122,9 +12354,6 @@ msgstr "?????? ?? ????"
 msgid "Font Face"
 msgstr "?????? ?? ????"
 
-msgid "Background Color"
-msgstr "???? ?? ????????"
-
 msgid "Foreground Color"
 msgstr "???? ?? ????"
 
@@ -12460,6 +12689,9 @@ msgstr "??????? ?? ???"
 msgid "Pounce on Whom"
 msgstr "??????? ?? ???"
 
+msgid "_Account:"
+msgstr "_??????:"
+
 msgid "_Buddy name:"
 msgstr "_??? ?? ????????:"
 
@@ -12570,9 +12802,18 @@ msgstr "???????? ?????? ?
 msgid "Unknown.... Please report this!"
 msgstr "???????? ?????? ?? ???????. ?? ????? ????????? ?? ???!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "?????? ?? ?????? ?? ????? ?? ?? ????????."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?????? ?? ?????? ?? ????? ?? ?? ????????."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "?????? ?? ?????? ?? ????? ?? ?? ????????."
+
 msgid "Install Theme"
 msgstr "?????????? ????"
 
@@ -13145,6 +13386,10 @@ msgstr "??????? ?? ??????
 msgstr "??????? ?? ???????????"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "?????? ????????"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "??????? ?? ???? _????? ?? ???? ??????:"
 
@@ -13373,6 +13618,78 @@ msgstr "????????? ??????? msgid "Displays statistical information about your buddies' availability"
 msgstr "????????? ??????????? ?????????? ?? ??????????? ?? ???????????"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "?????? ?? ????????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??????? ????????????? ??????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "???????? ?????? ?? ????????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "??????? ????? ?? ?????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "? ???????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "??????????? ?? ??????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ?? ????"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub ??????"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?????????? ?? ????????? ?? ???????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_???????????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "?????????? ?? ??????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???????? ?? ??????? ???????? ????? ?? ????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?????????? ?? ????????? ?? ???????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "???? ????????? ? ??????? ?? ?????????? ?? XMPP ??????? ??? ???????."
+
 msgid "Buddy is idle"
 msgstr "?????????? ? ?????????"
 
@@ -13877,12 +14194,6 @@ msgstr ""
 "- ???????? ??? ?? ??????? ?? ???????? ????????\n"
 "- ??????? ?????? ?? ??????????? ?????? ?? ??????? ??????"
 
-msgid "Cursor Color"
-msgstr "???? ?? ?????????"
-
-msgid "Secondary Cursor Color"
-msgstr "???? ?? ???????????? ???????"
-
 msgid "Hyperlink Color"
 msgstr "???? ?? ??????????"
 
@@ -13893,6 +14204,10 @@ msgstr "??? ?? ???? ?? ???
 msgid "Highlighted Message Name Color"
 msgstr "??? ?? ???? ?? ????????? ??????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "???? ?? ??????????? ??? ??????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ???????????? ???????????"
 
@@ -13922,35 +14237,24 @@ msgstr "GTK+ ???? ?? ??????? msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ???? ?? ?????????? ????????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "??? ?? ???????????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "?????? ??????????? ??? ??????"
 
-msgid "Widget Sizes"
-msgstr "???????? ?? ?????????? ????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "???????? ?? ???? ?? Pidgin GTK+"
 
+#, fuzzy
+msgid "Colors"
+msgstr "???????"
+
 msgid "Fonts"
 msgstr "???????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc ?????? ?? ????????"
 
@@ -14096,12 +14400,119 @@ msgstr ""
 "?? ???????? ??????? ?? ???????? ??? ??????? ????? ?? ?? ???????? ?????? "
 "??????? ?????????? ?? ??????????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "?? ??? ????????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "?? ??? ????????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???????? ?? ?? ????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "????????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????? ? ?????????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "?????? "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??????????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "??????? ?? ??????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "???? ?? ??????????????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "?????? ?? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Locale ?? ?????? ?? ????????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "??????? ?? ???????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "???????? ?? ???? ?? Pidgin GTK+"
+
+#, fuzzy
+msgid "Contact"
+msgstr "??????? ???????????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????? ?? ?????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????? ?? ?????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "???????? ?? ???? ?? Pidgin GTK+"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "???????? ?? ???? ?? Pidgin GTK+"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "????? ?? ?????????"
 
@@ -14307,6 +14718,21 @@ msgstr "???? ????????? ? ? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "???? ????????? ? ??????? ?? ?????????? ?? XMPP ??????? ??? ???????."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "??? ID. ?? ?? ??????????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "???? ?? ?????????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "???? ?? ???????????? ???????"
+
+#~ msgid "Interface colors"
+#~ msgstr "??? ?? ???????????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "???????? ?? ?????????? ????????"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "????? ?? ????????"
@@ -14769,9 +15195,6 @@ msgstr "???? ????????? ? ? #~ "?????? ?????? ?? ???????????? ??? ??????? %d ???? ???????? ?? "
 #~ "??????????????? %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "???? ????? ? ???????? ?? ?????? ????? ?? ?????????"
-
 #~ msgid "I am applying to join"
 #~ msgstr "???????? ?? ?? ?????????"
 
@@ -14793,9 +15216,6 @@ msgstr "???? ????????? ? ? #~ msgid "Enter your reason:"
 #~ msgstr "??????? ?? ?????????:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "?????? ??? ???????? ?? ??????? ?? ??????"
-
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "?? ????? ?? ?? ???????. ????????? ?? ????? ?? ??????????."
 
============================================================
--- po/mn.po	e142abffb4609edbc9185f55c7489fd42bf6b04c
+++ po/mn.po	be17dd1cac1644893dbe9394b73cb4bfb133834e
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2005-06-17 23:22-0800\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -1725,6 +1725,8 @@ msgstr "+++ %s ???????????? 
 msgid "+++ %s signed off"
 msgstr "+++ %s ???????????? ??????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "?? ???????? ?????"
 
@@ -2102,6 +2104,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??????? ?????? ?????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "?? %s ? ??????? ?????,?????? ??? ?????? ???????? %s ???????????? ."
@@ -3038,6 +3044,11 @@ msgstr "????? ???:"
 msgid "Chat _name:"
 msgstr "????? ???:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "????????? ????????? ?????????."
+
 msgid "Chat error"
 msgstr "????? ?????"
 
@@ -3086,6 +3097,10 @@ msgstr "Gadu-Gadu ??? ???????? msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ??? ?????????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???????????? ?????????? ??????????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?? ???????? ?????: %s"
@@ -3128,7 +3143,7 @@ msgstr "???? ??"
 msgid "_Password:"
 msgstr "???? ??"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3562,6 +3577,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3829,6 +3847,14 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???????????? ?????"
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3993,9 +4019,18 @@ msgstr "????? ????"
 msgid "Find Rooms"
 msgstr "????? ????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??? ???:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "???? ? ????? ??????? ?????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "?????"
+
 msgid "Ping timeout"
 msgstr ""
 
@@ -4015,7 +4050,7 @@ msgstr "????? XMPP ID. ??????
 msgstr "????? XMPP ID. ???????? ?????????? ????????."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "????????? ????????? ?????????."
 
 #, c-format
@@ -4042,9 +4077,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr ""
 
@@ -4057,6 +4089,9 @@ msgstr "?? ???"
 msgid "Date"
 msgstr "?? ???"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -4084,6 +4119,10 @@ msgstr "?????????? ?????? msgid "Change Registration"
 msgstr "?????????? ????????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "????????? ????????? ?????????."
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4446,13 +4485,14 @@ msgid ""
 msgstr "ban &lt;user&gt; [reason]: ???????? ???????????? ????????."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ?????? "
 "???????????? ??????? ??????????."
@@ -4515,6 +4555,9 @@ msgstr "???? ????????? ??
 msgid "File transfer proxies"
 msgstr "???? ????????? ??????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4912,6 +4955,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5252,64 +5299,27 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
+msgid "%s just sent you a Nudge!"
 msgstr ""
 
-msgid "Unknown error."
-msgstr "?? ???????? ?????."
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "?? ???????? ?????"
 
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s (%s) ??? ????? %s "
+msgid "Unable to add user"
+msgstr "????????? ????? ?????????"
 
 #, c-format
-msgid "%s just sent you a Nudge!"
-msgstr ""
-
-#. char *adl = g_strndup(payload, len);
-#, c-format
 msgid "Unknown error (%d)"
 msgstr ""
 
-msgid "Unable to add user"
-msgstr "????????? ????? ?????????"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s)? ????????? ????? ?????????"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s)? ????????? ????? ?????????"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s)? ???????????? ????????? ?????????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "???? ???????????? ???????? ??????? ?????? %s??? ????? ?????????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?? ????? ??????? ?????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "????????? ??? ??????????? ?????????? ??????"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "?? ???????????? ?????? ?????? ?????????????."
 
-msgid "Unable to rename group"
-msgstr "??????? ??? ???????? ?????????"
-
-msgid "Unable to delete group"
-msgstr "????? ?????? ?????????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5385,6 +5395,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "?? ???????? ?????."
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5403,6 +5416,14 @@ msgstr "???????????? ???? msgid "Retrieving buddy list"
 msgstr "???????????? ?????????? ???? ?????"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "???????????? ??? ??????"
 
@@ -5441,14 +5462,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "??????? ???????? ?????"
@@ -5480,6 +5493,51 @@ msgstr ""
 msgstr ""
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s (%s) ??? ????? %s "
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s)? ????????? ????? ?????????"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s)? ????????? ????? ?????????"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s)? ???????????? ????????? ?????????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "???? ???????????? ???????? ??????? ?????? %s??? ????? ?????????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?? ????? ??????? ?????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "????????? ??? ??????????? ?????????? ??????"
+
+msgid "Unable to rename group"
+msgstr "??????? ??? ???????? ?????????"
+
+msgid "Unable to delete group"
+msgstr "????? ?????? ?????????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5511,6 +5569,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "???? ???? "
 
@@ -5557,12 +5617,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "???????????? ??? ????? ???? ?? ?????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -5876,9 +5938,6 @@ msgstr "?????? ??????? ??
 msgid "Master archive is misconfigured"
 msgstr "?????? ??????? ????? ???????????"
 
-msgid "Incorrect username or password"
-msgstr "???????????? ??? ????? ???? ?? ?????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6082,6 +6141,25 @@ msgstr "????????? ????"
 msgid "Server port"
 msgstr "????????? ????"
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s ??????????? ????? ??????"
+
+msgid "Incorrect password."
+msgstr "???? ?? ?????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "??? ?????? ????????? ?????????"
 
@@ -6379,14 +6457,33 @@ msgstr ""
 "????????? ?????????: ???????????? ??? ????? ?????? ????????? ?????????. "
 "???????????? ??? ?? ??????? ???? ???? ?????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr "????????? ?????????"
+
+msgid "Received authorization"
+msgstr "?????? ????? ?????????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "???????????? ??? ?????."
 
-msgid "Incorrect password."
-msgstr "???? ?? ?????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "???? ?????????? ???????? ??? ??????? ?????."
@@ -6395,23 +6492,16 @@ msgstr "AOL ???????????? ?? msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL ???????????? ????????? ??? ??????????? ?????????? ?????."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "???? ??????? ?????? ???????? ?????? ?????. ????????? ??."
 
-msgid "Could Not Connect"
-msgstr "????????? ?????????"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr "?????? ????? ?????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???????? SecurID ??????? ????? ?????."
 
@@ -6427,22 +6517,6 @@ msgstr ""
 msgid "_OK"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr "???? ????? ????????"
 
@@ -6901,6 +6975,7 @@ msgstr ""
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "???? ?? ???????? (???)"
 
@@ -6930,6 +7005,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9167,10 +9245,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9194,6 +9268,38 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "?????? ????? ?????????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????? ???? ??"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "????????? ???????? ?????"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "???????????? ??? ????? ???? ?? ?????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9298,8 +9404,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "??? ID ??? ??????????? ???"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "????? ?????? ?????? ???"
@@ -10058,8 +10164,9 @@ msgstr "???????????? ???? msgid "Please update the necessary fields."
 msgstr "???????????? ??????????? ????????? ??."
 
-msgid "Room _List"
-msgstr "??????? ????????"
+#, fuzzy
+msgid "A_ccount"
+msgstr "???????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10067,8 +10174,8 @@ msgstr ""
 msgstr ""
 "??????????? ????? ?????? ????? ???????? ??????? ?????????? ??????? ??.\n"
 
-msgid "_Account:"
-msgstr "???????:"
+msgid "Room _List"
+msgstr "??????? ????????"
 
 msgid "_Block"
 msgstr "????"
@@ -10501,6 +10608,109 @@ msgstr "/?????????/??????
 msgid "/Buddies/Sort Buddies"
 msgstr "/?????????/???????????? ?????????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "???? ??????? ????"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "???? ???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???? ??????? ????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "???? ??????? ?????? ??????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "???? ??????? ?????? ??????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????? ??????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "??? ?????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "???????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "???????? "
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?????? ????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ??? ?????????? ???????"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ??????"
@@ -11004,6 +11214,10 @@ msgstr "????? ???"
 msgid "Hungarian"
 msgstr "????? ???"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "????? ???"
+
 msgid "Indonesian"
 msgstr "???????? ???"
 
@@ -11101,6 +11315,9 @@ msgstr "???? ???"
 msgid "Swedish"
 msgstr "???? ???"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "????? ???"
 
@@ -11509,11 +11726,9 @@ msgstr "??????? ????????"
 msgid "Save Image"
 msgstr "??????? ????????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "??????? ????????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11600,9 +11815,6 @@ msgstr "?????? ??????"
 msgid "Font Face"
 msgstr "?????? ??????"
 
-msgid "Background Color"
-msgstr "???? ??????? ????"
-
 msgid "Foreground Color"
 msgstr "??????? ??????? ????"
 
@@ -11902,6 +12114,9 @@ msgstr "???? ????????"
 msgid "Pounce on Whom"
 msgstr "???? ????????"
 
+msgid "_Account:"
+msgstr "???????:"
+
 msgid "_Buddy name:"
 msgstr "???????????? ???:"
 
@@ -12012,9 +12227,16 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "????? ??????? ????????? ??????"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12572,6 +12794,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "????????? ??????"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "??? ???????? ???????????? ??? ???? ??????? ???????"
 
@@ -12787,6 +13013,76 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "????????? ????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "???????????? ???????? ???????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "????? ???? ???????? ?????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????? ?????????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "???????????? ?????????? ??????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "?????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "??????? ??????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "??? ??????"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub ?????????"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "???????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?????? ????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "???????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "????????? ???????? ?????"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "XMPP-??? ??????????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "????????? ???????? ?????"
 
@@ -13264,12 +13560,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr "???????? ????"
-
-msgid "Secondary Cursor Color"
-msgstr "???????? ???? ???? ????"
-
 msgid "Hyperlink Color"
 msgstr "??????? ????????? ????"
 
@@ -13280,6 +13570,9 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13309,35 +13602,22 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "???????????? ????????"
+msgid "Disable Typing Notification Text"
+msgstr ""
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "????"
+
 msgid "Fonts"
 msgstr "???????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc ?????? ????????"
 
@@ -13471,12 +13751,113 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+msgid "Just logged in"
+msgstr ""
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "????????? ???????????? ???????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "????? ?????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "?????? ?????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "ICQ ???????????? ??????????."
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "?????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "????????"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??????????? ??????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ??? ?????"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "???? ??????? ????????"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "????? ?? ?????? ??????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "???????????? ????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "???????????? ????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -13673,6 +14054,18 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Activate which ID?"
+#~ msgstr "??? ID ??? ??????????? ???"
+
+#~ msgid "Cursor Color"
+#~ msgstr "???????? ????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "???????? ???? ???? ????"
+
+#~ msgid "Interface colors"
+#~ msgstr "???????????? ????????"
+
 #, fuzzy
 #~ msgid "Add buddy Q&A"
 #~ msgstr "????????? ?????"
@@ -13872,9 +14265,6 @@ msgstr ""
 #~ msgid "developer"
 #~ msgstr "??????????"
 
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP-??? ??????????"
-
 #~ msgid "Artists"
 #~ msgstr "???? ?????????"
 
============================================================
--- po/my_MM.po	3f6b592e708bcd38ee8d796fee41f8f1144f0c5d
+++ po/my_MM.po	b0ab19d35fd186e908966c8f8dffeec5fccde9c6
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Minn Myat Soe <mmyatsoe at gmail.com>\n"
 "Language-Team: \n"
@@ -1865,6 +1865,8 @@ msgstr "%s signed off"
 msgid "+++ %s signed off"
 msgstr "%s signed off"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -2257,6 +2259,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Error creating connection"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3284,7 +3290,12 @@ msgstr "Last name:"
 msgid "Chat _name:"
 msgstr "Last name:"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "Unable to ping server"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "Read error"
 
@@ -3342,6 +3353,10 @@ msgstr "Gadu-Gadu Search Engine"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Search Engine"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Set User Info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
@@ -3386,7 +3401,8 @@ msgstr "_Password:"
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
 #. 1. connect to server
@@ -3874,6 +3890,9 @@ msgstr "Server does not use any supporte
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
@@ -4174,6 +4193,14 @@ msgstr "Resource"
 msgid "Resource"
 msgstr "Resource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Logged out"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4348,10 +4375,19 @@ msgstr "Find Rooms"
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Non-matching Hosts"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Role"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Plain text"
 
@@ -4372,7 +4408,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Unable to connect to server."
 
 #, c-format
@@ -4401,9 +4437,6 @@ msgstr "Registration Failed"
 msgid "Unregistration Failed"
 msgstr "Registration Failed"
 
-msgid "Already Registered"
-msgstr "Already Registered"
-
 msgid "State"
 msgstr "County/State"
 
@@ -4417,6 +4450,9 @@ msgstr "Date"
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Already Registered"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "?????????????????"
@@ -4449,6 +4485,10 @@ msgstr "Registration Error"
 msgstr "Registration Error"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Unable to connect to server."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Error Changing Account Info"
 
@@ -4825,13 +4865,13 @@ msgid ""
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4900,6 +4940,9 @@ msgstr "File transfer port"
 msgid "File transfer proxies"
 msgstr "File transfer port"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5311,6 +5354,10 @@ msgstr "Remove Contact"
 msgid "Non-IM Contacts"
 msgstr "Remove Contact"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5698,69 +5745,28 @@ msgstr "Normal authentication failed!"
 msgstr "Normal authentication failed!"
 
 #, fuzzy, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid room name"
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "Unknown error"
-
-#, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr "Users on %s: %s"
-
-#, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ? %s (%s) ??? ??????????????"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Unknown error"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Unable to ban user %s"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
 #, fuzzy, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Unable to add user to privacy list (%s)."
+msgid "Unknown error (%d)"
+msgstr "Unknown error"
 
-#, fuzzy, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Unable to kick user %s"
-
-#, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Unable to invite user (%s)."
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is not a valid server name"
-
 #, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Service Temporarily Unavailable"
-
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "You missed %hu message from %s because it was too large."
 
-#, fuzzy
-msgid "Unable to rename group"
-msgstr "Unable to read"
-
-#, fuzzy
-msgid "Unable to delete group"
-msgstr "Unable to create socket"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5848,6 +5854,10 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Unknown error."
+msgstr "Unknown error"
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5869,6 +5879,14 @@ msgstr "Retrieving buddy list"
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
@@ -5905,14 +5923,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Address Book ?? ??????????????"
@@ -5945,7 +5955,55 @@ msgstr "AIM/ICQ Protocol Plugin"
 msgid "MSN Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
+#, fuzzy, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid room name"
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "Users on %s: %s"
+
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user to privacy list (%s)."
+
+#, fuzzy, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to kick user %s"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to invite user (%s)."
+
 #, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid server name"
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Service Temporarily Unavailable"
+
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "Unable to read"
+
+#, fuzzy
+msgid "Unable to delete group"
+msgstr "Unable to create socket"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5980,6 +6038,8 @@ msgstr "You were disconnected from the s
 msgstr "You were disconnected from the server."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Away message ?????"
@@ -6030,12 +6090,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Incorrect nickname or password."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6376,10 +6439,6 @@ msgstr "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Incorrect nickname or password."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognise the host of the username you entered"
 
@@ -6597,6 +6656,28 @@ msgstr "Server port"
 msgstr "Server port"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Invalid response from server."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Error creating connection"
+
+msgid "Incorrect password."
+msgstr "Incorrect password."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
 
@@ -6897,15 +6978,38 @@ msgstr ""
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin was unable to get a valid AIM login hash."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin was unable to get a valid login hash."
+
+msgid "Could Not Connect"
+msgstr "Could Not Connect"
+
+msgid "Received authorization"
+msgstr "Received authorisation"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Invalid Username"
 
-msgid "Incorrect password."
-msgstr "Incorrect password."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
@@ -6914,25 +7018,19 @@ msgstr "The AOL Instant Messenger servic
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "The client version you are using is too old. Please upgrade at %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "The client version you are using is too old. Please upgrade at %s"
-
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-msgid "Received authorization"
-msgstr "Received authorisation"
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6949,26 +7047,6 @@ msgstr "??????????? msgid "_OK"
 msgstr "????????????"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin was unable to get a valid AIM login hash."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin was unable to get a valid login hash."
-
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -7485,6 +7563,7 @@ msgstr "Set User Info (URL)..."
 msgid "Set User Info (web)..."
 msgstr "Set User Info (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Change Password (URL)"
@@ -7520,6 +7599,10 @@ msgstr "Search for Buddy by Information"
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "User is not logged in"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9948,10 +10031,6 @@ msgstr "Automatic"
 msgid "Auth Domain"
 msgstr "Automatic"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9977,6 +10056,40 @@ msgstr "Add buddy rejected"
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Unable to make SSL connection to server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Incorrect password."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "User does not exist"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Incorrect nickname or password."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10091,9 +10204,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Active which ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
@@ -10906,16 +11018,17 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Room List"
+msgid "A_ccount"
+msgstr "Account:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "?????????????????? chat ??? ????????????? ???????????????????? ?????? \n"
 
-msgid "_Account:"
-msgstr "_Account:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Room List"
 
 #, fuzzy
 msgid "_Block"
@@ -11410,6 +11523,117 @@ msgstr "/Buddies/Show Offline Buddies"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Background colour"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Do you want to add this buddy to your buddy list?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Logged out"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Background colour"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "(_E) ???????????????????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "(_C) ??????????????????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Shortcuts"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Away"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mood"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Get information on the selected buddy"
+
+msgid "Message Text"
+msgstr "Message Text"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Message Text"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ??????? ??????????????????? ????????????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11956,6 +12180,10 @@ msgstr "Hungarian"
 msgstr "Hungarian"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Macedonian"
 
@@ -12062,6 +12290,9 @@ msgstr "Swedish"
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -12506,11 +12737,9 @@ msgstr "Save Image"
 msgid "Save Image"
 msgstr "Save Image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12601,10 +12830,6 @@ msgstr "Font Face"
 msgstr "Font Face"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Background colour"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Foreground font colour"
 
@@ -12929,6 +13154,9 @@ msgstr "Pounce Who"
 msgid "Pounce on Whom"
 msgstr "Pounce Who"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
@@ -13053,9 +13281,16 @@ msgstr "Unknown pounce event. Please rep
 msgid "Unknown.... Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Failed to store image: %s\n"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13664,6 +13899,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "?????? ?????????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13902,6 +14141,78 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Server address"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Enter a Conference Server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Select a conference server to query"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online Services"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send Buddy List"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "When away"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Search for:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sound Selection"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description:</b> Spooky"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Set Dir Info"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "User does not exist"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Set Dir Info"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Buddy is idle:"
 
@@ -14427,12 +14738,6 @@ msgstr ""
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Hyperlink colour"
@@ -14445,6 +14750,10 @@ msgstr "Send Message"
 msgid "Highlighted Message Name Color"
 msgstr "Send Message"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Notification Removal"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14479,38 +14788,27 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ignore c_olours"
+msgid "Disable Typing Notification Text"
+msgstr "Mail ????? ????????????????"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin File Control"
 
 #, fuzzy
+msgid "Colors"
+msgstr "Close"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "Accounts"
 
 #, fuzzy
+msgid "Miscellaneous"
+msgstr "Miscellaneous error"
+
+#, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin File Control"
 
@@ -14654,12 +14952,119 @@ msgstr "Replaces text in outgoing messag
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Not logged in"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s logged out."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Chat ????????????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignore"
+
+#, fuzzy
+msgid "Founder"
+msgstr "hour"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Authorisation Given"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Request ambiguous"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Warning Level"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chat Room List Url"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Save Icon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????? ??????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????? ??????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin File Control"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin File Control"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
@@ -14877,6 +15282,14 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Active which ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ignore c_olours"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "(1 message)"
 
@@ -15368,10 +15781,6 @@ msgstr ""
 #~ msgstr "Users on %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Do you want to add this buddy to your buddy list?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "File operation error"
 
@@ -15380,10 +15789,6 @@ msgstr ""
 #~ msgstr "%s not currently logged in."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Error creating connection"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Unable to login to AIM"
 
@@ -15509,10 +15914,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "?????????????? ??????????????????? ????????????"
 
@@ -15668,13 +16069,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -16348,9 +16742,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Send a message to the selected buddy"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Get information on the selected buddy"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -16553,9 +16944,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Summary"
 
-#~ msgid "Message Text"
-#~ msgstr "Message Text"
-
 #~ msgid "Away Messages"
 #~ msgstr "Away Messages"
 
@@ -16654,9 +17042,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Critical error in GG library\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Unable to ping server"
-
 #~ msgid "Send as message"
 #~ msgstr "Send as message"
 
@@ -16870,9 +17255,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s logged in."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s logged out."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -16913,9 +17295,6 @@ msgstr ""
 #~ "(There was an error converting this message.  Check the 'Encoding' option "
 #~ "in the Account Editor)"
 
-#~ msgid "Miscellaneous error"
-#~ msgstr "Miscellaneous error"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr "Unknown error when attempting to authorise with MSN login server."
 
============================================================
--- po/nb.po	677f1e961f2a9c765dbb95d6d6b8200e9bea5115
+++ po/nb.po	dce33bd9c017f485b2bb26eb253515ffafa8f059
@@ -14,7 +14,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-24 18:47+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans at nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokm?l <i18n-nb at lister.ping.ui.no>\n"
@@ -1776,6 +1776,8 @@ msgstr "+++ %s logget av"
 msgid "+++ %s signed off"
 msgstr "+++ %s logget av"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -2179,6 +2181,10 @@ msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Feil: kunne ikke koble til"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du bruker %s, men dette tillegget krever %s."
@@ -3156,6 +3162,11 @@ msgstr "Samtale _navn:"
 msgid "Chat _name:"
 msgstr "Samtale _navn:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Kan ikke koble til tjener."
+
 msgid "Chat error"
 msgstr "Samtalefeil"
 
@@ -3204,6 +3215,10 @@ msgstr "Gadu-Gadu Bruker"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Bruker"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Henter tjener"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukjent kommando: %s"
@@ -3246,7 +3261,8 @@ msgstr "_Passord:"
 msgid "_Password:"
 msgstr "_Passord:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-kallenavn kan ikke inneholde mellomrom"
 
 #. 1. connect to server
@@ -3719,6 +3735,10 @@ msgstr "Tjeneren bruker ikke noen av de 
 msgid "Server does not use any supported authentication method"
 msgstr "Tjeneren bruker ikke noen av de st?ttede autentiseringsmetodene"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+"Du krever kryptering, men det er ikke st?tte for det p? denne serveren."
+
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring fra tjener"
 
@@ -3992,6 +4012,14 @@ msgstr "Ressurs"
 msgid "Resource"
 msgstr "Ressurs"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Logget inn"
+
 msgid "Middle Name"
 msgstr "Mellomnavn"
 
@@ -4162,10 +4190,18 @@ msgstr "Finn samtalerom"
 msgid "Find Rooms"
 msgstr "Finn samtalerom"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-"Du krever kryptering, men det er ikke st?tte for det p? denne serveren."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Ingen passende brukere funnet."
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rolle"
+
 msgid "Ping timeout"
 msgstr "Tidsavbrudd for ping"
 
@@ -4185,7 +4221,7 @@ msgstr "Ugyldig XMPP ID. Domenet m? vae
 msgstr "Ugyldig XMPP ID. Domenet m? vaere satt."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Klarte ikke koble til tjener."
 
 #, c-format
@@ -4212,9 +4248,6 @@ msgstr "Avregistrering feilet"
 msgid "Unregistration Failed"
 msgstr "Avregistrering feilet"
 
-msgid "Already Registered"
-msgstr "Du er allerede registrert"
-
 msgid "State"
 msgstr "Fylke/stat"
 
@@ -4227,6 +4260,9 @@ msgstr "Dato"
 msgid "Date"
 msgstr "Dato"
 
+msgid "Already Registered"
+msgstr "Du er allerede registrert"
+
 msgid "Unregister"
 msgstr "Avregistrer"
 
@@ -4255,6 +4291,10 @@ msgstr "Forandre Registrering"
 msgid "Change Registration"
 msgstr "Forandre Registrering"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Klarte ikke koble til tjener."
+
 msgid "Error unregistering account"
 msgstr "Feil ved avregistrering av konto"
 
@@ -4620,16 +4660,18 @@ msgstr "ban &lt;bruker&gt; [grunn]:  For
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;bruker&gt; [grunn]:  Forby en bruker fra rommet."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "Knytt &lt;bruker&gt; &lt;eier|admin|medlem|utst?tt|ingen&gt;: Sett en "
 "brukers tilknyting til rommet."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "rolle &lt;user&gt; &lt;moderator|deltaker|bes?kende|ingen&gt;: Sett en "
 "brukers rolle i rommet."
@@ -4694,6 +4736,9 @@ msgstr "Filoverf?ringsproxyer"
 msgid "File transfer proxies"
 msgstr "Filoverf?ringsproxyer"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5091,6 +5136,10 @@ msgstr "Ikke-lynmeldingskontakter"
 msgid "Non-IM Contacts"
 msgstr "Ikke-lynmeldingskontakter"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s har sendt deg en webcam invitasjon som enda ikke er st?ttet."
+
 msgid "Nudge"
 msgstr "Dytt"
 
@@ -5433,64 +5482,26 @@ msgstr "Windows Live ID autentisering: U
 msgstr "Windows Live ID autentisering: Ugyldig svar"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s er ikke et gyldig navn p? en gruppe."
-
-msgid "Unknown error."
-msgstr "Ukjent feil."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s p? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s har nettopp gitt deg en dytt!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Ukjent feil (%d)"
 
 msgid "Unable to add user"
 msgstr "Klarte ikke legge til bruker"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Ukjent feil (%d)"
+
 msgid "The following users are missing from your addressbook"
 msgstr "F?lgende brukere mangler i din adressebok"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Klarte ikke legge til bruker p? %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Klarte ikke blokkere brukeren p? %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Klarte ikke tillate bruker p? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-"%s kunne ikke bli lagt til kontaktlista, fordi din kontaktliste er full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s er ikke en gyldig passport-konto."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Tjenesten Midlertidig Utilgjengelig."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilbeskjeden ble ikke bli sendt fordi den var for lang."
 
-msgid "Unable to rename group"
-msgstr "Klarte ikke endre navn p? gruppe"
-
-msgid "Unable to delete group"
-msgstr "Klarte ikke slette gruppe"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5576,6 +5587,9 @@ msgstr ""
 "Din MSN-kontaktliste er midlertidig utilgjengelig. Vennligst pr?v igjen "
 "senere."
 
+msgid "Unknown error."
+msgstr "Ukjent feil."
+
 msgid "Handshaking"
 msgstr "H?ndtrykk"
 
@@ -5594,6 +5608,14 @@ msgstr "Henter kontaktliste"
 msgid "Retrieving buddy list"
 msgstr "Henter kontaktliste"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s har sendt deg en webcam invitasjon som enda ikke er st?ttet."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s har sendt deg en webcam invitasjon som enda ikke er st?ttet."
+
 msgid "Away From Computer"
 msgstr "Borte"
 
@@ -5635,14 +5657,6 @@ msgstr "Meldingen kunne ikke bli sendt p
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Meldingen kunne ikke bli sendt p? grunn av en ukjent feil:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s har lagt deg til i kontaktlisten sin."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s har fjernet deg fra sin kontaktliste."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Slette kontakt fra adresseboka?"
 
@@ -5672,6 +5686,52 @@ msgstr "MSN-protokolltillegg"
 msgstr "MSN-protokolltillegg"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s er ikke et gyldig navn p? en gruppe."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s p? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Klarte ikke legge til bruker p? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Klarte ikke blokkere brukeren p? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Klarte ikke tillate bruker p? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+"%s kunne ikke bli lagt til kontaktlista, fordi din kontaktliste er full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s er ikke en gyldig passport-konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tjenesten Midlertidig Utilgjengelig."
+
+msgid "Unable to rename group"
+msgstr "Klarte ikke endre navn p? gruppe"
+
+msgid "Unable to delete group"
+msgstr "Klarte ikke slette gruppe"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s har lagt deg til i kontaktlisten sin."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s har fjernet deg fra sin kontaktliste."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Ingen slik bruker: %s"
 
@@ -5700,6 +5760,8 @@ msgstr "Mistet forbindelsen med tjener"
 msgstr "Mistet forbindelsen med tjener"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nye e-post beskjeder"
 
@@ -5748,17 +5810,19 @@ msgstr "Protokoll feil, kode %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Protokoll feil, kode %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Passordet ditt er p? %d tegn. MySpaceIM godtar bare %d tegn. Gj?r "
 "passordet ditt kortere p? nettsiden http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword og pr?v p? nytt."
 
+msgid "Incorrect username or password"
+msgstr "Feil brukernavn eller passord"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-feil"
 
@@ -6074,9 +6138,6 @@ msgstr "Hovedarkiv er feil satt opp"
 msgid "Master archive is misconfigured"
 msgstr "Hovedarkiv er feil satt opp"
 
-msgid "Incorrect username or password"
-msgstr "Feil brukernavn eller passord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Klarte ikke kjenne igjen verten til det brukernavnet du tastet inn"
 
@@ -6292,6 +6353,28 @@ msgstr "Tjenerport"
 msgid "Server port"
 msgstr "Tjenerport"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Mottok uventet HTTP-svar fra tjener."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Du har koblet til og koblet fra for hurtig. Vent ti minutter og pr?v igjen. "
+"Hvis du fortsetter ? pr?ve n?, vil du m?tte vente enda lenger."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Feil: kunne ikke koble til"
+
+msgid "Incorrect password."
+msgstr "Feil passord."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Klarte ikke ble med i samtalerom"
 
@@ -6594,14 +6677,33 @@ msgstr ""
 "bokstav og bare inneholde bokstaver, tall og mellomrom, eller bare inneholde "
 "tall."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Du kan bli frakoblet ganske snart. Hvis det skjer, sjekk %s for "
+"oppdateringer."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Klarte ikke ? motta gyldig AIM-p?loggingshash."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Du kan bli frakoblet ganske snart. Sjekk %s for oppdateringer."
+
+msgid "Unable to get a valid login hash."
+msgstr "Klarte ikke ? motta en gyldig p?loggingshash."
+
+msgid "Could Not Connect"
+msgstr "Klarte ikke koble til"
+
+msgid "Received authorization"
+msgstr "Mottok godkjenning"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Ugyldig brukernavn."
 
-msgid "Incorrect password."
-msgstr "Feil passord."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Kontoen din er frosset."
@@ -6610,25 +6712,19 @@ msgstr "AOL Instant Messenger-tjenesten 
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger-tjenesten er midlertidig utilgjengelig."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Klientversjonen av programmet er for gammel. Vennligst oppgrader p? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Du har koblet til og koblet fra for hurtig. Vent ti minutter og pr?v igjen. "
 "Hvis du fortsetter ? pr?ve n?, vil du m?tte vente enda lenger."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Klientversjonen av programmet er for gammel. Vennligst oppgrader p? %s"
-
-msgid "Could Not Connect"
-msgstr "Klarte ikke koble til"
-
-msgid "Received authorization"
-msgstr "Mottok godkjenning"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Den inntastede SecurID-n?kkelen er ugyldig."
 
@@ -6644,22 +6740,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Du kan bli frakoblet ganske snart. Hvis det skjer, sjekk %s for "
-"oppdateringer."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Klarte ikke ? motta gyldig AIM-p?loggingshash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Du kan bli frakoblet ganske snart. Sjekk %s for oppdateringer."
-
-msgid "Unable to get a valid login hash."
-msgstr "Klarte ikke ? motta en gyldig p?loggingshash."
-
 msgid "Password sent"
 msgstr "Passord sendt"
 
@@ -7176,6 +7256,7 @@ msgstr "Sett brukerinfo (nett) ..."
 msgid "Set User Info (web)..."
 msgstr "Sett brukerinfo (nett) ..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Endre passord (nett)"
 
@@ -7205,6 +7286,10 @@ msgstr "Vennes?k etter informasjon"
 msgid "Search for Buddy by Information"
 msgstr "Vennes?k etter informasjon"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Brukeren er ikke p?logget"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9474,10 +9559,6 @@ msgstr "Autentiseringsdomene"
 msgid "Auth Domain"
 msgstr "Autentiseringsdomene"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s har sendt deg en webcam invitasjon som enda ikke er st?ttet."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9505,6 +9586,42 @@ msgstr "Legge til kontakt avsl?tt"
 msgid "Add buddy rejected"
 msgstr "Legge til kontakt avsl?tt"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Mottok ugyldige data over forbindelsen med tjeneren."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Feil passord"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ukjent feilkode %d. ? logge inn p? Yahoo!s nettside, kan kanskje l?se dette."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Brukeren eksisterer ikke"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ukjent feilkode %d. ? logge inn p? Yahoo!s nettside, kan kanskje l?se dette."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Feil brukernavn eller passord"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9616,8 +9733,8 @@ msgstr "Start kruseduller"
 msgid "Start Doodling"
 msgstr "Start kruseduller"
 
-msgid "Activate which ID?"
-msgstr "Aktiver hvilken ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Bli med hvem i samtalegruppe?"
@@ -10402,16 +10519,17 @@ msgstr "Oppdater de n?dvendige feltene.
 msgid "Please update the necessary fields."
 msgstr "Oppdater de n?dvendige feltene."
 
-msgid "Room _List"
-msgstr "Rom_liste"
+#, fuzzy
+msgid "A_ccount"
+msgstr "K_onto:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Skriv inn informasjon om samtalegruppen du ?nsker ? bli med i.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Rom_liste"
 
 msgid "_Block"
 msgstr "_Blokker"
@@ -10843,6 +10961,112 @@ msgstr "/Kontakter/Sorter kontakter"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kontakter/Sorter kontakter"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Bakgrunnsfarge"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Denne gruppen har blitt lagt til kontaktlisten din"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Bakgrunnsfarge"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Utvid"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Velg bakgrunnsfarge"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Lukk"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Velg bakgrunnsfarge"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Snarvei"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "P?logget"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Borte"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Avlogget"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Sinnsstemningstekst"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Beskjed sendt"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Endre brukerinformasjon for %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-tjenere"
@@ -11348,6 +11572,10 @@ msgstr "Ungarsk"
 msgid "Hungarian"
 msgstr "Ungarsk"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumensk"
+
 msgid "Indonesian"
 msgstr "Indonesisk"
 
@@ -11445,6 +11673,9 @@ msgstr "Svensk"
 msgid "Swedish"
 msgstr "Svensk"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11873,11 +12104,9 @@ msgstr "Lagre bilde"
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Lagre bilde..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Legg til tilpassede smilefjes"
 
@@ -11969,9 +12198,6 @@ msgstr "Skrifttype"
 msgid "Font Face"
 msgstr "Skrifttype"
 
-msgid "Background Color"
-msgstr "Bakgrunnsfarge"
-
 msgid "Foreground Color"
 msgstr "Forgrunnsfarge"
 
@@ -12301,6 +12527,9 @@ msgstr "Varsling for hvem"
 msgid "Pounce on Whom"
 msgstr "Varsling for hvem"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "_Kontaktnavn:"
 
@@ -12411,9 +12640,18 @@ msgstr "Ukjent varslingshendelse. Vennli
 msgid "Unknown.... Please report this!"
 msgstr "Ukjent varslingshendelse. Vennligst rapporter dette!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Smiley tema feilet ? pakke ut."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Smiley tema feilet ? pakke ut."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Smiley tema feilet ? pakke ut."
+
 msgid "Install Theme"
 msgstr "Installer tema"
 
@@ -12974,6 +13212,10 @@ msgstr "Tilpassede smilefjes"
 msgid "Custom Smiley Manager"
 msgstr "Tilpassede smilefjes"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Velg kontakt"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klikk for ? endre kontaktikonet for denne kontoen."
 
@@ -13193,6 +13435,80 @@ msgstr "Vis statistikk om dine kontakter
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Vis statistikk om dine kontakters tilgjengelighet"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Tjeneradresse"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Skriv inn en konferansetjener"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Velg en konferanseserver ? sp?rre"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Tjenester p? nett"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send kontaktliste"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Forlater"
+
+#
+#, fuzzy
+msgid "Directory"
+msgstr "Logg Katalog"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Lydvalg"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub Service"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Beskrivelse"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Tjenesteoppdagingsinfo"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Nettleser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Brukeren eksisterer ikke"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Tjener st?tter ikke blokkering"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Tjenesteoppdagingsinfo"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Dette tillegget er kjekt ? ha for debugging av XMPP servere og klienter."
+
 msgid "Buddy is idle"
 msgstr "Kontakt er inaktiv"
 
@@ -13703,12 +14019,6 @@ msgstr ""
 "- Det reverserer all tekst som du mottar\n"
 "- Det sender en beskjed til kontaktene i kontaktlisten straks de logger p?"
 
-msgid "Cursor Color"
-msgstr "Peker Farge"
-
-msgid "Secondary Cursor Color"
-msgstr "Andre Peker Farge"
-
 msgid "Hyperlink Color"
 msgstr "Farge p? lenker"
 
@@ -13718,6 +14028,10 @@ msgstr "Farge for fremhevede beskjednavn
 msgid "Highlighted Message Name Color"
 msgstr "Farge for fremhevede beskjednavn"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Skrivevarslingsfarge"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView Horizontal Separation"
 
@@ -13747,35 +14061,24 @@ msgstr "GTK+ Tekst Tema Snarvei"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Tekst Tema Snarvei"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Grensesnitt farger"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Aktiver varsling om skriving"
 
-msgid "Widget Sizes"
-msgstr "Widget Sizes"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ Tema Kontroll"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Lukk"
+
 msgid "Fonts"
 msgstr "Fonter"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc Fil Verkt?y"
 
@@ -13913,12 +14216,119 @@ msgstr "Erstatter tekst i utg?ende besk
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstatter tekst i utg?ende beskjeder etter regler som du bestemmer."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Ikke p?logget"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Ikke p?logget"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Bli med i en samtalegruppe"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorer"
+
+#, fuzzy
+msgid "Founder"
+msgstr "H?yere"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Godkjent"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Feil"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informasjon"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Foresp?rselsdialog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Advarselsniv?er"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status for %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Samtaleroms spr?k"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Endre ikon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ Tema Kontroll"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktinformasjon"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Kontaktliste"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Kontaktliste"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ Tema Kontroll"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ Tema Kontroll"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Rullende kontaktliste"
 
@@ -14126,6 +14536,21 @@ msgstr ""
 msgstr ""
 "Dette tillegget er kjekt ? ha for debugging av XMPP servere og klienter."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktiver hvilken ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Peker Farge"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Andre Peker Farge"
+
+#~ msgid "Interface colors"
+#~ msgstr "Grensesnitt farger"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget Sizes"
+
 #~ msgid "Invite message"
 #~ msgstr "Invitasjonsbeskjed"
 
@@ -14657,9 +15082,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Din foresp?rsel til ? bli med i gruppen %d har blitt godkjent av admin %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Denne gruppen har blitt lagt til kontaktlisten din"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Jeg s?ker om ? bli med"
 
@@ -14682,10 +15104,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "Skriv din grunn:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Feil: kunne ikke koble til"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Klarte ikke logge inn, sjekk debug logg"
 
@@ -14729,9 +15147,6 @@ msgstr ""
 #~ "for kontakten. Aliaset vil bli vist i stedet for skjermnavnet der det er "
 #~ "mulig.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "K_onto:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "_Skjermnavn:"
 
============================================================
--- po/ne.po	a35a6cc85373d44eee7e1fc6a98db2fce1314aa8
+++ po/ne.po	ef888c5469e61757427f5078dc67cc8608f1a6af
@@ -9,7 +9,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2006-06-27 21:08+0545\n"
 "Last-Translator: Shyam Krishna Bal <shyamkrishna_bal at yahoo.com>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
@@ -1850,6 +1850,8 @@ msgstr "%s ?????? ???"
 msgid "+++ %s signed off"
 msgstr "%s ?????? ???"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "?????? ??????"
 
@@ -2239,6 +2241,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "???? ??????? ????? ??????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3263,7 +3269,12 @@ msgstr "?????? ???:"
 msgid "Chat _name:"
 msgstr "?????? ???:"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "????? ????? ???? ?????"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "?????? ?????????"
 
@@ -3320,6 +3331,10 @@ msgstr "Gadu-Gadu ???? ???
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ???? ??????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??????????? ????? ??? ?????????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?????? ????: %s"
@@ -3364,7 +3379,8 @@ msgstr "???????:"
 msgid "_Password:"
 msgstr "???????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ?????????? ???? ???? ???? ???????? ????? ????"
 
 #. 1. connect to server
@@ -3852,6 +3868,9 @@ msgstr "??????? ????msgid "Server does not use any supported authentication method"
 msgstr "??????? ???? ??? ??????? ?????????? ???? ?????? ??????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "????? ??? ???? ??????"
 
@@ -4152,6 +4171,14 @@ msgstr "??????"
 msgid "Resource"
 msgstr "??????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?? ????????"
+
 msgid "Middle Name"
 msgstr "????? ???"
 
@@ -4326,10 +4353,19 @@ msgstr "??????? ????msgid "Find Rooms"
 msgstr "??????? ???? ??????????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "??????? ????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??????"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "???? ???"
 
@@ -4350,7 +4386,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "??????? ???? ???? ???? ??? ?"
 
 #, c-format
@@ -4379,9 +4415,6 @@ msgstr "????? ???? ?
 msgid "Unregistration Failed"
 msgstr "????? ???? ???"
 
-msgid "Already Registered"
-msgstr "??????? ???????? ???? ?"
-
 msgid "State"
 msgstr "??????"
 
@@ -4395,6 +4428,9 @@ msgstr "????"
 msgid "Date"
 msgstr "????"
 
+msgid "Already Registered"
+msgstr "??????? ???????? ???? ?"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "?????"
@@ -4427,6 +4463,10 @@ msgstr "????? ??????msgstr "????? ??????"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "??????? ???? ???? ???? ??? ?"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "???? ????? ???????? ????? ??????"
 
@@ -4801,17 +4841,18 @@ msgstr "?????????? &
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "?????????? &lt;???????????&gt; [????]:??????? ??????????? ?????????? ?"
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "???????? &lt;???????????&gt; &lt;?????|???????|??????|????????|???? ??? ??? &gt;: "
 "???????? ????????????? ???????? ??? ????????? ?"
 
 #, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "???????? &lt;???????????&gt; &lt;?????|???????|??????|????????|???? ??? ??? &gt;: "
 "???????? ????????????? ???????? ??? ????????? ?"
@@ -4883,6 +4924,9 @@ msgstr "???? ???????msgid "File transfer proxies"
 msgstr "???? ????????? ?????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5291,6 +5335,10 @@ msgstr "??????? ????msgid "Non-IM Contacts"
 msgstr "??????? ??????????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5678,67 +5726,29 @@ msgstr "??????? ????msgid "Windows Live ID authentication:Invalid response"
 msgstr "??????? ?????????? ????!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s ??? ???? ??? ?"
-
-msgid "Unknown error."
-msgstr "?????? ??????"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s (%s)??%s"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ?? ????? ???? ????? ??????"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "?????? ??????"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "%s ?????????????? ????? ????? ???"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "?????? ??????"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s)?? ??????????? ???? ????? ? ?"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s)?? ??????????? ????? ????? ?"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s)?? ??????????? ?????? ??? ????? ?"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ???? ????? ?????? ??????? ???? ???? ?????? ? ?"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ??? ???? ???????? ???? ?"
-
 #, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "???? ??????? ????? ?????? ???"
-
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "??????????? ?????? ???? ???? ?????? ????? ?????:"
 
-msgid "Unable to rename group"
-msgstr "?????? ??? ???:?????? ???? ????? ?"
-
-msgid "Unable to delete group"
-msgstr "???? ?????? ????? ?"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5825,6 +5835,9 @@ msgstr ""
 "??????? MSN ???? ???? ??????? ????? ?????? ??? ? ?????, ????????? ????????? ? ???? ?????? "
 "????????? ?"
 
+msgid "Unknown error."
+msgstr "?????? ??????"
+
 msgid "Handshaking"
 msgstr "?????????? ??????"
 
@@ -5843,6 +5856,14 @@ msgstr "???? ???? ??
 msgid "Retrieving buddy list"
 msgstr "???? ???? ???:???????? ??????"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "???????????? ???? ?"
 
@@ -5880,14 +5901,6 @@ msgstr "?????? ?????msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????? ????? ??? ??????? ?????? ?????? ?????? ???? ? :"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ????????????? ????? ???? ?????? %s ???? ???????"
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ????????????? ????? ???? ?????? %s ???? ???????"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "?????? ???????? ?????????"
@@ -5921,6 +5934,52 @@ msgstr "AIM/ICQ ????????
 msgstr "AIM/ICQ ???????? ??????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ??? ???? ??? ?"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s (%s)??%s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s)?? ??????????? ???? ????? ? ?"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s)?? ??????????? ????? ????? ?"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s)?? ??????????? ?????? ??? ????? ?"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ???? ????? ?????? ??????? ???? ???? ?????? ? ?"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ??? ???? ???????? ???? ?"
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "???? ??????? ????? ?????? ???"
+
+msgid "Unable to rename group"
+msgstr "?????? ??? ???:?????? ???? ????? ?"
+
+msgid "Unable to delete group"
+msgstr "???? ?????? ????? ?"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ????????????? ????? ???? ?????? %s ???? ???????"
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ????????????? ????? ???? ?????? %s ???? ???????"
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5954,6 +6013,8 @@ msgstr "????? ???  ?? msgstr "????? ???  ????? ???? ???????? ??????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "???? ???? ??????"
@@ -6004,12 +6065,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "??? ????? ?? ??????? ?"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6349,10 +6413,6 @@ msgstr "?????? ?????msgstr "?????? ?????? ??????? ??????? ???? ?"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "??? ????? ?? ??????? ?"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "??????? ????????? ?????????? ?????????????? ??????? ?????? ???? ????"
 
@@ -6565,6 +6625,29 @@ msgstr "????? ?????"
 msgstr "????? ?????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "???????? ???? ???? ?"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"??????? ???????? ???? ? ???? ??????? ????? ????????? ? ?? ????? ????????? ????????? ? ???? "
+"?????? ????????? ? ??? ???????? ?????? ???? ???? ????????? ???, ??????? ?? ??? ????????? "
+"?????????? ????? ?"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "???? ??????? ????? ??????"
+
+msgid "Incorrect password."
+msgstr "??? ??????? ?"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "???? ???? ?????"
 
@@ -6865,15 +6948,38 @@ msgstr ""
 "???? ???????? ???? ????????? ? ????????, ????????? ? ???? ???????? ?????? ???? ?????, ?? "
 "???? ????????? ????? ?????? ???? ????? ?"
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"??????? ????????????? ???? ??????? ???? ?????????? ?  ?????? ?? ????? TOC ???? ?????? ???? "
+"??????????? ?   ??????????? ???? %s ???? ????????? ?"
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "???? ???? ??? AIM ???? ????? ??????? ???? ????? ??? ?"
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"??????? ????????????? ???? ??????? ???? ?????????? ?  ?????? ?? ????? TOC ???? ?????? ???? "
+"??????????? ?   ??????????? ???? %s ???? ????????? ?"
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "???? ???? ??? ???? ????? ??????? ???? ????? ??? ?"
+
+msgid "Could Not Connect"
+msgstr "???? ???? ????"
+
+msgid "Received authorization"
+msgstr "??????? ??????????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "???? ?????"
 
-msgid "Incorrect password."
-msgstr "??? ??????? ?"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "??????? ???? ??? ???? ?????? ? ?"
@@ -6882,27 +6988,21 @@ msgstr "AOL ????? ????
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL ????? ???????? ???? ??????? ????? ?????? ??? ?"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+"??????? ?????? ??????? ???? ?????? ??????? ??? ?????? ? ? ????? %s ?? ?????????? ?????????"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "??????? ???????? ???? ? ???? ??????? ????? ????????? ? ?? ????? ????????? ????????? ? ???? "
 "?????? ????????? ? ??? ???????? ?????? ???? ???? ????????? ???, ??????? ?? ??? ????????? "
 "?????????? ????? ?"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"??????? ?????? ??????? ???? ?????? ??????? ??? ?????? ? ? ????? %s ?? ?????????? ?????????"
-
-msgid "Could Not Connect"
-msgstr "???? ???? ????"
-
-msgid "Received authorization"
-msgstr "??????? ??????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???????? ?????? ???????? ID ?????? ???? ? ?"
 
@@ -6919,26 +7019,6 @@ msgstr "??? ?"
 msgid "_OK"
 msgstr "??? ?"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"??????? ????????????? ???? ??????? ???? ?????????? ?  ?????? ?? ????? TOC ???? ?????? ???? "
-"??????????? ?   ??????????? ???? %s ???? ????????? ?"
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "???? ???? ??? AIM ???? ????? ??????? ???? ????? ??? ?"
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"??????? ????????????? ???? ??????? ???? ?????????? ?  ?????? ?? ????? TOC ???? ?????? ???? "
-"??????????? ?   ??????????? ???? %s ???? ????????? ?"
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "???? ???? ??? ???? ????? ??????? ???? ????? ??? ?"
-
 msgid "Password sent"
 msgstr "??????? ??????"
 
@@ -7449,6 +7529,7 @@ msgstr "(URL)?????????
 msgid "Set User Info (web)..."
 msgstr "(URL)??????????? ????? ??? ?????????..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "??????? (URL) ???????? ?????????"
@@ -7484,6 +7565,10 @@ msgstr "????? ??????msgid "Search for Buddy by Information"
 msgstr "????? ?????? ?????? ???? ?????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "??????????? ???? ???? ???"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9912,10 +9997,6 @@ msgstr "????????"
 msgid "Auth Domain"
 msgstr "????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9942,6 +10023,40 @@ msgstr "???? ???? ??
 msgid "Add buddy rejected"
 msgstr "???? ???? ???????? ?????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "??????? SSL ???? ????? ????? ? ?"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "??? ??????? ?"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "?????? ?????? ??????? %d ? ????! ????????? ???? ??????? ????? ????? ???? ???? ?"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "??????????? ??????? ???"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "?????? ?????? ??????? %d ? ????! ????????? ???? ??????? ????? ????? ???? ???? ?"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??? ????? ?? ??????? ?"
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10055,9 +10170,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "??? ID ?????? ??????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "???? ????????? ?? ?????????? ??"
@@ -10872,8 +10986,8 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "???? ????"
+msgid "A_ccount"
+msgstr "????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10881,8 +10995,9 @@ msgstr ""
 msgstr ""
 "????? ??????? ???? ???? ?????? ?????????? ?????? ???? ?????????? ????????? ?????????? ?\n"
 
-msgid "_Account:"
-msgstr "????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "???? ????"
 
 #, fuzzy
 msgid "_Block"
@@ -11376,6 +11491,117 @@ msgstr "/???????/???
 msgid "/Buddies/Sort Buddies"
 msgstr "/???????/?????? ??????? ???????????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "????????? ??"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "?? ?????? ????? ???? ?????? ?? ???? ???? ????????????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "?? ????????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????????? ??"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "???????? ????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????????? ??? ??? ?????????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "???? ?????????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????????? ??? ??? ?????????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "??? ?????? ?????? ??????? ??????? ?????????"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "????"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "??? ?????? ?????? ??????? ??????? ?????????"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "??? ?????? ?????? ??????? ??????? ?????????"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "???"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "??? ?????? ?????? ??????? ??????? ?????????"
+
+msgid "Message Text"
+msgstr "?????? ???"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "?????? ???"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ?? ???? ??????????? ????? ???????? ?????????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11916,6 +12142,10 @@ msgstr "?????????"
 msgstr "?????????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "????????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "????????????"
 
@@ -12021,6 +12251,9 @@ msgstr "???????"
 msgid "Swedish"
 msgstr "???????"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "???????"
@@ -12469,11 +12702,10 @@ msgstr "??? ??? ????
 msgid "Save Image"
 msgstr "??? ??? ?????????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "??? ??? ?????????..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "??????????? ???????? ???????????"
 
@@ -12565,10 +12797,6 @@ msgstr "???? ?????"
 msgstr "???? ?????"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "????????? ??"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "???????? ???? ??"
 
@@ -12901,6 +13129,9 @@ msgstr "????? ??????msgid "Pounce on Whom"
 msgstr "????? ?????? ??????????"
 
+msgid "_Account:"
+msgstr "????:"
+
 msgid "_Buddy name:"
 msgstr "???? ???:"
 
@@ -13025,9 +13256,16 @@ msgstr "?????? ???? 
 msgid "Unknown.... Please report this!"
 msgstr "?????? ???? ?????? ????????? ? ????? ?? ????????? ?????????!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "??? ??????? ???? ???? ???: %s\n"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13635,6 +13873,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "???? ??? ?????????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13872,6 +14114,78 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "????? ??????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "???? ??????? ????? ???????? ?????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "???????? ??????? ????? ??? ?????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "???? ???? ??????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "???? ???? ????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "?????????? ????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ???"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>?????:</b> ??????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?????????? ????? ??? ?????????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "???????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "??????????? ??????? ???"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "??????? ???? ??? ??????? ?????????? ???? ?????? ??????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?????????? ????? ??? ?????????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "???? ???? ?:"
 
@@ -14397,12 +14711,6 @@ msgstr ""
 "- ???? ??? ???? ?????? ?????????\n"
 "- ???? ??????? ?????? ????? ??????? ?????? ????? ???????? ?????? ??????"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "????????? ??"
@@ -14415,6 +14723,10 @@ msgstr "?????? ?????msgid "Highlighted Message Name Color"
 msgstr "?????? ??????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "????? ?????? ?????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14449,37 +14761,24 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "????? ??????? ?????????"
+msgid "Disable Typing Notification Text"
+msgstr "???? ?????? ????????"
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
 #, fuzzy
+msgid "Colors"
+msgstr "???? ?????????"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "???????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "???? ???? ?????????"
@@ -14623,12 +14922,117 @@ msgstr "??????????? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "??????????? ???????? ???? ?????? ????? ???? ??????????? ??? ????? ?"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???? ???"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ????? ??? ?"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???? ?????????? ??? ????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "??????? ?????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??? ?????????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????? ??????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "??????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "?????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??????? ????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "???????????: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "???????? ???? ?????????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "??????? ??? ?????????"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "???? ?????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "???? ????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "???? ????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "???? ???????????"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "?????? ???????"
 
@@ -14844,6 +15248,14 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "??? ID ?????? ??????"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "????? ??????? ?????????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "?????? ?????? ?????????"
 
@@ -15335,18 +15747,10 @@ msgstr ""
 #~ msgstr "%s ?? ??????????????: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "?? ?????? ????? ???? ?????? ?? ???? ???? ????????????"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "???? ??????? ??????"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "???? ??????? ????? ??????"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "AIM ?? ???? ???? ?????"
 
@@ -15472,10 +15876,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "??????:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "????:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "??????? ????????? ???????????"
 
@@ -15640,9 +16040,6 @@ msgstr ""
 #~ msgid " left the room (%s)."
 #~ msgstr "???? (%s) ??? ???????? ?"
 
-#~ msgid "Expander Size"
-#~ msgstr "???????? ????"
-
 #~ msgid "Size of the expander arrow"
 #~ msgstr "???????? ?????? ????"
 
@@ -15813,13 +16210,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>?????:</b> ??????"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status</b>: Awesome"
 #~ msgstr ""
 #~ "\n"
@@ -15847,9 +16237,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "??? ?????? ?????? ???? ?????? ??????????"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "??? ?????? ?????? ??????? ??????? ?????????"
-
 #~ msgid "_Chat"
 #~ msgstr "????????"
 
@@ -16142,9 +16529,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "??????"
 
-#~ msgid "Message Text"
-#~ msgstr "?????? ???"
-
 #~ msgid "Away Messages"
 #~ msgstr "???? ?????????"
 
@@ -16257,9 +16641,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "GG ??????????? ????????? ??????\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "????? ????? ???? ?????"
-
 #~ msgid "Send as message"
 #~ msgstr "???????? ????? ??????????"
 
@@ -16366,9 +16747,6 @@ msgstr ""
 #~ msgid "Nick:"
 #~ msgstr "?????:"
 
-#~ msgid "Pidgin User"
-#~ msgstr "???? ???????????"
-
 #~ msgid "File Transfer Aborted"
 #~ msgstr "???? ?????????? ???????? ?????"
 
@@ -16701,9 +17079,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s ?? ??? ?"
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ????? ??? ?"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
============================================================
--- po/nl.po	b6d9697939ebe7c4f3fae6238abfcf9112a6c680
+++ po/nl.po	051140ebebeafe1ab94920e53dd7eda04b896685
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-01-06 17:27+0100\n"
 "Last-Translator: Dani?l Heres <danielheres at gmail.com>\n"
 "Language-Team: Dutch <nl at li.org>\n"
@@ -1781,6 +1781,8 @@ msgstr "+++ %s heeft zich afgemeld"
 msgid "+++ %s signed off"
 msgstr "+++ %s heeft zich afgemeld"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -2202,6 +2204,10 @@ msgstr "(%s) %s <AUTO-ANTWOORD>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-ANTWOORD>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Fout bij maken verbinding"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "je gebruikt %s, maar de plug-in heeft %s nodig."
@@ -3197,6 +3203,11 @@ msgstr "_Naam chatgesprek:"
 msgid "Chat _name:"
 msgstr "_Naam chatgesprek:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Kan geen verbinding maken met de computer."
+
 msgid "Chat error"
 msgstr "Chatfout"
 
@@ -3246,6 +3257,10 @@ msgstr "Gadu-gadu-gebruiker"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-gadu-gebruiker"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Server verkrijgen"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende opdracht: %s"
@@ -3288,7 +3303,8 @@ msgstr "_Wachtwoord:"
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-bijnamen mogen geen spaties bevatten"
 
 #. 1. connect to server
@@ -3771,6 +3787,9 @@ msgstr "Server gebruikt geen van de onde
 msgid "Server does not use any supported authentication method"
 msgstr "Server gebruikt geen van de ondersteunde identificatiemethoden"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Je hebt encryptie nodig, maar het is niet mogelijk op deze server."
+
 msgid "Invalid challenge from server"
 msgstr "Ongeldige vraag van server"
 
@@ -4045,6 +4064,14 @@ msgstr "Hulpmiddel"
 msgid "Resource"
 msgstr "Hulpmiddel"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Ingelogd"
+
 msgid "Middle Name"
 msgstr "Tweede naam"
 
@@ -4211,9 +4238,18 @@ msgstr "Ruimtes zoeken"
 msgid "Find Rooms"
 msgstr "Ruimtes zoeken"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Je hebt encryptie nodig, maar het is niet mogelijk op deze server."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Niet overeenkomende gebruikers gevonden"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rol"
+
 msgid "Ping timeout"
 msgstr "Ping Verlopen"
 
@@ -4233,7 +4269,7 @@ msgstr "Ongeldige XMPP ID. Domein moet i
 msgstr "Ongeldige XMPP ID. Domein moet ingesteld worden"
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Kan geen verbinding maken met de server."
 
 #, c-format
@@ -4260,9 +4296,6 @@ msgstr "Registratie Ongedaan Maken Mislu
 msgid "Unregistration Failed"
 msgstr "Registratie Ongedaan Maken Mislukt"
 
-msgid "Already Registered"
-msgstr "Al geregistreerd"
-
 msgid "State"
 msgstr "Staat"
 
@@ -4275,6 +4308,9 @@ msgstr "Datum"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Al geregistreerd"
+
 msgid "Unregister"
 msgstr "Registratie ongedaan maken"
 
@@ -4302,6 +4338,10 @@ msgstr "Verander Registratie: "
 msgid "Change Registration"
 msgstr "Verander Registratie: "
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Kan geen verbinding maken met de server."
+
 msgid "Error unregistering account"
 msgstr "Fout bij het ongedaan maken van de registratie"
 
@@ -4667,16 +4707,18 @@ msgstr ""
 msgstr ""
 "ban &lt;gebruiker&gt; [reden]:  Een gebruiker uit een ruimte verbannen."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;naam&gt; &lt;owner|admin|member|outcast|none&gt;:Relatie tot "
 "een ruimte/kanaal instellen."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;naam&gt; &lt;moderator|participant|visitor|none&gt;:Rol van "
 "gebruiker in de ruimte instellen"
@@ -4743,6 +4785,9 @@ msgstr "Bestandsoverdracht poortnummer"
 msgid "File transfer proxies"
 msgstr "Bestandsoverdracht poortnummer"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5142,6 +5187,12 @@ msgstr "Niet-chat contacten"
 msgid "Non-IM Contacts"
 msgstr "Niet-chat contacten"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"ondersteund."
+
 msgid "Nudge"
 msgstr "Aanstoten"
 
@@ -5485,64 +5536,27 @@ msgstr "Windows Live ID autenticatie: on
 msgstr "Windows Live ID autenticatie: ongeldig antwoord."
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s is geen geldige groep."
-
-msgid "Unknown error."
-msgstr "Onbekende fout."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s op %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s heeft u zojuist een duwtje gegeven!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Onbekende fout (%d)"
 
 msgid "Unable to add user"
 msgstr "Kan gebruiker niet toevoegen"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Onbekende fout (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Resultaten van uw zoekopdracht"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kan gebruiker niet toevoegen op %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kan gebruiker niet blokkeren op %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kan gebruiker geen toestemming geven op %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Kan %s niet toevoegen omdat uw contactenlijst vol is."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is geen geldig passport-account."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Service momenteel niet beschikbaar."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiel bericht is niet verstuurd omdat het te lang is."
 
-msgid "Unable to rename group"
-msgstr "Kan groep niet hernoemen"
-
-msgid "Unable to delete group"
-msgstr "Kan groep niet verwijderen"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5630,6 +5644,9 @@ msgstr ""
 "Uw MSN contactenlijst is op dit moment niet beschikbaar. Probeer het later "
 "nog eens."
 
+msgid "Unknown error."
+msgstr "Onbekende fout."
+
 msgid "Handshaking"
 msgstr "Verbinding opzetten"
 
@@ -5648,6 +5665,18 @@ msgstr "Opvragen van contactenlijst"
 msgid "Retrieving buddy list"
 msgstr "Opvragen van contactenlijst"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"ondersteund."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"ondersteund."
+
 msgid "Away From Computer"
 msgstr "Weg van de computer"
 
@@ -5691,14 +5720,6 @@ msgstr "Bericht is misschien niet verstu
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Bericht is misschien niet verstuurd wegens een onbekende fout:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s heeft u aan zijn/haar contactenlijst toegevoegd."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s heeft u van zijn/haar contactenlijst verwijderd."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Contact verwijderen uit adresboek?"
 
@@ -5729,6 +5750,51 @@ msgstr "MSN-protocol-plug-in"
 msgstr "MSN-protocol-plug-in"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s is geen geldige groep."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s op %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kan gebruiker niet toevoegen op %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kan gebruiker niet blokkeren op %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kan gebruiker geen toestemming geven op %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Kan %s niet toevoegen omdat uw contactenlijst vol is."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is geen geldig passport-account."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Service momenteel niet beschikbaar."
+
+msgid "Unable to rename group"
+msgstr "Kan groep niet hernoemen"
+
+msgid "Unable to delete group"
+msgstr "Kan groep niet verwijderen"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s heeft u aan zijn/haar contactenlijst toegevoegd."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s heeft u van zijn/haar contactenlijst verwijderd."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Onbekende gerbuiker: %s"
 
@@ -5760,6 +5826,8 @@ msgstr "Verbinding met de server verlore
 msgstr "Verbinding met de server verloren"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nieuwe e-mailberichten"
 
@@ -5808,18 +5876,20 @@ msgstr "Protocol fout, code %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol fout, code %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Je wachtwoord bestaat uit %d characters, groter dan de verwachte maximum "
 "waarde van %d voor MySpaceIM. Verkort je wachtwoord op http://profileedit."
 "myspace.com/index.cfm?fuseaction=accountSettings.changePassword en probeer "
 "het opnieuw."
 
+msgid "Incorrect username or password"
+msgstr "Ongeldige gebruikersnaam of wachtwoord"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fout"
 
@@ -6139,9 +6209,6 @@ msgstr "Hoofdarchief onjuist geconfigure
 msgid "Master archive is misconfigured"
 msgstr "Hoofdarchief onjuist geconfigureerd"
 
-msgid "Incorrect username or password"
-msgstr "Ongeldige gebruikersnaam of wachtwoord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kan de host van de gebruikersnaam die je hebt ingevoerd niet vinden"
 
@@ -6362,6 +6429,28 @@ msgstr "Server-poort"
 msgid "Server port"
 msgstr "Server-poort"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
+"keer. Als je verdergaat moet je nog langer wachten "
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Fout oplossing %s"
+
+msgid "Incorrect password."
+msgstr "Ongeldig wachtwoord."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Kon gesprek-ruimte niet binnenkomen"
 
@@ -6669,14 +6758,33 @@ msgstr ""
 "met een letter en slechts cijfers, letters en spaties bevatten, of slechts "
 "nummers bevatten."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kon geen geldige AIM aanmeld-hash krijgen."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kon geen geldige aanmeld-hash krijgen."
+
+msgid "Could Not Connect"
+msgstr "Kan geen verbinding maken"
+
+msgid "Received authorization"
+msgstr "Toestemming gekregen"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Ongeldige gebruikersnaam."
 
-msgid "Incorrect password."
-msgstr "Ongeldig wachtwoord."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Uw Account is momenteel afgesloten"
@@ -6685,26 +6793,20 @@ msgstr "De AOL service is momenteel niet
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "De AOL service is momenteel niet bereikbaar."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
-"keer. Als je verdergaat moet je nog langer wachten "
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
 
-msgid "Could Not Connect"
-msgstr "Kan geen verbinding maken"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
+"keer. Als je verdergaat moet je nog langer wachten "
 
-msgid "Received authorization"
-msgstr "Toestemming gekregen"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Ingevoerde SecurID sleutel is ongeldig."
 
@@ -6720,22 +6822,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kon geen geldige AIM aanmeld-hash krijgen."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kon geen geldige aanmeld-hash krijgen."
-
 msgid "Password sent"
 msgstr "Wachtwoord verzonden"
 
@@ -7253,6 +7339,7 @@ msgstr "Gebruikersinfo Instellen (web)..
 msgid "Set User Info (web)..."
 msgstr "Gebruikersinfo Instellen (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Wachtwoord veranderen (web)"
 
@@ -7282,6 +7369,10 @@ msgstr "Contact zoeken via informatie"
 msgid "Search for Buddy by Information"
 msgstr "Contact zoeken via informatie"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Gebruiker is niet aangemeld"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9579,12 +9670,6 @@ msgstr "Domein"
 msgid "Auth Domain"
 msgstr "Domein"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
-"ondersteund."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9612,6 +9697,44 @@ msgstr "Contact toevoegen geweigerd"
 msgid "Add buddy rejected"
 msgstr "Contact toevoegen geweigerd"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Ongeldige data ontvangen van server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Ongeldig wachtwoord"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
+"kunnen lossen."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Gebruiker bestaat niet"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
+"kunnen lossen."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Ongeldige gebruikersnaam of wachtwoord"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9726,8 +9849,8 @@ msgstr "Wakker schudden"
 msgid "Start Doodling"
 msgstr "Wakker schudden"
 
-msgid "Activate which ID?"
-msgstr "Welk ID activeren?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Deelnemen aan wiens chat?"
@@ -10515,16 +10638,17 @@ msgstr "Update de belangrijke velden."
 msgid "Please update the necessary fields."
 msgstr "Update de belangrijke velden."
 
-msgid "Room _List"
-msgstr "_Lijst Van Ruimtes"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Account"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Geef de benodigde informatie van de chat die u wilt openen.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+msgid "Room _List"
+msgstr "_Lijst Van Ruimtes"
 
 msgid "_Block"
 msgstr "_Blokkeren"
@@ -10965,6 +11089,111 @@ msgstr "/Contacten/Sorteren"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacten/Sorteren"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Achtergrondkleur"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laotiaans"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Achtergrondkleur"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Uitvouwen"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Achtergrondkleur selecteren"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Dichtvouwen"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Achtergrondkleur selecteren"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Snelkoppeling"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Afwezig"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline "
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Humeur-tekst"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Bericht verzonden"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Gebruikersinformatie aanpassen voor %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Servers"
@@ -11472,6 +11701,10 @@ msgstr "Hongaars"
 msgid "Hungarian"
 msgstr "Hongaars"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Roemeens"
+
 msgid "Indonesian"
 msgstr "Indonesisch"
 
@@ -11570,6 +11803,9 @@ msgstr "Zweeds"
 msgid "Swedish"
 msgstr "Zweeds"
 
+msgid "Swahili"
+msgstr ""
+
 # ui/preferences.glade.h:192
 msgid "Tamil"
 msgstr "Tamil"
@@ -12001,11 +12237,9 @@ msgstr "Afbeelding opslaan"
 msgid "Save Image"
 msgstr "Afbeelding opslaan"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Afbeelding _opslaan..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Eigen smiley toevoegen"
 
@@ -12095,9 +12329,6 @@ msgstr "Lettertype"
 msgid "Font Face"
 msgstr "Lettertype"
 
-msgid "Background Color"
-msgstr "Achtergrondkleur"
-
 msgid "Foreground Color"
 msgstr "Tekstkleur"
 
@@ -12430,6 +12661,9 @@ msgstr "Wie alarmeren"
 msgid "Pounce on Whom"
 msgstr "Wie alarmeren"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Contactnaam:"
 
@@ -12540,9 +12774,18 @@ msgstr "Onbekend contactalarm. Rapportee
 msgid "Unknown.... Please report this!"
 msgstr "Onbekend contactalarm. Rapporteer dit alstublieft!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Kan smileythema niet uitpakken."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Kan smileythema niet uitpakken."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Kan smileythema niet uitpakken."
+
 msgid "Install Theme"
 msgstr "Installeer thema"
 
@@ -13104,6 +13347,10 @@ msgstr "Eigen smileys beheren"
 msgid "Custom Smiley Manager"
 msgstr "Eigen smileys beheren"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Contact selecteren"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klik om het contactplaatje voor dit account te veranderen."
 
@@ -13327,6 +13574,78 @@ msgstr "Geeft statististieke informatie 
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Geeft statististieke informatie over de beschikbaarheid van je contact"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Server-adres"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Verbinden met server voor groepsgesprekken"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Kies een te raadplegen conferentieserver"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online diensten"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Contactenlijst verzenden"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "...weggaat"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Map voor logboeken"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Geluid selecteren"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub dienst"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Beschrijving"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Directory info instellen"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Gebruiker bestaat niet"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server gebruikt geen van de ondersteunde identificatiemethoden"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Directory info instellen"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Deze plug-in is handig voor het debuggen van XMPP servers of clienten."
+
 msgid "Buddy is idle"
 msgstr "Contact is inactief"
 
@@ -13850,12 +14169,6 @@ msgstr ""
 "- Het keert alle binnenkomende tekst om\n"
 "- Het stuurt direct een bericht naar mensen wanneer ze online komen"
 
-msgid "Cursor Color"
-msgstr "Cursorkleur"
-
-msgid "Secondary Cursor Color"
-msgstr "Secundaire cursorkleur"
-
 msgid "Hyperlink Color"
 msgstr "Kleur van verwijzing"
 
@@ -13865,6 +14178,10 @@ msgstr "Gemarkeerde bericht-kleur"
 msgid "Highlighted Message Name Color"
 msgstr "Gemarkeerde bericht-kleur"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Kleur van melding van typen"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horizontale scheiding"
 
@@ -13895,35 +14212,24 @@ msgstr "GTK+ snelkoppelingtekst-thema"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ snelkoppelingtekst-thema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Kleuren van interface"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Schakel typmelding in"
 
-msgid "Widget Sizes"
-msgstr "Elementgrootte"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ themabeheer"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Sluiten"
+
 msgid "Fonts"
 msgstr "Lettertypen"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc bestandsbesturing"
 
@@ -14066,12 +14372,119 @@ msgstr "Vervangt tekst in uitgaande beri
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Vervangt tekst in uitgaande berichten volgens uw eigen regels."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Niet aangemeld"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Niet aangemeld"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Chat openen"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Negeren"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Harder"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Toestemming gegeven"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Fout"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informatie"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Vraag"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Waarschuwingsniveau"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status van %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Taal van chatruimte"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Icoon veranderen"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ themabeheer"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Accountinformatie"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Contactenlijst"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Contactenlijst"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ themabeheer"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ themabeheer"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Contacten-ticker"
 
@@ -14285,6 +14698,21 @@ msgstr "Deze plug-in is handig voor het 
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Deze plug-in is handig voor het debuggen van XMPP servers of clienten."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Welk ID activeren?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Cursorkleur"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Secundaire cursorkleur"
+
+#~ msgid "Interface colors"
+#~ msgstr "Kleuren van interface"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Elementgrootte"
+
 #~ msgid "Invite message"
 #~ msgstr "Uitnodiging"
 
============================================================
--- po/nn.po	09f48d5b5d74d2791a8f5fb38ddfbd17679353ce
+++ po/nn.po	5ed99cee23dd9396277c931c43e091b6798ee54e
@@ -2,7 +2,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-20 23:45+0100\n"
 "Last-Translator: YS Landro <nynorsk at strilen.net>\n"
 "Language-Team: \n"
@@ -1763,6 +1763,8 @@ msgstr "+++ %s logga av"
 msgid "+++ %s signed off"
 msgstr "+++ %s logga av"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2165,6 +2167,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Tilkoplingsfeil"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du nyttar %s, men dette tillegget krev %s."
@@ -3133,6 +3139,11 @@ msgstr "Prate_namn:"
 msgid "Chat _name:"
 msgstr "Prate_namn:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Klarer ikkje ? kopla til tenaren."
+
 msgid "Chat error"
 msgstr "Prateromsfeil"
 
@@ -3181,6 +3192,10 @@ msgstr "Gadu-Gadu-brukar"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-brukar"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Hentar tenar"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukjend kommando: %s"
@@ -3223,7 +3238,8 @@ msgstr "_Passord:"
 msgid "_Password:"
 msgstr "_Passord:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-kallenamn kan ikkje innehalda mellomrom"
 
 #. 1. connect to server
@@ -3696,6 +3712,9 @@ msgstr "Tenaren nyttar ikkje ein autenti
 msgid "Server does not use any supported authentication method"
 msgstr "Tenaren nyttar ikkje ein autentiseringsmetode som er st?tta "
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Du krev kryptering som ikkje er tilgjengeleg p? denne tenaren."
+
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring fr? tenaren"
 
@@ -3968,6 +3987,14 @@ msgstr "Ressurs"
 msgid "Resource"
 msgstr "Ressurs"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "P?logga"
+
 msgid "Middle Name"
 msgstr "Mellomnamn"
 
@@ -4135,9 +4162,18 @@ msgstr "Finn rom"
 msgid "Find Rooms"
 msgstr "Finn rom"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Du krev kryptering som ikkje er tilgjengeleg p? denne tenaren."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Kallenamn:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Fann ingen brukarar"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Stilling"
+
 msgid "Ping timeout"
 msgstr "Tidsavbrot ping"
 
@@ -4157,7 +4193,7 @@ msgstr "Ulovleg XMPP-id. Domene m? vera
 msgstr "Ulovleg XMPP-id. Domene m? vera vald."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Klarte ikkje ? kopla til tenaren."
 
 #, c-format
@@ -4184,9 +4220,6 @@ msgstr "Avregistreringa feila"
 msgid "Unregistration Failed"
 msgstr "Avregistreringa feila"
 
-msgid "Already Registered"
-msgstr "Allereie registrert"
-
 msgid "State"
 msgstr "Fylke/region/stat"
 
@@ -4199,6 +4232,9 @@ msgstr "Dato"
 msgid "Date"
 msgstr "Dato"
 
+msgid "Already Registered"
+msgstr "Allereie registrert"
+
 msgid "Unregister"
 msgstr "Avregistrer"
 
@@ -4226,6 +4262,10 @@ msgstr "Endra registreringa"
 msgid "Change Registration"
 msgstr "Endra registreringa"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Klarte ikkje ? kopla til tenaren."
+
 msgid "Error unregistering account"
 msgstr "Feil ved avregistreringa av kontoen"
 
@@ -4588,16 +4628,18 @@ msgstr "ban &lt;brukar&gt; [?rsak]:  ut
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;brukar&gt; [?rsak]:  utesteng brukaren fr? rommet."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;brukar&gt; &lt;owner|admin|member|outcast|none&gt;: vel kva "
 "tilknyting brukaren har til rommet."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;brukar&gt; &lt;moderator|participant|visitor|none&gt;: vel kva "
 "rolle brukaren har i rommet."
@@ -4661,6 +4703,9 @@ msgstr "Mellomlager filoverf?ringar"
 msgid "File transfer proxies"
 msgstr "Mellomlager filoverf?ringar"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5058,6 +5103,12 @@ msgstr "Andre enn lynmeldingskontaktar"
 msgid "Non-IM Contacts"
 msgstr "Andre enn lynmeldingskontaktar"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
+"st?tta."
+
 msgid "Nudge"
 msgstr "Dytt"
 
@@ -5399,63 +5450,26 @@ msgstr "Windows Live ID-autentisering: u
 msgstr "Windows Live ID-autentisering: ugyldig svar"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s er ikkje ei gyldig gruppe."
-
-msgid "Unknown error."
-msgstr "Ukjend feil."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s p? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s har nettopp sendt deg ein dytt!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "ukjend feil (%d)"
 
 msgid "Unable to add user"
 msgstr "Klarte ikkje ? leggja til brukar"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Desse brukarane er ikkje i adresseboka di"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Klarte ikkje ? leggja til brukaren p? %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "ukjend feil (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Klarte ikkje ? blokkera brukaren p? %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "Desse brukarane er ikkje i adresseboka di"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Klarte ikkje ? tillata brukaren p? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "Klarte ikkje ? leggja til %s fordi vennelista di er full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s er ikkje ein gyldig Passport-konto."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Tenesta er mellombels utilgjengeleg."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilmeldinga blei ikkje sendt sidan ho var for lang."
 
-msgid "Unable to rename group"
-msgstr "Klarte ikkje ? endra namnet til gruppa"
-
-msgid "Unable to delete group"
-msgstr "Klarer ikkje ? sletta gruppa"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5541,6 +5555,9 @@ msgstr ""
 msgstr ""
 "MSN-vennelista di er mellombels utilgjengeleg. Vent ei stund og pr?v igjen."
 
+msgid "Unknown error."
+msgstr "Ukjend feil."
+
 msgid "Handshaking"
 msgstr "Protokollsjekk"
 
@@ -5559,6 +5576,18 @@ msgstr "Hentar vennelista"
 msgid "Retrieving buddy list"
 msgstr "Hentar vennelista"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
+"st?tta."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
+"st?tta."
+
 msgid "Away From Computer"
 msgstr "Vekke fr? datamaskina"
 
@@ -5598,14 +5627,6 @@ msgstr ""
 msgstr ""
 "Det kan vera at meldinga ikkje blei sendt sidan ein ukjend feil oppstod:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s har lagt deg til i vennelista si."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s har fjerna deg fr? vennelista si."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Sletta venn fr? adresseboka?"
 
@@ -5635,6 +5656,51 @@ msgstr "MSN-protokolltillegg"
 msgstr "MSN-protokolltillegg"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s er ikkje ei gyldig gruppe."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s p? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Klarte ikkje ? leggja til brukaren p? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Klarte ikkje ? blokkera brukaren p? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Klarte ikkje ? tillata brukaren p? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "Klarte ikkje ? leggja til %s fordi vennelista di er full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s er ikkje ein gyldig Passport-konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tenesta er mellombels utilgjengeleg."
+
+msgid "Unable to rename group"
+msgstr "Klarte ikkje ? endra namnet til gruppa"
+
+msgid "Unable to delete group"
+msgstr "Klarer ikkje ? sletta gruppa"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s har lagt deg til i vennelista si."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s har fjerna deg fr? vennelista si."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Brukaren %s finst ikkje"
 
@@ -5663,6 +5729,8 @@ msgstr "Mista sambandet til tenaren"
 msgstr "Mista sambandet til tenaren"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nye e-postmeldingar"
 
@@ -5711,17 +5779,19 @@ msgstr "Protokollfeil, kode %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfeil, kode %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Passordet ditt er p? %d teikn. MySpaceIM godtek berre %d teikn. Gjer "
 "passordet ditt kortare p? nettsida http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword og pr?v p? nytt."
 
+msgid "Incorrect username or password"
+msgstr "Feil brukarnamn eller passord"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-feil"
 
@@ -6038,9 +6108,6 @@ msgstr "Hovudarkivet har feile innstilli
 msgid "Master archive is misconfigured"
 msgstr "Hovudarkivet har feile innstillingar"
 
-msgid "Incorrect username or password"
-msgstr "Feil brukarnamn eller passord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Fann ikkje verten til brukarnamnet du skreiv inn"
 
@@ -6249,6 +6316,28 @@ msgstr "Tenarport"
 msgid "Server port"
 msgstr "Tenarport"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Fekk uventa HTTP-svar fr? tenar."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"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."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Klarte ikkje ? sl? opp %s"
+
+msgid "Incorrect password."
+msgstr "Feil passord."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Klarte ikkje ? bli med i praterommet"
 
@@ -6550,14 +6639,32 @@ msgstr ""
 "ein bokstav og berre innehalda bokstavar. tal og mellomrom, eller berre "
 "innehalda tal."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Du kan bli fr?kopla snart. Dersom du blir det, sj? etter oppdateringar p? %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Klarer ikkje ? henta ein gyldig AIM p?loggingsn?kkel."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Du kan bli fr?kopla snart. Sj? etter oppdateringar p? %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "Klarer ikkje ? henta ein gyldig p?loggingsn?kkel."
+
+msgid "Could Not Connect"
+msgstr "Klarte ikkje ? kopla til"
+
+msgid "Received authorization"
+msgstr "Godkjenning motteken"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Ugyldig rukarnamn."
 
-msgid "Incorrect password."
-msgstr "Feil passord."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Kontoen din er for tida sperra for bruk."
@@ -6566,25 +6673,19 @@ msgstr "AOL si lynmeldingsteneste er mel
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL si lynmeldingsteneste er mellombels utilgjengeleg."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Klientversjonen du bruker er for gammal. Oppgrader p? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "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."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Klientversjonen du bruker er for gammal. Oppgrader p? %s"
-
-msgid "Could Not Connect"
-msgstr "Klarte ikkje ? kopla til"
-
-msgid "Received authorization"
-msgstr "Godkjenning motteken"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Den innskrivne SecurID-n?kkelen er ugyldig."
 
@@ -6600,21 +6701,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Du kan bli fr?kopla snart. Dersom du blir det, sj? etter oppdateringar p? %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Klarer ikkje ? henta ein gyldig AIM p?loggingsn?kkel."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Du kan bli fr?kopla snart. Sj? etter oppdateringar p? %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Klarer ikkje ? henta ein gyldig p?loggingsn?kkel."
-
 msgid "Password sent"
 msgstr "Passordet er sendt"
 
@@ -7123,6 +7209,7 @@ msgstr "Skriv inn brukarinfo (nett)..."
 msgid "Set User Info (web)..."
 msgstr "Skriv inn brukarinfo (nett)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Endra passordet (nett)"
 
@@ -7152,6 +7239,10 @@ msgstr "S?k etter venn utfr? opplysnin
 msgid "Search for Buddy by Information"
 msgstr "S?k etter venn utfr? opplysningar"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Brukaren er ikkje innlogga"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9427,12 +9518,6 @@ msgstr "Autentiseringsdomene"
 msgid "Auth Domain"
 msgstr "Autentiseringsdomene"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
-"st?tta."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9460,6 +9545,44 @@ msgstr "Er blitt nekta ? leggja til ven
 msgid "Add buddy rejected"
 msgstr "Er blitt nekta ? leggja til venn"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Det kom ugyldige data fr? sambandet med tenaren."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Feil passord"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ukjent feilnummer %d. Du kan kanskje l?ysa problemet ved ? nytta Yahoo! sin "
+"nettstad for ? logga deg p?."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Brukaren finst ikkje"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Ukjent feilnummer %d. Du kan kanskje l?ysa problemet ved ? nytta Yahoo! sin "
+"nettstad for ? logga deg p?."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Feil brukarnamn eller passord"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9572,8 +9695,8 @@ msgstr "Laga krusedullar"
 msgid "Start Doodling"
 msgstr "Laga krusedullar"
 
-msgid "Activate which ID?"
-msgstr "Kva ID skal takast i bruk?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Bli med kven i praterommet?"
@@ -10357,8 +10480,9 @@ msgstr "Oppdater dei n?dvendige felta."
 msgid "Please update the necessary fields."
 msgstr "Oppdater dei n?dvendige felta."
 
-msgid "Room _List"
-msgstr "Rom_liste"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10366,8 +10490,8 @@ msgstr ""
 msgstr ""
 "Skriv inn n?dvendig informasjon om praterommet du ?nskjer ? g? inn i.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Rom_liste"
 
 msgid "_Block"
 msgstr "_Blokker"
@@ -10801,6 +10925,111 @@ msgstr "/Venner/Sorter venner"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Venner/Sorter venner"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Bakgrunnsfarge"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Bakgrunnsfarge"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Utvid"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Vel bakgrunnsfarge"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Sl? saman"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Vel bakgrunnsfarge"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Snarveg"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Tilkopla"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Vekke"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Fr?kopla"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Sinnsstemningstekst"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Melding sendt"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Endra brukaropplysningane til %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-tenarar"
@@ -11303,6 +11532,10 @@ msgstr "Ungarsk"
 msgid "Hungarian"
 msgstr "Ungarsk"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumensk"
+
 msgid "Indonesian"
 msgstr "Indonesisk"
 
@@ -11400,6 +11633,9 @@ msgstr "Svensk"
 msgid "Swedish"
 msgstr "Svensk"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11829,11 +12065,9 @@ msgstr "Lagra bilete"
 msgid "Save Image"
 msgstr "Lagra bilete"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Lagra bilete..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Legg til eige smilefjes..."
 
@@ -11923,9 +12157,6 @@ msgstr "Skrifttype"
 msgid "Font Face"
 msgstr "Skrifttype"
 
-msgid "Background Color"
-msgstr "Bakgrunnsfarge"
-
 msgid "Foreground Color"
 msgstr "Forgrunnsfarge"
 
@@ -12256,6 +12487,9 @@ msgstr "Varsling for"
 msgid "Pounce on Whom"
 msgstr "Varsling for"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "_Vennenamn:"
 
@@ -12366,9 +12600,18 @@ msgstr "Ukjend varselhending. Rapporter 
 msgid "Unknown.... Please report this!"
 msgstr "Ukjend varselhending. Rapporter feilen."
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Feil under utpakkinga av smilefjestemaet."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Feil under utpakkinga av smilefjestemaet."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Feil under utpakkinga av smilefjestemaet."
+
 msgid "Install Theme"
 msgstr "Installer tema"
 
@@ -12928,6 +13171,10 @@ msgstr "Tilpassa smilefjesbehandling"
 msgid "Custom Smiley Manager"
 msgstr "Tilpassa smilefjesbehandling"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Vel venn"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klikk for ? endra venneikonet til denne kontoen."
 
@@ -13149,6 +13396,79 @@ msgstr "Syner statistikkopplysningar om 
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Syner statistikkopplysningar om vennen din sitt tilgjenge"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Tenaradresse"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "F?r opp ein konferansetenar"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Vel ein konferansetenar ? sp?rja"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Nettenester"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send vennelista"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "G?r vekk"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Loggkatalog"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Lydval"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub-teneste"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Skildring"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Tenesteoppdagingsinfo"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Nettlesar:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Brukaren finst ikkje"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Tenaren st?ttar ikkje blokkering"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Tenesteoppdagingsinfo"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Dette programtillegget er nyttig ved feils?king av XMPP-tenarar og -klientar."
+
 msgid "Buddy is idle"
 msgstr "Vennen er uverksam"
 
@@ -13648,12 +13968,6 @@ msgstr ""
 "- det snur all innkommande tekst til ? bli baklengs\n"
 "- det sender ei melding til personar i vennelista di n?r dei loggar p?"
 
-msgid "Cursor Color"
-msgstr "Peikarfarge"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekundaer peikarfarge"
-
 msgid "Hyperlink Color"
 msgstr "Lenkjefarge"
 
@@ -13663,6 +13977,10 @@ msgstr "Framheva melding"
 msgid "Highlighted Message Name Color"
 msgstr "Framheva melding"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Skrivevarselfarge"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Horisontal deling GtkTreeView"
 
@@ -13693,35 +14011,24 @@ msgstr "GTK+ snarvegstema tekst"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ snarvegstema tekst"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Grensesnittfargar"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Sl? p? skrivevarsel"
 
-msgid "Widget Sizes"
-msgstr "Grafiske element-storleikar"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ temabehandling"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Lukk"
+
 msgid "Fonts"
 msgstr "Skrifttypar"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Filverkt?y Gtkrc"
 
@@ -13861,12 +14168,120 @@ msgstr "Erstattar tekst i utg?ande meld
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstattar tekst i utg?ande meldingar etter dine reglar."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Ikkje innlogga"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Ikkje innlogga"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Bli med i eit praterom"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Blokker"
+
+#, fuzzy
+msgid "Founder"
+msgstr "H?gare"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Godkjent"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Feil"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Opplysningar"
+
+msgid "Mail dialog"
+msgstr ""
+
+# Vindauge eller meldingsvindauge?
+#, fuzzy
+msgid "Question dialog"
+msgstr "F?respurnadsvindauge"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "?tvaringsniv?"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status for %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Pratero_mslokalitet"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Endra ikon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ temabehandling"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktinfo"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Venneliste"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Venneliste"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ temabehandling"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ temabehandling"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Rullande kontaktliste"
 
@@ -14074,6 +14489,21 @@ msgstr ""
 msgstr ""
 "Dette programtillegget er nyttig ved feils?king av XMPP-tenarar og -klientar."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Kva ID skal takast i bruk?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Peikarfarge"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekundaer peikarfarge"
+
+#~ msgid "Interface colors"
+#~ msgstr "Grensesnittfargar"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Grafiske element-storleikar"
+
 #~ msgid "Invite message"
 #~ msgstr "Invitasjonsmelding"
 
============================================================
--- po/oc.po	c67c534068e10eb0fd18381dad47ac5f2e957175
+++ po/oc.po	e99657cf82aabab35298084f6fe161083176366d
@@ -17,7 +17,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-05-09 01:31+0200\n"
 "Last-Translator: ?ric Boumaour <zongo_fr at users.sourceforge.net>\n"
 "Language-Team: fr <fr at li.org>\n"
@@ -1688,6 +1688,8 @@ msgstr ""
 msgid "+++ %s signed off"
 msgstr ""
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Error desconeguda"
 
@@ -2052,6 +2054,9 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+msgid "Error creating conference."
+msgstr ""
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2984,6 +2989,10 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#. should this be a settings error?
+msgid "Unable to resolve server"
+msgstr ""
+
 msgid "Chat error"
 msgstr ""
 
@@ -3032,6 +3041,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+#, fuzzy
+msgid "GG server"
+msgstr "Connectat"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -3074,7 +3087,7 @@ msgstr "Mot de _pas :"
 msgid "_Password:"
 msgstr "Mot de _pas :"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3502,6 +3515,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3762,6 +3778,13 @@ msgstr "Ressorga"
 msgid "Resource"
 msgstr "Ressorga"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+msgid "Logged off"
+msgstr ""
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3927,9 +3950,18 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Ali?s :"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Utilizaire pas trobat"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "R?tle"
+
 msgid "Ping timeout"
 msgstr ""
 
@@ -3948,7 +3980,7 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr ""
 
 #, c-format
@@ -3975,9 +4007,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr "Estat"
 
@@ -3990,6 +4019,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -4017,6 +4049,9 @@ msgstr ""
 msgid "Change Registration"
 msgstr ""
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4379,13 +4414,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4445,6 +4480,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4831,6 +4869,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5169,63 +5211,26 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr "Error desconeguda."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "Error desconeguda"
 
 msgid "Unable to add user"
 msgstr ""
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
+msgid "Unknown error (%d)"
 msgstr ""
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5296,6 +5301,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "Error desconeguda."
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5314,6 +5322,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5350,14 +5366,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 msgid "Delete Buddy from Address Book?"
 msgstr ""
 
@@ -5387,6 +5395,51 @@ msgstr ""
 msgstr ""
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5416,6 +5469,8 @@ msgstr "Connectat"
 msgstr "Connectat"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr ""
 
@@ -5462,12 +5517,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr ""
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -5781,9 +5838,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -5983,6 +6037,25 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, c-format
+msgid "Error requesting "
+msgstr ""
+
+msgid "Incorrect password."
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6268,14 +6341,31 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr ""
 
-msgid "Incorrect password."
-msgstr ""
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6284,23 +6374,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr ""
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6316,20 +6399,6 @@ msgstr "_Validar"
 msgid "_OK"
 msgstr "_Validar"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6771,6 +6840,7 @@ msgstr ""
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr ""
 
@@ -6800,6 +6870,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9000,10 +9073,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9027,6 +9096,36 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Picatz lo mot de pas"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+msgid "Username does not exist"
+msgstr ""
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Picatz lo mot de pas"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9127,7 +9226,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9867,16 +9966,17 @@ msgstr ""
 msgid "Please update the necessary fields."
 msgstr ""
 
-msgid "Room _List"
-msgstr ""
+#, fuzzy
+msgid "A_ccount"
+msgstr "_Compte :"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "_Compte :"
+msgid "Room _List"
+msgstr ""
 
 msgid "_Block"
 msgstr ""
@@ -10297,6 +10397,108 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Color de fons"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laossian"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Color de fons"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Color de fons"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Color de fons"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Ordenar"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "En linha"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Absent(a)"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Desconnectat"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Inactiu"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Messatge"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -10790,6 +10992,10 @@ msgstr "Ongr?s"
 msgid "Hungarian"
 msgstr "Ongr?s"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
 msgid "Indonesian"
 msgstr "Indonesian"
 
@@ -10888,6 +11094,9 @@ msgstr "Sued?s"
 msgid "Swedish"
 msgstr "Sued?s"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11288,11 +11497,9 @@ msgstr "Enregistrar l'imatge"
 msgid "Save Image"
 msgstr "Enregistrar l'imatge"
 
-#, c-format
 msgid "_Save Image..."
 msgstr ""
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11377,9 +11584,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-msgid "Background Color"
-msgstr "Color de fons"
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -11660,6 +11864,9 @@ msgstr ""
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_Compte :"
+
 msgid "_Buddy name:"
 msgstr ""
 
@@ -11770,9 +11977,15 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12325,6 +12538,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Seleccionar una poli?a"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12538,6 +12755,68 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Nom d'utilisateur envoy?"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Picatz lo mot de pas"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Ti?ra de contactes"
+
+msgid "Gateway"
+msgstr ""
+
+#, fuzzy
+msgid "Directory"
+msgstr "Creator"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Descripcion"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Navegador"
+
+msgid "Server does not exist"
+msgstr ""
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13012,12 +13291,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13027,6 +13300,9 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+msgid "Typing Notification Color"
+msgstr ""
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13056,35 +13332,22 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+msgid "Disable Typing Notification Text"
 msgstr ""
 
-msgid "Widget Sizes"
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
+#, fuzzy
+msgid "Colors"
+msgstr "Tampar"
+
 msgid "Fonts"
 msgstr "Poli?as"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13219,12 +13482,110 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+msgid "Just logged in"
+msgstr ""
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+msgid "Icon for Chat"
+msgstr ""
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorar"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Expeditor"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opcions"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizar"
+
+msgid "Error dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Entresenhas"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Al?rta"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Estatut"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Modificar lo mot de pas"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "Se connectar"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Ti?ra de contactes"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Ti?ra de contactes"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -13441,10 +13802,6 @@ msgstr ""
 #~ msgstr "Velocitat :"
 
 #, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Picatz lo mot de pas"
-
-#, fuzzy
 #~ msgid "QQ Budy"
 #~ msgstr "Apondre lo contacte"
 
@@ -13461,9 +13818,6 @@ msgstr ""
 #~ msgid "Display Statistics"
 #~ msgstr "Afficher los statistiques"
 
-#~ msgid "Screen name sent"
-#~ msgstr "Nom d'utilisateur envoy?"
-
 #~ msgid "_Merge"
 #~ msgstr "_Fusionner"
 
@@ -13478,9 +13832,6 @@ msgstr ""
 #~ "contact. L'alias sera affich? ? la place du nom d'utilisateur chaque fois "
 #~ "que cela est possible.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Compte :"
-
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Alerter uniquement quand mon ?tat est non disponible"
 
============================================================
--- po/pa.po	5b0b7a5536000d8223ad9dc1092ff71cb17f9d52
+++ po/pa.po	9ffc51a5e64f7c931d459f65d79f78ae0c3da7a5
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-26 22:23+0530\n"
 "Last-Translator: Amanpreet Singh Alam <aalam at users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-users at lists.sf.net>\n"
@@ -1749,6 +1749,8 @@ msgstr "+++ %s ??? ?? ??? msgid "+++ %s signed off"
 msgstr "+++ %s ??? ?? ???/??"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "?????? ????"
 
@@ -2130,6 +2132,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "???????? ????? ????? ????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "????? %s ???? ??? ??, ?? ?? ?????? ?? %s ?????? ???"
@@ -3086,6 +3092,11 @@ msgstr "??? ???(_n):"
 msgid "Chat _name:"
 msgstr "??? ???(_n):"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "???? ??? ???? ?? ???? ???"
+
 msgid "Chat error"
 msgstr "??? ????"
 
@@ -3134,6 +3145,10 @@ msgstr "???-??? ????
 msgid "Gadu-Gadu User"
 msgstr "???-??? ?????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???? ??????? ?? ?? ??? ??"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "????? ?????: %s"
@@ -3176,7 +3191,8 @@ msgstr "??????(_P):"
 msgid "_Password:"
 msgstr "??????(_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ?????? '? ???? ??? ???? ?? ???? ??"
 
 #. 1. connect to server
@@ -3643,6 +3659,9 @@ msgstr "???? ???? ??
 msgid "Server does not use any supported authentication method"
 msgstr "???? ???? ??????? ????????? ??? ????? ???? ???"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "??????? ?????????? ?? ??? ??, ?? ?? ???? ?? ?????? ???? ???"
+
 msgid "Invalid challenge from server"
 msgstr "???? ??? ??? ??????"
 
@@ -3911,6 +3930,14 @@ msgstr "????"
 msgid "Resource"
 msgstr "????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "????? ??"
+
 msgid "Middle Name"
 msgstr "??? ???"
 
@@ -4077,9 +4104,18 @@ msgstr "??? ???"
 msgid "Find Rooms"
 msgstr "??? ???"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "??????? ?????????? ?? ??? ??, ?? ?? ???? ?? ?????? ???? ???"
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "??? ????? ????? ???? ?????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "???"
+
 msgid "Ping timeout"
 msgstr "???? ????-???"
 
@@ -4099,7 +4135,7 @@ msgstr "??? XMPP ID ??? ??msgstr "??? XMPP ID ??? ????? ???? ???? ?????? ???"
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "???? ??? ???????? ???? ????"
 
 #, c-format
@@ -4126,9 +4162,6 @@ msgstr "??-?????????msgid "Unregistration Failed"
 msgstr "??-?????????? ?????"
 
-msgid "Already Registered"
-msgstr "?????? ?? ??????"
-
 msgid "State"
 msgstr "?????"
 
@@ -4141,6 +4174,9 @@ msgstr "????"
 msgid "Date"
 msgstr "????"
 
+msgid "Already Registered"
+msgstr "?????? ?? ??????"
+
 msgid "Unregister"
 msgstr "??-??????"
 
@@ -4168,6 +4204,10 @@ msgstr "?????????? ?msgid "Change Registration"
 msgstr "?????????? ????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "???? ??? ???????? ???? ????"
+
 msgid "Error unregistering account"
 msgstr "?????? ??-?????????? ????"
 
@@ -4531,16 +4571,18 @@ msgstr "ban &lt;user&gt; [reason]:  Ban 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [reason]:  Ban a user from the room."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ??? ??? ????? "
 "?? ???? ???? ???"
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ??? ???? ????? ?? "
 "??? ???? ????"
@@ -4603,6 +4645,9 @@ msgstr "???? ???????msgid "File transfer proxies"
 msgstr "???? ??????? ??????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4999,6 +5044,10 @@ msgstr "????-IM ?????"
 msgid "Non-IM Contacts"
 msgstr "????-IM ?????"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ?? ??? ????-??? ???? ????? ??, ?? ?? ???? ??????? ???? ???"
+
 msgid "Nudge"
 msgstr "????"
 
@@ -5338,63 +5387,26 @@ msgstr "????? ???? ID 
 msgstr "????? ???? ID ?????????: ??? ????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ??? ????? ???? ???"
-
-msgid "Unknown error."
-msgstr "????? ????"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s '?? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ?? ??????? ???? (???) ???? ??!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "?????? ???? (%d)"
 
 msgid "Unable to add user"
 msgstr "????? ????? ??? ?? ??????"
 
-msgid "The following users are missing from your addressbook"
-msgstr "?????? ?????????? ?????? ??? ????? ????? ???? ??"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) ???? ????? ???? ?? ?????"
+msgid "Unknown error (%d)"
+msgstr "?????? ???? (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) ???? ????? ???? ??? ?? ??????"
+msgid "The following users are missing from your addressbook"
+msgstr "?????? ?????????? ?????? ??? ????? ????? ???? ??"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) ???? ????? ??? ?????? ??? ?? ??????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ??? ????? ???? ?? ????, ?????? ?????? ???? ???? ?? ?? ???"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?? ??? ??????? ?????? ??"
-
-msgid "Service Temporarily Unavailable."
-msgstr "????? ????? ??? '? ?????? ???? ???"
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "?????? ?????? ????? ???? ???, ?????? ?? ???? ???? ???"
 
-msgid "Unable to rename group"
-msgstr "????? ???-?????? ?? ????"
-
-msgid "Unable to delete group"
-msgstr "????? ????? ?? ????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5477,6 +5489,9 @@ msgstr "?????? MSN ???
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "?????? MSN ???? ????? ??? ???? ?????? ???? ??? ???? ???? ??? ?????? ??? ???"
 
+msgid "Unknown error."
+msgstr "????? ????"
+
 msgid "Handshaking"
 msgstr "???????"
 
@@ -5495,6 +5510,14 @@ msgstr "???? ???? ??
 msgid "Retrieving buddy list"
 msgstr "???? ???? ?????? ???? ?? ??? ??"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ?? ??? ????-??? ???? ????? ??, ?? ?? ???? ??????? ???? ???"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ?? ??? ????-??? ???? ????? ??, ?? ?? ???? ??????? ???? ???"
+
 msgid "Away From Computer"
 msgstr "??????? ??? ???"
 
@@ -5533,14 +5556,6 @@ msgstr "??? ?????? ?
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "??? ?????? ???? ??? ???? ?????? ????? ???? ?? ???? ??:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?? ??????? ???? ???? ???? '? ????? ???"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ?? ??????? ???? ???? ???? '??? ??? ????? ???"
-
 msgid "Delete Buddy from Address Book?"
 msgstr "?? ?????????? ?????? ???? ?????? ???"
 
@@ -5570,6 +5585,51 @@ msgstr "MSN ???????? ?
 msgstr "MSN ???????? ??????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ??? ????? ???? ???"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s '?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) ???? ????? ???? ?? ?????"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) ???? ????? ???? ??? ?? ??????"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) ???? ????? ??? ?????? ??? ?? ??????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ??? ????? ???? ?? ????, ?????? ?????? ???? ???? ?? ?? ???"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?? ??? ??????? ?????? ??"
+
+msgid "Service Temporarily Unavailable."
+msgstr "????? ????? ??? '? ?????? ???? ???"
+
+msgid "Unable to rename group"
+msgstr "????? ???-?????? ?? ????"
+
+msgid "Unable to delete group"
+msgstr "????? ????? ?? ????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?? ??????? ???? ???? ???? '? ????? ???"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ?? ??????? ???? ???? ???? '??? ??? ????? ???"
+
+#, c-format
 msgid "No such user: %s"
 msgstr "??? ????? ????: %s"
 
@@ -5598,6 +5658,8 @@ msgstr "???? ??? ???
 msgstr "???? ??? ???????? ???"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "???? ??? ??????"
 
@@ -5646,17 +5708,19 @@ msgstr "???????? ???msgid "Protocol error, code %d: %s"
 msgstr "???????? ????, ??? %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s ?????? ?????? %d ?????? ?? ??, ?? ?? MySpaceIM ?? %d ?? ????? ??? ??? ??? ??? ???? "
 "?????? http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
 "changePassword ???? ???? ???? ???-???? ??? ???"
 
+msgid "Incorrect username or password"
+msgstr "??? ????? ??? ??? ??????"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM ????"
 
@@ -5972,9 +6036,6 @@ msgstr "????? ????? 
 msgid "Master archive is misconfigured"
 msgstr "????? ????? ??? ?????? ??"
 
-msgid "Incorrect username or password"
-msgstr "??? ????? ??? ??? ??????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "?????? ????? ????? ????? ??? ?? ???? ????? ???? ?? ???? ??"
 
@@ -6181,6 +6242,28 @@ msgstr "???? ????"
 msgid "Server port"
 msgstr "???? ????"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "???? ??? ????? HTTP ???? ????? ???"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?????? ???????? ??? ???? ??? ??? ??? ???? ???? ??? 10 ???? ?? ???? ???? ??? ?????? ???? ???? "
+"????? ?????? ???? ???? ??? ??????? ??? ?? ???? ???? ??????"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s ??? ??? ????? ????"
+
+msgid "Incorrect password."
+msgstr "??? ?????? ???"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "??? ??? ???? ???? ???? ???? ?? ????"
 
@@ -6481,14 +6564,31 @@ msgstr ""
 "??? ??? ??? ???? ?????? ?????? ??, ??? ??? ???? ??? ????? ???? ?????? ??, ??? ???? ???? ????, "
 "????, ???? ??? ??? ??? ???? ?? ?? ???? ???"
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "?????? ???????? ???? ?? ??? ?? ???? ??? ?????? ?????? ?? %s ?????"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "??? ??? AIM ????? ????? ?????? ??? ?? ??????"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "?????? ???????? ???? ?? ??? ?? ???? ??? ?????? ?? %s ?????"
+
+msgid "Unable to get a valid login hash."
+msgstr "??? ??? ????? ????? ?????? ??? ?? ??????"
+
+msgid "Could Not Connect"
+msgstr "????? ???? ?? ???? ???"
+
+msgid "Received authorization"
+msgstr "?????????? ?????? ???"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "??? ?????-??? ???"
 
-msgid "Incorrect password."
-msgstr "??? ?????? ???"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "?????? ?????? ?? ???? ?????? ???? ??? ???"
@@ -6497,25 +6597,19 @@ msgstr "AOL Instant Messenger ????msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger ????? ????? ??? ???? ?????? ???? ???"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "?????? ????? ???? ??? ???? ????? ?? ???? ???? ?????? ??? %s ??? ???? ??? ???"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "?????? ???????? ??? ???? ??? ??? ??? ???? ???? ??? 10 ???? ?? ???? ???? ??? ?????? ???? ???? "
 "????? ?????? ???? ???? ??? ??????? ??? ?? ???? ???? ??????"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "?????? ????? ???? ??? ???? ????? ?? ???? ???? ?????? ??? %s ??? ???? ??? ???"
-
-msgid "Could Not Connect"
-msgstr "????? ???? ?? ???? ???"
-
-msgid "Received authorization"
-msgstr "?????????? ?????? ???"
-
 msgid "The SecurID key entered is invalid."
 msgstr "????? SecurID ????? ??? ???"
 
@@ -6531,20 +6625,6 @@ msgstr "??? ??(_O)"
 msgid "_OK"
 msgstr "??? ??(_O)"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "?????? ???????? ???? ?? ??? ?? ???? ??? ?????? ?????? ?? %s ?????"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "??? ??? AIM ????? ????? ?????? ??? ?? ??????"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "?????? ???????? ???? ?? ??? ?? ???? ??? ?????? ?? %s ?????"
-
-msgid "Unable to get a valid login hash."
-msgstr "??? ??? ????? ????? ?????? ??? ?? ??????"
-
 msgid "Password sent"
 msgstr "?????? ?????"
 
@@ -7029,6 +7109,7 @@ msgstr "????? ??????msgid "Set User Info (web)..."
 msgstr "????? ??????? ??? (????)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "?????? ???? (????)"
 
@@ -7058,6 +7139,10 @@ msgstr "??????? ????msgid "Search for Buddy by Information"
 msgstr "??????? ????? ???? ???"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "????? ????? ???? ??"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9292,10 +9377,6 @@ msgstr "??????? ????msgid "Auth Domain"
 msgstr "??????? ?????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ?? ??? ????-??? ???? ????? ??, ?? ?? ???? ??????? ???? ???"
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9321,6 +9402,42 @@ msgstr "???? ?????? 
 msgid "Add buddy rejected"
 msgstr "???? ?????? ???? ???????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "???? ??? ???????? ???? ??? ???? ????? ???"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "??? ??????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"?????? ???? ???? %d ??? Yahoo! ??????? ???? ????? ??? ??? ?????? ??? ?? ???? ???"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "????? ????? ???? ??"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"?????? ???? ???? %d ??? Yahoo! ??????? ???? ????? ??? ??? ?????? ??? ?? ???? ???"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??? ????? ??? ??? ??????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9431,8 +9548,8 @@ msgstr "????? ??????msgid "Start Doodling"
 msgstr "????? ?????? (????) ?????"
 
-msgid "Activate which ID?"
-msgstr "????? ID ??????? ???? ???"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?????? ???? ??? ??? ???????"
@@ -10206,16 +10323,17 @@ msgstr "?????? ???? 
 msgid "Please update the necessary fields."
 msgstr "?????? ???? ?????? ??? ???"
 
-msgid "Room _List"
-msgstr "??? ????(_L)"
+#, fuzzy
+msgid "A_ccount"
+msgstr "??????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "?? ?????? ???? ?????? ??????? ??? ??, ??? ???? ????? ?????? ???? ??????? ???\n"
 
-msgid "_Account:"
-msgstr "??????(_A):"
+msgid "Room _List"
+msgstr "??? ????(_L)"
 
 msgid "_Block"
 msgstr "??????(_B)"
@@ -10647,6 +10765,111 @@ msgstr "/????/???? ?? msgid "/Buddies/Sort Buddies"
 msgstr "/????/???? ???????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "????????? ???"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????????? ???"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "?????(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????????? ??? ????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "?????(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????????? ??? ????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "????????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??? ?????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?????? ?????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ?? ????? ?????? ?????"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ????"
@@ -11147,6 +11370,10 @@ msgstr "???????"
 msgid "Hungarian"
 msgstr "???????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "????????"
+
 msgid "Indonesian"
 msgstr "???????????"
 
@@ -11244,6 +11471,9 @@ msgstr "?????"
 msgid "Swedish"
 msgstr "?????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "?????"
 
@@ -11664,11 +11894,9 @@ msgstr "????? ??????msgid "Save Image"
 msgstr "????? ??????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "????? ??????(_S)..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "???? ?????? ?????(_A)..."
 
@@ -11755,9 +11983,6 @@ msgstr "???? ???"
 msgid "Font Face"
 msgstr "???? ???"
 
-msgid "Background Color"
-msgstr "????????? ???"
-
 msgid "Foreground Color"
 msgstr "????????? ???"
 
@@ -12079,6 +12304,9 @@ msgstr "??? ???? ???
 msgid "Pounce on Whom"
 msgstr "??? ???? ?????? ??"
 
+msgid "_Account:"
+msgstr "??????(_A):"
+
 msgid "_Buddy name:"
 msgstr "???? ???(_B):"
 
@@ -12189,9 +12417,18 @@ msgstr "????? ???? ?
 msgid "Unknown.... Please report this!"
 msgstr "????? ???? ???? ??? ????? ??? ??!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "?????? ??? ??-??? ??? ?? ????? ???"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?????? ??? ??-??? ??? ?? ????? ???"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "?????? ??? ??-??? ??? ?? ????? ???"
+
 msgid "Install Theme"
 msgstr "??? ?????? ???"
 
@@ -12749,6 +12986,10 @@ msgstr "??????? ????msgid "Custom Smiley Manager"
 msgstr "??????? ?????? ??????"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "???? ????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "?? ?????? ?? ???? ????-????? ???? ?? ????? ????"
 
@@ -12967,6 +13208,78 @@ msgstr "???? ???? ??
 msgid "Displays statistical information about your buddies' availability"
 msgstr "???? ???? ?? ???????? ?? ????? ?????"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "???? ??????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??? ??????? ???? '? ???? ????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "????? ?? ??? ??????? ???? ????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "???? ???? ????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??? ??"
+
+#, fuzzy
+msgid "Directory"
+msgstr "??? ?????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ???"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub ?????"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "????? ????????? ???????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "??????(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "????? ????? ???? ??"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???? ?????? ?? ????? ???? ??"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "????? ????????? ???????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "?? ?????? XMPP ???? ??? ????? ????? ?? ???????? ???"
+
 msgid "Buddy is idle"
 msgstr "???? ????? ??"
 
@@ -13456,12 +13769,6 @@ msgstr ""
 "- ?? ?? ? ??? ????? ??? ??? ???? ??\n"
 "- ?? ??? ?????? ?????? ???? ???? ????? ????? ??? ????? ??? ???? ??, ???? ?? ?? ????? ????"
 
-msgid "Cursor Color"
-msgstr "???? ???"
-
-msgid "Secondary Cursor Color"
-msgstr "??????? ???? ???"
-
 msgid "Hyperlink Color"
 msgstr "????????? ???"
 
@@ -13471,6 +13778,10 @@ msgstr "??????? ????msgid "Highlighted Message Name Color"
 msgstr "??????? ???? ?????? ??? ???"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "???? ??? ????? ???"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ??????? ???????"
 
@@ -13500,35 +13811,24 @@ msgstr "GTK+ ??? ?????? msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ??? ???????? ???"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "??????? ???"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "???? ??? ?? ????? ????"
 
-msgid "Widget Sizes"
-msgstr "?????? ????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "?????? GTK+ ???? ??????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "??? ???"
+
 msgid "Fonts"
 msgstr "????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc ???? ???"
 
@@ -13664,12 +13964,119 @@ msgstr "????? ????? 
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "????? ????? ????????? ?????? ?????? ???? ??? ???? ?????? ????? ????"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "????? ???? ??"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "????? ???? ??"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "?????? ???? ??????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??? ????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????????? ?????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "???? "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "???????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "??? ??????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??????? ????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ?? ????"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "??? ??? ?????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????? ????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "?????? GTK+ ???? ??????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "????? ???????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "???? ????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "???? ????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "?????? GTK+ ???? ??????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "?????? GTK+ ???? ??????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "???? ????"
 
@@ -13869,6 +14276,21 @@ msgstr "?? ?????? XMPP ?msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "?? ?????? XMPP ???? ??? ????? ????? ?? ???????? ???"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "????? ID ??????? ???? ???"
+
+#~ msgid "Cursor Color"
+#~ msgstr "???? ???"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??????? ???? ???"
+
+#~ msgid "Interface colors"
+#~ msgstr "??????? ???"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "?????? ????"
+
 #~ msgid "Invite message"
 #~ msgstr "???? ??????"
 
============================================================
--- po/pl.po	9eeff31b709e425e5d464efcee39389fc1925874
+++ po/pl.po	4d5f24a2e2b9f5994b9396cb0c81a861b7acf382
@@ -12,7 +12,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-12-29 17:50+0100\n"
 "Last-Translator: Piotr Makowski (Aviary.pl) <pmakowski at aviary.pl>\n"
 "Language-Team: Piotr Makowski (Aviary.pl) <pmakowski at aviary.pl>\n"
@@ -1850,6 +1850,8 @@ msgstr "+++ %s roz??czy? si?"
 msgid "+++ %s signed off"
 msgstr "+++ %s roz??czy? si?"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nieznany b??d"
 
@@ -2233,6 +2235,10 @@ msgstr "(%s) %s <AUTOMATYCZNA-ODPOWIED?
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATYCZNA-ODPOWIED?>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "B??d podczas tworzenia po??czenia"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "U?ywasz %s, ale plugin wymaga %s."
@@ -3212,6 +3218,11 @@ msgstr "Nazwa ko_nferencji:"
 msgid "Chat _name:"
 msgstr "Nazwa ko_nferencji:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Nie mo?na po??czy? si? z serwerem."
+
 msgid "Chat error"
 msgstr "B??d konferencji"
 
@@ -3260,6 +3271,10 @@ msgstr "U?ytkownik Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "U?ytkownik Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Ustaw dane u?ytkownika..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nieznane polecenie: %s"
@@ -3302,7 +3317,8 @@ msgstr "_Has?o:"
 msgid "_Password:"
 msgstr "_Has?o:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Pseudonimy IRC nie mog? zawiera? pustych znak?w"
 
 #. 1. connect to server
@@ -3793,6 +3809,9 @@ msgstr "Serwer nie u?ywa ?adnej z obs? msgid "Server does not use any supported authentication method"
 msgstr "Serwer nie u?ywa ?adnej z obs?ugiwanych metod uwierzytelniania"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Nieprawid?owe ??danie od serwera"
 
@@ -4091,6 +4110,14 @@ msgstr "Zas?b"
 msgid "Resource"
 msgstr "Zas?b"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Zalogowany"
+
 msgid "Middle Name"
 msgstr "Drugie imi?"
 
@@ -4257,10 +4284,19 @@ msgstr "Szukanie pokoju"
 msgid "Find Rooms"
 msgstr "Szukanie pokoju"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Nie znaleziono ?adnego u?ytkownika"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rola"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Zwyk?y tekst"
 
@@ -4280,7 +4316,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Nie uda?o si? po??czy? z serwerem."
 
 #, c-format
@@ -4309,9 +4345,6 @@ msgstr "B??d podczas rejestracji"
 msgid "Unregistration Failed"
 msgstr "B??d podczas rejestracji"
 
-msgid "Already Registered"
-msgstr "Ju? zarejestrowano"
-
 msgid "State"
 msgstr "Stan"
 
@@ -4324,6 +4357,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "Ju? zarejestrowano"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Rejestruj"
@@ -4354,6 +4390,10 @@ msgstr "Zmiana rejestracji"
 msgstr "Zmiana rejestracji"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Nie uda?o si? po??czy? z serwerem."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "B??d podczas zmiany informacji o koncie"
 
@@ -4732,16 +4772,18 @@ msgstr ""
 "ban &lt;u?ytkownik&gt; [pok?j]:  Blokuje dost?p okre?lonego u?ytkownika do "
 "pokoju."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;u?ytkownik&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Ustawia przynale?no?? u?ytkownika w danym pokoju."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;u?ytkownik&gt; &lt;moderator|participant|visitor|none&gt;: Zmienia "
 "rol? u?ytkownika w danym pokoju."
@@ -4812,6 +4854,9 @@ msgstr "Port do przesy?ania plik?w"
 msgid "File transfer proxies"
 msgstr "Port do przesy?ania plik?w"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5213,6 +5258,10 @@ msgstr "Usuni?cie kontaktu"
 msgid "Non-IM Contacts"
 msgstr "Usuni?cie kontaktu"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5563,66 +5612,29 @@ msgstr "Uwierzytelnianie Windows Live ID
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Uwierzytelnianie Windows Live ID: nie mo?na po??czy?"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s nie jest poprawn? nazw? grupy."
-
-msgid "Unknown error."
-msgstr "Nieznany b??d."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s wys?a? do Ciebie wiadomo??"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Nieznany b??d (%d)"
 
 msgid "Unable to add user"
 msgstr "Nie mo?na doda? u?ytkownika"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Nieznany b??d (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Poni?ej znajduj? si? wyniki wyszukiwania"
 
-#, fuzzy, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nie mo?na zablokowa? u?ytkownika na %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nie mo?na zablokowa? u?ytkownika na %s (%s)"
-
-#, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nie mo?na zablokowa? u?ytkownika na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nie zosta? dodany poniewa? Twoja lista znajomych jest pe?na."
-
-#, fuzzy, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nie jest poprawn? nazw? grupy."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Us?uga jest tymczasowo niedost?pna."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Wiadomo?? nie zosta?a wys?ana, poniewa? nie jeste? zalogowany."
 
-msgid "Unable to rename group"
-msgstr "Nie mo?na zmieni? nazwy grupy"
-
-msgid "Unable to delete group"
-msgstr "Nie mo?na skasowa? grupy"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5717,6 +5729,9 @@ msgstr ""
 "Twoja lista kontakt?w MSN jest tymczasowo niedost?pna. Odczekaj i spr?buj "
 "ponownie."
 
+msgid "Unknown error."
+msgstr "Nieznany b??d."
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5735,6 +5750,14 @@ msgstr "Pobieranie listy znajomych"
 msgid "Retrieving buddy list"
 msgstr "Pobieranie listy znajomych"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Nie ma mnie przy komputerze"
 
@@ -5776,14 +5799,6 @@ msgstr "Wiadomo?? nie zosta?a wys?an
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Wiadomo?? nie zosta?a wys?ana poniewa? nast?pi? nieznany b??d:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s doda? Ciebie do swojej listy znajomych."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "u?ytkownik %s usun?? Ciebie ze swojej listy znajomych."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Dodaj do ksi??ki adresowej"
@@ -5816,6 +5831,51 @@ msgstr "Wtyczka protoko?u MSN"
 msgstr "Wtyczka protoko?u MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nie jest poprawn? nazw? grupy."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nie mo?na zablokowa? u?ytkownika na %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nie mo?na zablokowa? u?ytkownika na %s (%s)"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nie mo?na zablokowa? u?ytkownika na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nie zosta? dodany poniewa? Twoja lista znajomych jest pe?na."
+
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nie jest poprawn? nazw? grupy."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Us?uga jest tymczasowo niedost?pna."
+
+msgid "Unable to rename group"
+msgstr "Nie mo?na zmieni? nazwy grupy"
+
+msgid "Unable to delete group"
+msgstr "Nie mo?na skasowa? grupy"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s doda? Ciebie do swojej listy znajomych."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "u?ytkownik %s usun?? Ciebie ze swojej listy znajomych."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5851,6 +5911,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nowe wiadomo?ci pocztowe"
 
@@ -5899,12 +5961,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Niepoprawny identyfikator lub has?o"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6235,10 +6300,6 @@ msgstr "G??wne archiwum nie jest skonf
 msgid "Master archive is misconfigured"
 msgstr "G??wne archiwum nie jest skonfigurowane"
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "Niepoprawny identyfikator lub has?o"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6461,6 +6522,31 @@ msgstr "Port serwera"
 msgstr "Port serwera"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Nieprawid?owa odpowied? z serwera HTTP."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Zbyt cz?ste pr?by ??czenia i roz??czania. Zaczekaj dziesi?? minut i spr?buj "
+"ponownie. Je?li pr?ba zostanie podj?ta teraz, czas oczekiwania jeszcze si? "
+"wyd?u?y."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr ""
+"B??d t?umaczenia nazwy %s na adres IP: \n"
+"%s"
+
+msgid "Incorrect password."
+msgstr "Niepoprawne has?o."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Nie mo?na po??czy?"
 
@@ -6767,15 +6853,37 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Po??czenie mo?e wkr?tce zosta? zerwane. Sugerowana jest zmiana protoko?u na "
+"TOC zanim problem zostanie rozwi?zany. Uaktualnienia b?d? dost?pne na %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+"Program Pidgin nie by? w stanie otrzyma? poprawnego klucza logowania do AIM."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Po??czenie mo?e wkr?tce zosta? zerwane. Sugerowana jest zmiana protoko?u na "
+"TOC zanim problem zostanie rozwi?zany. Uaktualnienia b?d? dost?pne na %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "Program Pidgin nie by? w stanie otrzyma? poprawnego klucza logowania."
+
+msgid "Could Not Connect"
+msgstr "Nie mo?na si? po??czy?"
+
+msgid "Received authorization"
+msgstr "Otrzymano autoryzacj?"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Niew?a?ciwa ksywka"
 
-msgid "Incorrect password."
-msgstr "Niepoprawne has?o."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Twoje konto jest w tej chwili zawieszone."
@@ -6784,26 +6892,20 @@ msgstr "Us?uga AOL Instant Messenger je
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Us?uga AOL Instant Messenger jest tymczasowo niedost?pna."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Wersja klienta, kt?rej u?ywasz, jest zbyt stara. Uaktualnij j? z %s."
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Zbyt cz?ste pr?by ??czenia i roz??czania. Zaczekaj dziesi?? minut i spr?buj "
 "ponownie. Je?li pr?ba zostanie podj?ta teraz, czas oczekiwania jeszcze si? "
 "wyd?u?y."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Wersja klienta, kt?rej u?ywasz, jest zbyt stara. Uaktualnij j? z %s."
-
-msgid "Could Not Connect"
-msgstr "Nie mo?na si? po??czy?"
-
-msgid "Received authorization"
-msgstr "Otrzymano autoryzacj?"
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6819,25 +6921,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Po??czenie mo?e wkr?tce zosta? zerwane. Sugerowana jest zmiana protoko?u na "
-"TOC zanim problem zostanie rozwi?zany. Uaktualnienia b?d? dost?pne na %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-"Program Pidgin nie by? w stanie otrzyma? poprawnego klucza logowania do AIM."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Po??czenie mo?e wkr?tce zosta? zerwane. Sugerowana jest zmiana protoko?u na "
-"TOC zanim problem zostanie rozwi?zany. Uaktualnienia b?d? dost?pne na %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Program Pidgin nie by? w stanie otrzyma? poprawnego klucza logowania."
-
 msgid "Password sent"
 msgstr "Has?o wys?ane"
 
@@ -7356,6 +7439,7 @@ msgstr "Ustaw dane u?ytkownika (URL)...
 msgid "Set User Info (web)..."
 msgstr "Ustaw dane u?ytkownika (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Zmiana has?a (URL)"
@@ -7388,6 +7472,10 @@ msgstr "Wyszukaj znajomego na podstawie 
 msgstr "Wyszukaj znajomego na podstawie informacji"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "U?ytkownik nie jest zalogowany"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9755,10 +9843,6 @@ msgstr "Domena do autoryzacji"
 msgid "Auth Domain"
 msgstr "Domena do autoryzacji"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9784,6 +9868,44 @@ msgstr "Dodanie znajomego zosta?o odrzu
 msgid "Add buddy rejected"
 msgstr "Dodanie znajomego zosta?o odrzucone"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Nie uda?o si? po??czy? z serwerem."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Niepoprawne has?o"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Nieznany b??d numer %d. Zalogowanie przez stron? WWW Yahoo! mo?e rozwi?za? "
+"ten problem."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "U?ytkownik nie istnieje"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Nieznany b??d numer %d. Zalogowanie przez stron? WWW Yahoo! mo?e rozwi?za? "
+"ten problem."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Niepoprawny identyfikator lub has?o"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9903,9 +10025,8 @@ msgstr "Rozpoczyna pisanie"
 msgid "Start Doodling"
 msgstr "Rozpoczyna pisanie"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Aktywacja ID..."
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kogo przy??czy? do konferencji?"
@@ -10714,8 +10835,8 @@ msgstr "Prosz? uaktualnia? niezb?dne 
 msgstr "Prosz? uaktualnia? niezb?dne pola."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Lista pokoi"
+msgid "A_ccount"
+msgstr "Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10723,8 +10844,9 @@ msgstr ""
 msgstr ""
 "Wprowad? informacje dotycz?ce konferencji do kt?rej chcesz si? przy??czy?.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Lista pokoi"
 
 msgid "_Block"
 msgstr "_Zablokuj"
@@ -11177,6 +11299,111 @@ msgstr "/Znajomi/Sortuj znajomych"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Znajomi/Sortuj znajomych"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Kolor t?a"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lew"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Kolor t?a"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Rozwi?"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Wyb?r koloru t?a"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Zwi?"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Wyb?r koloru t?a"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Sortuj"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Dost?pny"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Zaraz wracam"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Roz??czony"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Grupa krwi"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Wys?ano wiadomo??"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Zmiana informacji o u?ytkowniku dla %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Serwery SSL"
@@ -11691,6 +11918,10 @@ msgstr "W?gierski"
 msgid "Hungarian"
 msgstr "W?gierski"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumu?ski"
+
 msgid "Indonesian"
 msgstr "Indonezyjski"
 
@@ -11792,6 +12023,9 @@ msgstr "Szwedzki"
 msgid "Swedish"
 msgstr "Szwedzki"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamilski"
 
@@ -12226,11 +12460,9 @@ msgstr "Zapis obrazu"
 msgid "Save Image"
 msgstr "Zapis obrazu"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Zapisz _obraz..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Dodaj w?asn? emotikon?..."
 
@@ -12317,9 +12549,6 @@ msgstr "_Kr?j czcionki"
 msgid "Font Face"
 msgstr "_Kr?j czcionki"
 
-msgid "Background Color"
-msgstr "Kolor t?a"
-
 msgid "Foreground Color"
 msgstr "Kolor pisma"
 
@@ -12636,6 +12865,9 @@ msgstr "?r?d?o zdarze?"
 msgid "Pounce on Whom"
 msgstr "?r?d?o zdarze?"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "_Nazwa u?ytkownika:"
 
@@ -12747,9 +12979,18 @@ msgstr ""
 msgstr ""
 "Przechwycono nieznane zdarzenie. Prosz? zawiadomi? autor?w programu Pidgin!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Nie uda?o si? rozpakowa? zestawu emotikon."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Nie uda?o si? rozpakowa? zestawu emotikon."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Nie uda?o si? rozpakowa? zestawu emotikon."
+
 msgid "Install Theme"
 msgstr "Instalowanie emotikonek"
 
@@ -13316,6 +13557,10 @@ msgstr "Menad?er niestandardowych emoti
 msgstr "Menad?er niestandardowych emotikon"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Wyb?r znajomego"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "U?ywanie poni?szej ikony u?ytkownika dla tego konta:"
 
@@ -13541,6 +13786,77 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adres serwera"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Podaj adres serwera konferencyjnego"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Wpisz adres serwera konferencyjnego, z kt?rego chcesz pobra? list?"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Us?ugi sieciowe"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Wy?lij list? znajomych"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "zaraz wraca"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Katalog z plikami"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Wyb?r d?wi?k?w"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Opis"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Ustaw informacj? katalogu"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Przegl?darka:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "U?ytkownik nie istnieje"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Serwer nie u?ywa ?adnej z obs?ugiwanych metod uwierzytelniania"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Ustaw informacj? katalogu"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Ta wtyczka jest przydatna do debugowania klient?w i serwer?w XMPP."
+
 msgid "Buddy is idle"
 msgstr "Znajomy jest bezczynny"
 
@@ -14052,12 +14368,6 @@ msgstr ""
 "- Wypisuje przychodz?cy tekst od ty?u\n"
 "- Wysy?a wiadomo?? do os?b na li?cie w momencie ich zalogowania"
 
-msgid "Cursor Color"
-msgstr "Kolor kursora"
-
-msgid "Secondary Cursor Color"
-msgstr "Kolor drugiego kursora"
-
 msgid "Hyperlink Color"
 msgstr "Kolor odno?nika"
 
@@ -14068,6 +14378,10 @@ msgstr "Kolor nazwy wyr??nionej wiadom
 msgid "Highlighted Message Name Color"
 msgstr "Kolor nazwy wyr??nionej wiadomo?ci"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Likwidowanie powiadomienia"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Poziome odst?py w GtkTreeView"
 
@@ -14097,35 +14411,24 @@ msgstr "Zestaw skr?t?w klawiszowych GT
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Zestaw skr?t?w klawiszowych GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Kolory interfejsu"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Powiadamianie o nowej poczcie"
 
-msgid "Widget Sizes"
-msgstr "Rozmiar Widget?w"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kontrola temat?w GTK+ w Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Zamknij"
+
 msgid "Fonts"
 msgstr "Czcionki"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Narz?dzia plik?w gtkrc"
 
@@ -14269,12 +14572,119 @@ msgstr ""
 msgstr ""
 "Zast?puje tekst w wychodz?cych wiadomo?ciach zgodnie z okre?lonymi regu?ami."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Nie zalogowany"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Nie zalogowany"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Do??cz do konferencji"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorowanie"
+
+#, fuzzy
+msgid "Founder"
+msgstr "G?o?niej"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autoryzacja przyznana"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "B??d "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informacje"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Okno dialogowe z ??daniem"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Poziom ostrze?enia"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status dla %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Ustawienia lokalne pokoju konferencyjnego"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Zapisz ikon?"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kontrola temat?w GTK+ w Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informacje o kontakcie"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lista znajomych"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista znajomych"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kontrola temat?w GTK+ w Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kontrola temat?w GTK+ w Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Przewijana lista znajomych"
 
@@ -14481,6 +14891,22 @@ msgstr "Ta wtyczka jest przydatna do deb
 msgstr "Ta wtyczka jest przydatna do debugowania klient?w i serwer?w XMPP."
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Aktywacja ID..."
+
+#~ msgid "Cursor Color"
+#~ msgstr "Kolor kursora"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Kolor drugiego kursora"
+
+#~ msgid "Interface colors"
+#~ msgstr "Kolory interfejsu"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Rozmiar Widget?w"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Wstaw do rozmowy"
 
============================================================
--- po/ps.po	3e15d7195ffb9991cfcc59d9853d85b6df14215b
+++ po/ps.po	e1d0d8967de804f50f70bbaea68ce4311234dba4
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0beta6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-03-14 13:08+0500\n"
 "Last-Translator: Kashif Masood <masudmails at yahoo.com>\n"
 "Language-Team: Pashto\n"
@@ -1757,6 +1757,8 @@ msgstr "?+++ %s ?????"
 msgid "+++ %s signed off"
 msgstr "?+++ %s ?????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr ""
 
@@ -2121,6 +2123,10 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "????? ?????? ?? ???"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3060,6 +3066,11 @@ msgstr "?? ?? ???:"
 msgid "Chat _name:"
 msgstr "?? ?? ???:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "? %s ??? ????? ?? ? ???"
+
 msgid "Chat error"
 msgstr "?? ?? ???"
 
@@ -3108,6 +3119,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+#, fuzzy
+msgid "GG server"
+msgstr "???????? ??????? ????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -3150,7 +3165,7 @@ msgstr "?? ???:"
 msgid "_Password:"
 msgstr "?? ???:"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3579,6 +3594,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3867,6 +3885,14 @@ msgstr "????"
 msgid "Resource"
 msgstr "????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "????? ?"
+
 msgid "Middle Name"
 msgstr ""
 
@@ -4034,7 +4060,15 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?? ???:"
+
+#, fuzzy
+msgid "No users found"
+msgstr "?????"
+
+msgid "Roles:"
 msgstr ""
 
 #, fuzzy
@@ -4058,7 +4092,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "? ???? ??? ????? ??? ?????? ???."
 
 #, c-format
@@ -4086,9 +4120,6 @@ msgstr "????? ?????? ???"
 msgid "Unregistration Failed"
 msgstr "????? ?????? ???"
 
-msgid "Already Registered"
-msgstr "?? ???? ??? ???"
-
 msgid "State"
 msgstr ""
 
@@ -4101,6 +4132,9 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+msgid "Already Registered"
+msgstr "?? ???? ??? ???"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "??? ???"
@@ -4132,6 +4166,10 @@ msgstr "??? ???? ?? ???"
 msgstr "??? ???? ?? ???"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "? ???? ??? ????? ??? ?????? ???."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "? ????? ??????? ????? ?? ??? ? ???"
 
@@ -4502,13 +4540,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4571,6 +4609,9 @@ msgstr "????? ?????? ????
 msgid "File transfer proxies"
 msgstr "????? ?????? ????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4967,6 +5008,10 @@ msgstr "????? ?????"
 msgid "Non-IM Contacts"
 msgstr "????? ?????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5317,63 +5362,26 @@ msgstr "??? ??? ????? ??"
 msgstr "??? ??? ????? ??"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr ""
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "?????? ??? ??? %d"
 
 msgid "Unable to add user"
 msgstr "???????? ?? ?? ????"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "?????? ??? ??? %d"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5446,6 +5454,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5464,6 +5475,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "????????? ????"
 
@@ -5500,14 +5519,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "?%s ?? ? ??? ????? ????? ??? ??????"
-
 msgid "Delete Buddy from Address Book?"
 msgstr ""
 
@@ -5538,6 +5549,51 @@ msgstr "? ??? ???????? ??? msgstr "? ??? ???????? ??????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "?%s ?? ? ??? ????? ????? ??? ??????"
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5572,6 +5628,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "????? ? ?????"
@@ -5621,12 +5679,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr ""
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -5955,9 +6015,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6157,6 +6214,25 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "???? ??"
+
+msgid "Incorrect password."
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "?? ?? ????? ????? ??"
@@ -6450,15 +6526,34 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "? ??? ? ??????? ???? ???? ?? ???."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "? ????? %s ??? ?? ? ???."
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "???? ???"
 
-msgid "Incorrect password."
-msgstr ""
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6467,23 +6562,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr ""
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6499,22 +6587,6 @@ msgstr "???"
 msgid "_OK"
 msgstr "???"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "? ??? ? ??????? ???? ???? ?? ???."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "? ????? %s ??? ?? ? ???."
-
 msgid "Password sent"
 msgstr ""
 
@@ -6958,6 +7030,7 @@ msgstr "???????? ??????? 
 msgid "Set User Info (web)..."
 msgstr "???????? ??????? ???? (???)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "?? ??? ????? (???)"
@@ -6989,6 +7062,9 @@ msgstr "? ??????? ?? ???? 
 msgid "Search for Buddy by Information"
 msgstr "? ??????? ?? ???? ? ????? ????"
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9208,10 +9284,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9235,6 +9307,37 @@ msgstr "????? ?????? ?? ?? msgid "Add buddy rejected"
 msgstr "????? ?????? ?? ??? ???"
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????? ?? ???"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "?? ???"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "????? ?? ???"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9339,9 +9442,8 @@ msgstr "?? ???? ???? ????? msgid "Start Doodling"
 msgstr "?? ???? ???? ?????"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "???? ???? ???..."
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?? ??? ?? ?? ??? ??????"
@@ -10094,16 +10196,17 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "? ???? ?????"
+msgid "A_ccount"
+msgstr "?????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "?????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "? ???? ?????"
 
 msgid "_Block"
 msgstr "????"
@@ -10556,6 +10659,108 @@ msgstr "????? ????? ?????
 msgid "/Buddies/Sort Buddies"
 msgstr "????? ????? ?????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr ""
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+msgid "Expanded Background Color"
+msgstr ""
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "?????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+msgid "Collapsed Background Color"
+msgstr ""
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "?????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+msgid "Contact/Chat Background Color"
+msgstr ""
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "???????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?? ????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "???? ?? ???"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "? %s ???????? ??????? ?????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11064,6 +11269,10 @@ msgstr ""
 msgid "Hungarian"
 msgstr ""
 
+#, fuzzy
+msgid "Armenian"
+msgstr "??????"
+
 msgid "Indonesian"
 msgstr ""
 
@@ -11163,6 +11372,9 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "?????"
 
@@ -11569,11 +11781,9 @@ msgstr "????? ? ????"
 msgid "Save Image"
 msgstr "????? ? ????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "????? ????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11660,9 +11870,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-msgid "Background Color"
-msgstr ""
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -11965,6 +12172,9 @@ msgstr "??? ????"
 msgid "Pounce on Whom"
 msgstr "??? ????"
 
+msgid "_Account:"
+msgstr "?????:"
+
 msgid "_Buddy name:"
 msgstr "????? ???"
 
@@ -12076,9 +12286,16 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "????? ??? ?? ??."
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12644,6 +12861,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "????? ???? ??"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "? ?? ????? ????? ??? ????? ????? ?? ??? ??:"
 
@@ -12861,6 +13082,72 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "???? ???"
+
+msgid "Enter an XMPP Server"
+msgstr ""
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?? ???? ???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "????? ?????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "???? ??? ??"
+
+#, fuzzy
+msgid "Directory"
+msgstr "??? ???? ????"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?? ?????? ?????? ?? ??????? ????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "???..."
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "???? ???"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?? ?????? ?????? ?? ??????? ????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "????? ?? ??? ??"
 
@@ -13337,12 +13624,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13352,6 +13633,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "? ??? ????????? ??????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13381,35 +13666,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "? ??? ????????? ??????"
+
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "?????"
 
 msgid "Fonts"
 msgstr "??????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13545,12 +13818,115 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "????? ?"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "?? ?? ?? ?????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?? ?????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "?????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "??????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????? ?????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "???"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "? ??????? ???????"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "?????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "? %s ??????"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "? ?? ??? ???? ????? ???"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????? ? ????"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "????? ???????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????? ?????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????? ?????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "? ??? ????????"
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -13749,6 +14125,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "???? ???? ???..."
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "?????? ????????"
 
@@ -13860,10 +14240,6 @@ msgstr ""
 #~ msgstr "? ???? ???????"
 
 #, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "????? ?? ???"
-
-#, fuzzy
 #~ msgid "Failed to connect all servers"
 #~ msgstr "? ???? ??? ????? ??? ?????? ???."
 
@@ -13999,17 +14375,9 @@ msgstr ""
 #~ msgstr "????? ?? ???"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "? %s ??? ????? ?? ? ???"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "?????:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "?????:"
-
 #~ msgid ""
 #~ "%s was disconnected due to the following error:\n"
 #~ "%s"
@@ -14056,9 +14424,6 @@ msgstr ""
 #~ msgid "Status message"
 #~ msgstr "? ?????? ?????"
 
-#~ msgid "Pidgin User"
-#~ msgstr "? ??? ????????"
-
 #~ msgid "Jabber Account"
 #~ msgstr "? ????? ?????"
 
============================================================
--- po/pt.po	777f05524053fcde2ce6afdb8bc1a14b94a54cb7
+++ po/pt.po	dad0703e2172d0e5bd91fb74f01865b83ca62e6a
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2005-03-14 17:23+0000\n"
 "Last-Translator: Duarte Henriques <duarte.henriques at gmail.com>\n"
 "Language-Team: \n"
@@ -1879,6 +1879,8 @@ msgstr "+++ %s desligou-se"
 msgid "+++ %s signed off"
 msgstr "+++ %s desligou-se"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -2270,6 +2272,10 @@ msgstr "(%s) %s <RESPOSTA-AUTOMATICA>: %
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA-AUTOMATICA>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Erro ao criar a liga??o"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3256,6 +3262,11 @@ msgstr "_nome de chat:"
 msgid "Chat _name:"
 msgstr "_nome de chat:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Imposs?vel ligar ao servidor."
+
 msgid "Chat error"
 msgstr "Erro de chat"
 
@@ -3304,6 +3315,10 @@ msgstr "Utilizador do Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Utilizador do Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Definir Informa??es de Utilizador..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
@@ -3347,7 +3362,8 @@ msgstr "_Senha:"
 msgid "_Password:"
 msgstr "_Senha:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Nomes de IRC n?o podem conter espa?os em branco"
 
 #. 1. connect to server
@@ -3837,6 +3853,9 @@ msgstr "O servidor n?o usa memhum m?to
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor n?o usa memhum m?todo de autentica??o suportado"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Pedido de acesso do servidor inv?lido"
 
@@ -4136,6 +4155,14 @@ msgstr "Recurso"
 msgid "Resource"
 msgstr "Recurso"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "J? Est? Ligado"
+
 msgid "Middle Name"
 msgstr "Nome do meio"
 
@@ -4308,10 +4335,19 @@ msgstr "Encontrar Salas"
 msgid "Find Rooms"
 msgstr "Encontrar Salas"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Nome:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "N?o foi encontrado nenhum utilizador"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Fun??o"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Texto simples"
 
@@ -4332,7 +4368,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Imposs?vel ligar ao servidor."
 
 #, c-format
@@ -4361,9 +4397,6 @@ msgstr "Erro ao Registar"
 msgid "Unregistration Failed"
 msgstr "Erro ao Registar"
 
-msgid "Already Registered"
-msgstr "J? est? Registado"
-
 msgid "State"
 msgstr "Estado"
 
@@ -4377,6 +4410,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "J? est? Registado"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Registar"
@@ -4411,6 +4447,10 @@ msgstr "Erro ao registar"
 msgstr "Erro ao registar"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Imposs?vel ligar ao servidor."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Erro ao mudar informa??es da conta"
 
@@ -4789,16 +4829,18 @@ msgstr "ban &lt;utilizador&gt; [sala]:  
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;utilizador&gt; [sala]:  Banir um utilizador da sala."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;utilizador&gt; &lt;owner|admin|member|outcast|none&gt;: Define "
 "a afilia??o de um utilizador ? sala."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;utilizador&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
 "papel de um utilizador na sala."
@@ -4869,6 +4911,9 @@ msgstr "Porto de transfer?ncias de fich
 msgid "File transfer proxies"
 msgstr "Porto de transfer?ncias de ficheiros"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5284,6 +5329,10 @@ msgstr "Remover Pessoa"
 msgid "Non-IM Contacts"
 msgstr "Remover Pessoa"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5664,66 +5713,29 @@ msgstr "Autentica??o normal falhou!"
 msgstr "Autentica??o normal falhou!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s n?o ? um grupo v?lido."
-
-msgid "Unknown error."
-msgstr "Erro desconhecido."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s em %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s enviou-lhe agora um Nudge!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Erro desconhecido"
 
 msgid "Unable to add user"
 msgstr "Incapaz de adicionar utilizador"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Erro desconhecido"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Os seguintes s?o os resultados da sua pesquisa"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Incapaz de adicionar utilizador em %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Incapaz de bloquear utilizador em %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Incapaz de permitir utilizador em %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s n?o p?de ser adicionado porque a sua lista de contactos est? cheia."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s n?o ? uma conta de passport v?lida."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Servi?o Temporariamente Indispon?vel."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 "A mensagem n?o p?de ser enviada porque estamos a enviar r?pido de mais:"
 
-msgid "Unable to rename group"
-msgstr "Incapaz de renomear grupo"
-
-msgid "Unable to delete group"
-msgstr "Incapaz de apagar grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5816,6 +5828,9 @@ msgstr ""
 "A sua lista de contactos MSN est? temporariamente indispon?vel. Por favor "
 "espere e tente novamente."
 
+msgid "Unknown error."
+msgstr "Erro desconhecido."
+
 msgid "Handshaking"
 msgstr "Bacalhauzada"
 
@@ -5834,6 +5849,14 @@ msgstr "Requisitando lista de contactos"
 msgid "Retrieving buddy list"
 msgstr "Requisitando lista de contactos"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Ausente"
 
@@ -5875,14 +5898,6 @@ msgstr ""
 msgstr ""
 "A mensagem pode n?o ter sido enviada porque ocorreu um erro desconhecido:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s adicionou-o(a) ? sua lista de contactos."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s removeu-o(a) da sua lista de contactos."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Adicionar ao Livro de Endere?os"
@@ -5916,6 +5931,51 @@ msgstr "Plugin do Protocolo AIM/ICQ"
 msgstr "Plugin do Protocolo AIM/ICQ"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s n?o ? um grupo v?lido."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s em %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Incapaz de adicionar utilizador em %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Incapaz de bloquear utilizador em %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Incapaz de permitir utilizador em %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s n?o p?de ser adicionado porque a sua lista de contactos est? cheia."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s n?o ? uma conta de passport v?lida."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servi?o Temporariamente Indispon?vel."
+
+msgid "Unable to rename group"
+msgstr "Incapaz de renomear grupo"
+
+msgid "Unable to delete group"
+msgstr "Incapaz de apagar grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s adicionou-o(a) ? sua lista de contactos."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s removeu-o(a) da sua lista de contactos."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5950,6 +6010,8 @@ msgstr "N?o est? ligado ao servidor."
 msgstr "N?o est? ligado ao servidor."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Enviar uma _mensagem"
@@ -5999,12 +6061,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Nome ou senha incorrectos."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6346,10 +6411,6 @@ msgstr "O arquivo principal est? mal co
 msgstr "O arquivo principal est? mal configurado"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Nome ou senha incorrectos."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Incapaz de reconhecer o anfitri?o do nome de utilizador que inseriu"
 
@@ -6568,6 +6629,28 @@ msgstr "Porto do servidor"
 msgstr "Porto do servidor"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "O servidor retornou uma resposta inv?lida."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"esteve a ligar e desligar com muita frequ?ncia. Espere dez minutos e tente "
+"novamente. Se continuar a tentar, vai ter que esperar ainda mais."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Erro ao criar a liga??o"
+
+msgid "Incorrect password."
+msgstr "Senha incorrecta."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "N?o foi poss?vel ligar"
 
@@ -6869,15 +6952,38 @@ msgstr ""
 "utilizador ? inv?lido.  Nomes de utilizador t?em que come?ar com uma letra e "
 "conter apenas letras, n?meros e espa?os, ou conter apenas n?meros."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Pode ser desligado num curto per?odo de tempo. Pode querer usar o TOC at? "
+"que isso esteja corrigido. Verifique por actualiza??es em %s."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "O Pidgin n?o foi capaz de obter um \"hash\" de liga??o AIM v?lido."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Pode ser desligado num curto per?odo de tempo. Pode querer usar o TOC at? "
+"que isso esteja corrigido. Verifique por actualiza??es em %s."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "O Pidgin n?o foi capaz de obter um hash de liga??o v?lido."
+
+msgid "Could Not Connect"
+msgstr "N?o foi poss?vel ligar"
+
+msgid "Received authorization"
+msgstr "Autoriza??o recebida"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Nome inv?lido"
 
-msgid "Incorrect password."
-msgstr "Senha incorrecta."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "A sua conta est? suspensa neste momento."
@@ -6886,26 +6992,20 @@ msgstr "O servi?o AOL Instant Messenger
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O servi?o AOL Instant Messenger est? temporariamente indispon?vel."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"esteve a ligar e desligar com muita frequ?ncia. Espere dez minutos e tente "
-"novamente. Se continuar a tentar, vai ter que esperar ainda mais."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A vers?o do cliente que est? a usar ? velha demais. Por favor actualize em %s"
 
-msgid "Could Not Connect"
-msgstr "N?o foi poss?vel ligar"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"esteve a ligar e desligar com muita frequ?ncia. Espere dez minutos e tente "
+"novamente. Se continuar a tentar, vai ter que esperar ainda mais."
 
-msgid "Received authorization"
-msgstr "Autoriza??o recebida"
-
 msgid "The SecurID key entered is invalid."
 msgstr "A chave SecurID inserida ? inv?lida."
 
@@ -6922,26 +7022,6 @@ msgstr "OK"
 msgid "_OK"
 msgstr "OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Pode ser desligado num curto per?odo de tempo. Pode querer usar o TOC at? "
-"que isso esteja corrigido. Verifique por actualiza??es em %s."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "O Pidgin n?o foi capaz de obter um \"hash\" de liga??o AIM v?lido."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Pode ser desligado num curto per?odo de tempo. Pode querer usar o TOC at? "
-"que isso esteja corrigido. Verifique por actualiza??es em %s."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "O Pidgin n?o foi capaz de obter um hash de liga??o v?lido."
-
 msgid "Password sent"
 msgstr "Senha enviada"
 
@@ -7461,6 +7541,7 @@ msgstr "Definir Info de Utilizador (URL)
 msgid "Set User Info (web)..."
 msgstr "Definir Info de Utilizador (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Mudar Senha (URL)"
@@ -7495,6 +7576,10 @@ msgstr "Procurar Contacto por Informa?? msgid "Search for Buddy by Information"
 msgstr "Procurar Contacto por Informa??o"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "O utilizador est? desligado"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9887,10 +9972,6 @@ msgstr "Dom?nio Auth"
 msgid "Auth Domain"
 msgstr "Dom?nio Auth"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9917,6 +9998,44 @@ msgstr "Adicionar Contacto rejeitado"
 msgid "Add buddy rejected"
 msgstr "Adicionar Contacto rejeitado"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Imposs?vel criar liga??o SSL ao servidor."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Senha incorrecta."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Erro desconhecido n?mero %d. Ligar-se ao website da Yahoo! pode corrigir "
+"isto."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Utilizador n?o existe"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Erro desconhecido n?mero %d. Ligar-se ao website da Yahoo! pode corrigir "
+"isto."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nome ou senha incorrectos."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10026,9 +10145,8 @@ msgstr "Come?ar a Doodlar"
 msgid "Start Doodling"
 msgstr "Come?ar a Doodlar"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Activar qual ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Juntar a quem no chat?"
@@ -10831,8 +10949,8 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Lista de Salas"
+msgid "A_ccount"
+msgstr "Conta:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10841,8 +10959,9 @@ msgstr ""
 "Por favor introduza a informa??o apropriada sobre o chat ao qual gostaria de "
 "se juntar.\n"
 
-msgid "_Account:"
-msgstr "_Conta:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Lista de Salas"
 
 msgid "_Block"
 msgstr "_Bloquear"
@@ -11314,6 +11433,113 @@ msgstr "/Contactos/Ordenar Contactos"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contactos/Ordenar Contactos"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Cor de fundo"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "%s adicionou-o(a) ? sua lista de contactos."
+
+#, fuzzy
+msgid "Layout"
+msgstr "Op??es de liga??o"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Cor de fundo"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expandir"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Seleccionar cor de fundo"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "Co_lapsar"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Seleccionar cor de fundo"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Porta"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Ligado"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Ausente"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Desligado"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Disposi??o"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mensagem enviada"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Mudar informa??es do utilizador %s"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11839,6 +12065,10 @@ msgstr "H?ngaro"
 msgstr "H?ngaro"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romeno"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Maced?nio"
 
@@ -11944,6 +12174,9 @@ msgstr "Sueco"
 msgid "Swedish"
 msgstr "Sueco"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -12391,11 +12624,10 @@ msgstr "Guardar imagem"
 msgid "Save Image"
 msgstr "Guardar imagem"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Guardar imagem..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "Mostrar smileys personalizados"
 
@@ -12486,10 +12718,6 @@ msgstr "Fonte"
 msgstr "Fonte"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Cor de fundo"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Cor da letra"
 
@@ -12841,6 +13069,9 @@ msgstr "Notificar em Quem"
 msgid "Pounce on Whom"
 msgstr "Notificar em Quem"
 
+msgid "_Account:"
+msgstr "_Conta:"
+
 msgid "_Buddy name:"
 msgstr "_Nome do contacto:"
 
@@ -12952,9 +13183,18 @@ msgstr "Acontecimento de notifica??o d
 msgid "Unknown.... Please report this!"
 msgstr "Acontecimento de notifica??o desconhecido. Por favor reporte isto!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Tema de smileys falhou a instalar."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Tema de smileys falhou a instalar."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Tema de smileys falhou a instalar."
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13549,6 +13789,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Escolher Contacto"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13786,6 +14030,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Endere?o do servidor"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Introduza um Servidor de Confer?ncia"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Escolha um servidor de confer?ncia"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Servi?os Online"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Enviar lista de contactos"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Se _Ausentar"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Directoria do Registo"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Selec??o de som"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descri??o:</b> Assombrado"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Definir informa??es de direct?rio"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Navegador:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Utilizador n?o existe"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "O servidor n?o usa memhum m?todo de autentica??o suportado"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Definir informa??es de direct?rio"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "O contacto est? inactivo"
 
@@ -14316,12 +14632,6 @@ msgstr ""
 "- Manda uma mensagem para as pessoas na sua lista imediatamente quando elas "
 "se conectam"
 
-msgid "Cursor Color"
-msgstr "Cor Do Cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Cor Secund?ria Do Cursor"
-
 msgid "Hyperlink Color"
 msgstr "Cor do Elo"
 
@@ -14333,6 +14643,10 @@ msgstr "Destacar resultados"
 msgid "Highlighted Message Name Color"
 msgstr "Destacar resultados"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Remo??o de notifica??o"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separa??o Horizontal de GtkTreeView"
 
@@ -14362,35 +14676,24 @@ msgstr "Tema GTK+ Text Shortcut"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema GTK+ Text Shortcut"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Cores de interface"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Novas notifica??es de email"
 
-msgid "Widget Sizes"
-msgstr "Tamanhos de widgets"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Controle do Tema GTK+ do Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Fechar"
+
 msgid "Fonts"
 msgstr "Fontes"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Controle por Ficheiros do Pidgin"
@@ -14539,12 +14842,119 @@ msgstr ""
 "Substitui texto nas mensagens enviadas de acordo com regras definidas pelo "
 "utilizador."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Desligado"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Desligado"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Entrar num Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorar"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Mais Alto"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autoriza??o concedida"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Erro"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informa??es do trabalho"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Di?logo De Pedido"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "N?vel de Alerta"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Estado para %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "L?ngua da sala de chat"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Guardar ?cone"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Controle do Tema GTK+ do Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informa??es da conta"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lista de contactos"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista de contactos"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Controle do Tema GTK+ do Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Controle do Tema GTK+ do Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Monitor de contactos"
 
@@ -14760,6 +15170,22 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Activar qual ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Cor Do Cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Cor Secund?ria Do Cursor"
+
+#~ msgid "Interface colors"
+#~ msgstr "Cores de interface"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Tamanhos de widgets"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Inserir na mensagem"
 
@@ -15247,10 +15673,6 @@ msgstr ""
 #~ msgstr "Utilizadores em %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "%s adicionou-o(a) ? sua lista de contactos."
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "Erro ao executar opera??o de ficheiro"
 
@@ -15259,10 +15681,6 @@ msgstr ""
 #~ msgstr "Introduza o token actual"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Erro ao criar a liga??o"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Imposs?vel ligar ao AIM"
 
@@ -15386,10 +15804,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_Mensagem:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Conta:"
-
 #~ msgid "Crazychat"
 #~ msgstr "Crazychat"
 
@@ -15522,13 +15936,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Descri??o:</b> Assombrado"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
============================================================
--- po/pt_BR.po	1c8407359d7af9c5b47485eae0878a3cb0924ea0
+++ po/pt_BR.po	e66da5c75c28f8afe8afa7344026c28342655e2e
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:39-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-24 22:11-0300\n"
 "Last-Translator: Rodrigo Luiz Marques Flores <mail at rodrigoflores.org>\n"
 "Language-Team: Rodrigo Luiz Marques Flores <mail at rodrigoflores.org>\n"
@@ -1778,6 +1778,8 @@ msgstr "+++ %s desconectou"
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectou"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -2183,6 +2185,10 @@ msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Erro ao criar a conex?o"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Voc? est? usando %s, mas este plug-in requer %s."
@@ -3170,6 +3176,11 @@ msgstr "_Nome do bate-papo:"
 msgid "Chat _name:"
 msgstr "_Nome do bate-papo:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "N?o foi poss?vel conectar ao servidor."
+
 msgid "Chat error"
 msgstr "Erro no bate-papo"
 
@@ -3218,6 +3229,10 @@ msgstr "Usu?rio do Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Usu?rio do Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Coletando servidor"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
@@ -3260,7 +3275,8 @@ msgstr "_Senha:"
 msgid "_Password:"
 msgstr "_Senha:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Apelidos do IRC n?o podem conter espa?os"
 
 #. 1. connect to server
@@ -3738,6 +3754,9 @@ msgstr "O servidor n?o utiliza nenhum m
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor n?o utiliza nenhum m?todo de autentica??o suportado"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Voc? requereu criptografia, mas este servidor n?o a suporta."
+
 msgid "Invalid challenge from server"
 msgstr "O servidor retornou uma identifica??o inv?lida"
 
@@ -4008,6 +4027,14 @@ msgstr "Recurso"
 msgid "Resource"
 msgstr "Recurso"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Conectado"
+
 msgid "Middle Name"
 msgstr "Nome do meio"
 
@@ -4176,9 +4203,18 @@ msgstr "Encontrar salas"
 msgid "Find Rooms"
 msgstr "Encontrar salas"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Voc? requereu criptografia, mas este servidor n?o a suporta."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Apelido:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Nenhum usu?rio compat?vel encontrado"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Fun??o"
+
 msgid "Ping timeout"
 msgstr "Tempo limite de ping excedido"
 
@@ -4198,7 +4234,7 @@ msgstr "ID do XMPP inv?lido. O dom?nio
 msgstr "ID do XMPP inv?lido. O dom?nio precisa ser especificado."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "N?o foi poss?vel conectar ao servidor."
 
 #, c-format
@@ -4225,9 +4261,6 @@ msgstr "Desregistro falhou"
 msgid "Unregistration Failed"
 msgstr "Desregistro falhou"
 
-msgid "Already Registered"
-msgstr "J? est? registrado"
-
 msgid "State"
 msgstr "Estado"
 
@@ -4240,6 +4273,9 @@ msgstr "Data"
 msgid "Date"
 msgstr "Data"
 
+msgid "Already Registered"
+msgstr "J? est? registrado"
+
 msgid "Unregister"
 msgstr "Desregistrar"
 
@@ -4269,6 +4305,10 @@ msgstr "Mudar registro"
 msgid "Change Registration"
 msgstr "Mudar registro"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "N?o foi poss?vel conectar ao servidor."
+
 msgid "Error unregistering account"
 msgstr "Erro ao desregistrar conta"
 
@@ -4640,16 +4680,18 @@ msgstr "ban &lt;usu?rio&gt; [sala]: Ban
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usu?rio&gt; [sala]: Bane o usu?rio da sala."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;usu?rio&gt; &lt;owner|admin|member|outcast|none&gt;: define a "
 "filia??o do usu?rio com a sala."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;usu?rio&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
 "cargo do usu?rio na sala."
@@ -4715,6 +4757,9 @@ msgstr "Proxy de transfer?ncia de arqui
 msgid "File transfer proxies"
 msgstr "Proxy de transfer?ncia de arquivo"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5118,6 +5163,11 @@ msgstr "Contatos que n?o s?o do mensag
 msgid "Non-IM Contacts"
 msgstr "Contatos que n?o s?o do mensageiro"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s te enviou um convite para ver webcam, que ? um recurso n?o suportado."
+
 msgid "Nudge"
 msgstr "Chamar a aten??o"
 
@@ -5464,63 +5514,26 @@ msgstr "Autentica??o do Windows Live I
 msgstr "Autentica??o do Windows Live ID:Resposta inv?lida"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s n?o ? um grupo v?lido."
-
-msgid "Unknown error."
-msgstr "Erro desconhecido."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s em %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s chamou sua aten??o!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Erro desconhecido (%d)"
 
 msgid "Unable to add user"
 msgstr "N?o foi poss?vel adicionar usu?rio"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Erro desconhecido (%d)"
+
 msgid "The following users are missing from your addressbook"
 msgstr "Os seguintes usu?rios est?o faltando no seu cat?logo de endere?os"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "N?o foi poss?vel adicionar usu?rio em %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "N?o foi poss?vel bloquear usu?rio em %s (%s)."
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "N?o foi poss?vel permitir usu?rio em %s (%s)."
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s n?o p?de ser adicionado porque a sua lista de amigos est? cheia."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s n?o ? uma conta do Passport v?lida."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Servi?o temporariamente indispon?vel."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "A mensagem m?vel n?o p?de ser enviada porque era muito longa."
 
-msgid "Unable to rename group"
-msgstr "N?o foi poss?vel renomear grupo"
-
-msgid "Unable to delete group"
-msgstr "N?o foi poss?vel remover grupo"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5612,6 +5625,9 @@ msgstr ""
 "Sua lista de amigos do MSN est? temporariamente indispon?vel. Favor aguardar "
 "e tentar novamente."
 
+msgid "Unknown error."
+msgstr "Erro desconhecido."
+
 msgid "Handshaking"
 msgstr "Negociando"
 
@@ -5630,6 +5646,16 @@ msgstr "Recuperando lista de amigos"
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s te enviou um convite para ver webcam, que ? um recurso n?o suportado."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s te enviou um convite para ver webcam, que ? um recurso n?o suportado."
+
 msgid "Away From Computer"
 msgstr "Ausente"
 
@@ -5671,14 +5697,6 @@ msgstr "A mensagem pode n?o ter sido en
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "A mensagem pode n?o ter sido enviada devido a um erro desconhecido:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s te adicionou ? sua lista de contatos."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s te removeu da sua lista de contatos."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Excluir Usu?rio do Cat?logo de Endere?os"
 
@@ -5708,6 +5726,51 @@ msgstr "Plug-in do protocolo MSN"
 msgstr "Plug-in do protocolo MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s n?o ? um grupo v?lido."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s em %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "N?o foi poss?vel adicionar usu?rio em %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "N?o foi poss?vel bloquear usu?rio em %s (%s)."
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "N?o foi poss?vel permitir usu?rio em %s (%s)."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s n?o p?de ser adicionado porque a sua lista de amigos est? cheia."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s n?o ? uma conta do Passport v?lida."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Servi?o temporariamente indispon?vel."
+
+msgid "Unable to rename group"
+msgstr "N?o foi poss?vel renomear grupo"
+
+msgid "Unable to delete group"
+msgstr "N?o foi poss?vel remover grupo"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s te adicionou ? sua lista de contatos."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s te removeu da sua lista de contatos."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Usu?rio n?o existe: %s"
 
@@ -5737,6 +5800,8 @@ msgstr "Conex?o com o servidor perdida"
 msgstr "Conex?o com o servidor perdida"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Novas mensagens de email"
 
@@ -5785,17 +5850,19 @@ msgstr "Erro de protocolo, c?digo %d: %
 msgid "Protocol error, code %d: %s"
 msgstr "Erro de protocolo, c?digo %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Sua senha ? %d caracteres, maior que o tamanho m?ximo esperado de %d para "
 "o MySpaceIM. Por favor, encurte sua senha no http://profileedit.myspace.com/"
 "index.cfm?fuseaction=accountSettings.changePassword e tente novamente."
 
+msgid "Incorrect username or password"
+msgstr "Nome de usu?rio ou senha incorreto(a)"
+
 msgid "MySpaceIM Error"
 msgstr "Erro do MySpace"
 
@@ -6113,9 +6180,6 @@ msgstr "O arquivo mestre est? mal confi
 msgid "Master archive is misconfigured"
 msgstr "O arquivo mestre est? mal configurado"
 
-msgid "Incorrect username or password"
-msgstr "Nome de usu?rio ou senha incorreto(a)"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "N?o foi poss?vel reconhecer o host do nome de usu?rio digitado"
 
@@ -6334,6 +6398,29 @@ msgstr "Porta do servidor"
 msgid "Server port"
 msgstr "Porta do servidor"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "O servidor retornou uma resposta HTTP inv?lida."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Voc? esteve conectando e desconectando com muita freq??ncia. Espere dez "
+"minutos e tente novamente. Se voc? continuar tentando, vai ter que esperar "
+"ainda mais."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Erro ao solicitar token de conex?o"
+
+msgid "Incorrect password."
+msgstr "Senha incorreta."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "N?o foi poss?vel entrar na sala de bate-papo"
 
@@ -6636,14 +6723,34 @@ msgstr ""
 "v?lido, ou t?m que come?ar com uma letra e conter apenas letras, n?meros e "
 "espa?os, ou conter apenas n?meros."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Voc? pode ser desconectado em brevo. Se isso acontecer, verifique "
+"atualiza??es em %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "N?o foi poss?vel conseguir um hash de conex?o AIM v?lido."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Voc? pode ser desconectado daqui a pouco. Verifique atualiza??es em %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "N?o foi poss?vel conseguir um hash de conex?o v?lido."
+
+msgid "Could Not Connect"
+msgstr "N?o foi poss?vel conectar"
+
+msgid "Received authorization"
+msgstr "Autoriza??o recebida"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Nome de usu?rio inv?lido."
 
-msgid "Incorrect password."
-msgstr "Senha incorreta."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta est? suspensa."
@@ -6652,28 +6759,22 @@ msgstr "O servi?o AOL Instant Messenger
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O servi?o AOL Instant Messenger est? temporariamente indispon?vel."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Voc? esteve conectando e desconectando com muita freq??ncia. Espere dez "
-"minutos e tente novamente. Se voc? continuar tentando, vai ter que esperar "
-"ainda mais."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A vers?o do cliente que voc? est? usando ? velha demais. Favor atualizar em %"
 "s"
 
-msgid "Could Not Connect"
-msgstr "N?o foi poss?vel conectar"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"Voc? esteve conectando e desconectando com muita freq??ncia. Espere dez "
+"minutos e tente novamente. Se voc? continuar tentando, vai ter que esperar "
+"ainda mais."
 
-msgid "Received authorization"
-msgstr "Autoriza??o recebida"
-
 msgid "The SecurID key entered is invalid."
 msgstr "A chave SecurID digitada ? inv?lida."
 
@@ -6689,23 +6790,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Voc? pode ser desconectado em brevo. Se isso acontecer, verifique "
-"atualiza??es em %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "N?o foi poss?vel conseguir um hash de conex?o AIM v?lido."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Voc? pode ser desconectado daqui a pouco. Verifique atualiza??es em %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "N?o foi poss?vel conseguir um hash de conex?o v?lido."
-
 msgid "Password sent"
 msgstr "Senha enviada"
 
@@ -7222,6 +7306,7 @@ msgstr "Definir Informa??es de usu?ri
 msgid "Set User Info (web)..."
 msgstr "Definir Informa??es de usu?rio (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Mudar Senha (URL)"
 
@@ -7251,6 +7336,10 @@ msgstr "Procurar por amigos por informa? msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informa??es"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "O usu?rio est? desconectado"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9520,11 +9609,6 @@ msgstr "Dom?nio de autentica??o"
 msgid "Auth Domain"
 msgstr "Dom?nio de autentica??o"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s te enviou um convite para ver webcam, que ? um recurso n?o suportado."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9552,6 +9636,44 @@ msgstr "Pedido para adicionar amigo nega
 msgid "Add buddy rejected"
 msgstr "Pedido para adicionar amigo negado"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Dados inv?lidos foram recebidos na conex?o com o servidor."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Senha incorreta"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"N?mero de erro %d desconhecido. Entrar na sua conta no site do Yahoo! pode "
+"corrigir isso."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Usu?rio inexistente"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"N?mero de erro %d desconhecido. Entrar na sua conta no site do Yahoo! pode "
+"corrigir isso."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nome de usu?rio ou senha incorreto(a)"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9665,8 +9787,8 @@ msgstr "Come?ar a desenhar"
 msgid "Start Doodling"
 msgstr "Come?ar a desenhar"
 
-msgid "Activate which ID?"
-msgstr "Ativar qual ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
@@ -10456,8 +10578,9 @@ msgstr "Favor atualizar os campos necess
 msgid "Please update the necessary fields."
 msgstr "Favor atualizar os campos necess?rios."
 
-msgid "Room _List"
-msgstr "_Lista de salas"
+#, fuzzy
+msgid "A_ccount"
+msgstr "_Conta:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10466,8 +10589,8 @@ msgstr ""
 "Por favor digite as informa??es apropriadas sobre o bate-papo em que voc? "
 "gostaria de entrar.\n"
 
-msgid "_Account:"
-msgstr "_Conta:"
+msgid "Room _List"
+msgstr "_Lista de salas"
 
 msgid "_Block"
 msgstr "_Bloquear"
@@ -10907,6 +11030,112 @@ msgstr "/Amigos/Ordenar amigos"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Cor do fundo"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Este grupo foi adicionado ? sua lista de amigos."
+
+#, fuzzy
+msgid "Layout"
+msgstr "Laociano"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Cor do fundo"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expandir"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Selecionar cor de fundo"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "Re_colher"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Selecionar cor de fundo"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Atalho"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Conectado"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Ausente"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Desconectado"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Humor (texto)"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mensagem enviada"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Modificar informa??es do usu?rio para %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"
@@ -11408,6 +11637,10 @@ msgstr "H?ngaro"
 msgid "Hungarian"
 msgstr "H?ngaro"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Romeno"
+
 msgid "Indonesian"
 msgstr "Bahasa Indon?sia"
 
@@ -11505,6 +11738,9 @@ msgstr "Sueco"
 msgid "Swedish"
 msgstr "Sueco"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11940,11 +12176,9 @@ msgstr "Salvar imagem"
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Exibir emoticons personalizados"
 
@@ -12034,9 +12268,6 @@ msgstr "Tipo da fonte"
 msgid "Font Face"
 msgstr "Tipo da fonte"
 
-msgid "Background Color"
-msgstr "Cor do fundo"
-
 msgid "Foreground Color"
 msgstr "Cor da fonte"
 
@@ -12368,6 +12599,9 @@ msgstr "Quem ter? a a??o"
 msgid "Pounce on Whom"
 msgstr "Quem ter? a a??o"
 
+msgid "_Account:"
+msgstr "_Conta:"
+
 msgid "_Buddy name:"
 msgstr "_Nome do amigo:"
 
@@ -12478,9 +12712,18 @@ msgstr "Evento de a??o desconhecido. P
 msgid "Unknown.... Please report this!"
 msgstr "Evento de a??o desconhecido. Por favor reporte isso!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "O tema de emoticons n?o p?de ser descompactado."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "O tema de emoticons n?o p?de ser descompactado."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "O tema de emoticons n?o p?de ser descompactado."
+
 msgid "Install Theme"
 msgstr "Instalar tema"
 
@@ -13044,6 +13287,10 @@ msgstr "Gerenciador de emoticons persona
 msgid "Custom Smiley Manager"
 msgstr "Gerenciador de emoticons personalizados"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Selecionar amigo"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Clique para alterar seu ?cone de exibi??o para esta conta."
 
@@ -13267,6 +13514,78 @@ msgstr ""
 msgstr ""
 "Mostrar informa??es estat?sticas sobre a disponibilidade de seus amigos"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Endere?o do servidor"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Entrar num servidor de confer?ncia"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Selecione um servidor de confer?ncia a ser consultado"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Servi?os online"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Enviar lista de amigos"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Ficar ausente"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Diret?rio dos hist?ricos"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sele??o de som"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Servi?o PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Descri??o"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Informa??es da localiza??o de servi?os"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Navegador:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Usu?rio inexistente"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "O servidor n?o tem suporte a bloqueio"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Informa??es da localiza??o de servi?os"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Este plug-in ? ?til para depurar servidores ou clientes XMPP."
+
 msgid "Buddy is idle"
 msgstr "O amigo estiver inativo"
 
@@ -13781,12 +14100,6 @@ msgstr ""
 "- Manda uma mensagem para as pessoas na sua lista imediatamente quando elas "
 "se conectam"
 
-msgid "Cursor Color"
-msgstr "Cor do cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Cor do cursor secund?rio"
-
 msgid "Hyperlink Color"
 msgstr "Cor do hyperlink"
 
@@ -13796,6 +14109,10 @@ msgstr "Cor do Nome de Mensagens Real?a
 msgid "Highlighted Message Name Color"
 msgstr "Cor do Nome de Mensagens Real?adas"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Cor da notifica??o de digita??o"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separa??o horizontal do GtkTreeView"
 
@@ -13825,35 +14142,24 @@ msgstr "Tema de atalhos do GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atalhos do GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "_Cores da interface"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Habilitar notifica??o de digita??o"
 
-msgid "Widget Sizes"
-msgstr "Tamanho dos controles"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Controle do tema do GTK+ do Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Fechar"
+
 msgid "Fonts"
 msgstr "Fontes"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Ferramentas do gtkrc"
 
@@ -13997,12 +14303,119 @@ msgstr ""
 "Substitui texto nas mensagens enviadas de acordo com regras definidas pelo "
 "usu?rio."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Desconectado"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Desconectado"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Entrar em um bate-papo"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorar"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Mais alto"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autoriza??o concedida"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Erro "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Informa??es"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Di?logo de requisi??o"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "N?vel de alerta"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status de %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Locale da sala de bate-papo"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Alterar ?cone"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Controle do tema do GTK+ do Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Informa??es do contato"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Lista de amigos"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Lista de amigos"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Controle do tema do GTK+ do Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Controle do tema do GTK+ do Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Monitor de amigos"
 
@@ -14208,6 +14621,21 @@ msgstr "Este plug-in ? ?til para depur
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este plug-in ? ?til para depurar servidores ou clientes XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Ativar qual ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Cor do cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Cor do cursor secund?rio"
+
+#~ msgid "Interface colors"
+#~ msgstr "_Cores da interface"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Tamanho dos controles"
+
 #~ msgid "Invite message"
 #~ msgstr "Mensagem de convite"
 
@@ -14650,9 +15078,6 @@ msgstr "Este plug-in ? ?til para depur
 #~ msgstr ""
 #~ "Seu pedido de entrada no grupo %d foi aprovado pelo administrador %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Este grupo foi adicionado ? sua lista de amigos."
-
 #~ msgid "I am applying to join"
 #~ msgstr "Estou solicitando entrada"
 
@@ -14735,9 +15160,6 @@ msgstr "Este plug-in ? ?til para depur
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(obtendo)</i>"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Erro ao solicitar token de conex?o"
-
 #~ msgid "TCP Address"
 #~ msgstr "Endere?o TCP"
 
@@ -14831,9 +15253,6 @@ msgstr "Este plug-in ? ?til para depur
 #~ "apelido para o amigo. O apelido ser? exibido no lugar do nome do usu?rio "
 #~ "sempre que poss?vel.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "_Conta:"
-
 #~ msgid "User has typed something and stopped"
 #~ msgstr "O usu?rio digitou algo e parou"
 
============================================================
--- po/ro.po	bd7fd325c0ed1519a1e1ceba39c3960131533822
+++ po/ro.po	2c63deada0b2d51c82ab11e1694d29137fb750f6
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin-2.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-01-07 00:42+0200\n"
 "Last-Translator: Mi?u Moldovan <dumol at gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -1782,6 +1782,8 @@ msgstr "+++ %s s-a deconectat"
 msgid "+++ %s signed off"
 msgstr "+++ %s s-a deconectat"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Eroare necunoscut?"
 
@@ -2193,6 +2195,10 @@ msgstr "(%s) %s <R?spuns-Automat>: %s\n
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <R?spuns-Automat>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Eroare la stabilirea conexiunii"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Utiliza?i %s, dar acest modul necesit? %s."
@@ -3166,6 +3172,11 @@ msgstr "_Nume chat:"
 msgid "Chat _name:"
 msgstr "_Nume chat:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Conectarea la server a e?uat."
+
 msgid "Chat error"
 msgstr "Eroare de chat"
 
@@ -3214,6 +3225,10 @@ msgstr "Utilizator Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Utilizator Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Introducere detalii..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comand? necunoscut?: %s"
@@ -3256,7 +3271,8 @@ msgstr "_Parol?:"
 msgid "_Password:"
 msgstr "_Parol?:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Pseudonimele IRC nu pot con?ine spa?ii"
 
 #. 1. connect to server
@@ -3736,6 +3752,9 @@ msgstr "Serverul nu utilizeaz? o metod? msgid "Server does not use any supported authentication method"
 msgstr "Serverul nu utilizeaz? o metod? cunoscut? de autentificare"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "A?i cerut criptare, dar serverul nu suport? criptare"
+
 msgid "Invalid challenge from server"
 msgstr "Cerere invalid? de la server"
 
@@ -4018,6 +4037,14 @@ msgstr "Resurs?"
 msgid "Resource"
 msgstr "Resurs?"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Autentificat"
+
 msgid "Middle Name"
 msgstr "Ini?ial?"
 
@@ -4186,9 +4213,18 @@ msgstr "Caut? camere de chat"
 msgid "Find Rooms"
 msgstr "Caut? camere de chat"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "A?i cerut criptare, dar serverul nu suport? criptare"
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Nu s-au g?sit utilizatori care s? corespund?"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Func?ie"
+
 msgid "Ping timeout"
 msgstr "Expirare ping"
 
@@ -4208,7 +4244,7 @@ msgstr "ID XMPP invalid. Trebuie preciza
 msgstr "ID XMPP invalid. Trebuie precizat domeniul."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Conectarea la server a e?uat."
 
 #, c-format
@@ -4235,9 +4271,6 @@ msgstr "?tergere e?uat? a ?nregistr? msgid "Unregistration Failed"
 msgstr "?tergere e?uat? a ?nregistr?rii"
 
-msgid "Already Registered"
-msgstr "Este deja ?nregistrat"
-
 msgid "State"
 msgstr "Stat"
 
@@ -4250,6 +4283,9 @@ msgstr "Dat?"
 msgid "Date"
 msgstr "Dat?"
 
+msgid "Already Registered"
+msgstr "Este deja ?nregistrat"
+
 msgid "Unregister"
 msgstr "?tergere ?nregistrare"
 
@@ -4278,6 +4314,10 @@ msgstr "Modificare ?nregistrare"
 msgid "Change Registration"
 msgstr "Modificare ?nregistrare"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Conectarea la server a e?uat."
+
 msgid "Error unregistering account"
 msgstr "Eroare la ?tergerea contului ?nregistrat"
 
@@ -4646,16 +4686,18 @@ msgstr ""
 msgstr ""
 "ban &lt;nume utilizator&gt; [chat]:  Bloca?i accesul unui utilizator ?n chat."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;nume ales&gt; &lt;de?in?tor|administrator|membru|renegat|"
 "niciuna&gt;:  Seta?i afilierea unui utilizator fa?? de camera de chat."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;nume ales&gt; &lt;moderator|participant|vizitator|niciunul&gt;:  "
 "Seta?i rolul unui utilizator ?n camera de chat."
@@ -4719,6 +4761,9 @@ msgstr "Servere proxy pentru transfer de
 msgid "File transfer proxies"
 msgstr "Servere proxy pentru transfer de fi?iere"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5117,6 +5162,12 @@ msgstr "Contacte de alt tip"
 msgid "Non-IM Contacts"
 msgstr "Contacte de alt tip"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s v-a trimis o invita?ie de a-i vedea webcam-ul, invita?ie ce nu este ?nc? "
+"suportat?"
+
 msgid "Nudge"
 msgstr "Buzz"
 
@@ -5461,63 +5512,26 @@ msgstr "Autentificare Windows Live ID: R
 msgstr "Autentificare Windows Live ID: R?spuns invalid"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nu este un nume valid de grup."
-
-msgid "Unknown error."
-msgstr "Eroare necunoscut?."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?n %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s v? s?c?ie cu un ,,nudge"!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Eroare necunoscut? (%d)"
 
 msgid "Unable to add user"
 msgstr "Nu se poate ad?uga utilizatorul"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Urm?torii utilizatori v? lipsesc din cartea de adrese"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nu se poate ad?uga utilizatorul ?n %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Eroare necunoscut? (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nu se poate bloca utilizatorul ?n %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "Urm?torii utilizatori v? lipsesc din cartea de adrese"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nu se poate permite utilizatorul ?n %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nu a putut fi ad?ugat pentru c? lista de contacte v? e plin?."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nu este un nume de cont ,,passport" valid."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Serviciu temporar indisponibil."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mesajul mobil nu a fost trimis pentru era prea lung."
 
-msgid "Unable to rename group"
-msgstr "Grupul nu poate fi redenumit"
-
-msgid "Unable to delete group"
-msgstr "Grupul nu poate fi ?ters"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5608,6 +5622,9 @@ msgstr ""
 msgstr ""
 "Lista contactelor MSN este momentan indisponibil?. ?ncerca?i mai t?rziu."
 
+msgid "Unknown error."
+msgstr "Eroare necunoscut?."
+
 msgid "Handshaking"
 msgstr "Sincronizare"
 
@@ -5626,6 +5643,18 @@ msgstr "Se descarc? lista de contacte"
 msgid "Retrieving buddy list"
 msgstr "Se descarc? lista de contacte"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s v-a trimis o invita?ie de a-i vedea webcam-ul, invita?ie ce nu este ?nc? "
+"suportat?"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s v-a trimis o invita?ie de a-i vedea webcam-ul, invita?ie ce nu este ?nc? "
+"suportat?"
+
 msgid "Away From Computer"
 msgstr "Absent din fa?a calculatorului"
 
@@ -5667,14 +5696,6 @@ msgstr ""
 msgstr ""
 "E posibil ca mesajul s? nu fi fost trimis din cauza unei erori necunoscute:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s v-a ad?ugat ?n lista sa de contacte."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s v-a ?ters din lista sa de contacte."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "?terge?i contactul din cartea de adrese?"
 
@@ -5704,6 +5725,51 @@ msgstr "Modul de protocol MSN"
 msgstr "Modul de protocol MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nu este un nume valid de grup."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?n %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nu se poate ad?uga utilizatorul ?n %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nu se poate bloca utilizatorul ?n %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nu se poate permite utilizatorul ?n %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nu a putut fi ad?ugat pentru c? lista de contacte v? e plin?."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nu este un nume de cont ,,passport" valid."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Serviciu temporar indisponibil."
+
+msgid "Unable to rename group"
+msgstr "Grupul nu poate fi redenumit"
+
+msgid "Unable to delete group"
+msgstr "Grupul nu poate fi ?ters"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s v-a ad?ugat ?n lista sa de contacte."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s v-a ?ters din lista sa de contacte."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Nu exist? utilizatorul %s"
 
@@ -5733,6 +5799,8 @@ msgstr "S-a pierdut conexiunea cu server
 msgstr "S-a pierdut conexiunea cu serverul"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Mailuri noi"
 
@@ -5780,18 +5848,20 @@ msgstr "Eroare de protocol, codul %d: %s
 msgid "Protocol error, code %d: %s"
 msgstr "Eroare de protocol, codul %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Ave?i o parol? de %d caractere, mai mare dec?t lungimea maxim? de %d ?n "
 "MySpaceIM. E necesar s? introduce?i o parol? mai scurt? la http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "?i s? ?ncerca?i din onu."
 
+msgid "Incorrect username or password"
+msgstr "Nume de utilizator sau parol? incorecte."
+
 msgid "MySpaceIM Error"
 msgstr "Eroare MySpaceIM"
 
@@ -6121,9 +6191,6 @@ msgstr "Arhiva principal? este configur
 msgid "Master archive is misconfigured"
 msgstr "Arhiva principal? este configurat? gre?it"
 
-msgid "Incorrect username or password"
-msgstr "Nume de utilizator sau parol? incorecte."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nu s-a putut recunoa?te serverul din numele de utilizator introdus"
 
@@ -6340,6 +6407,28 @@ msgstr "Port server"
 msgid "Server port"
 msgstr "Port server"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "S-a primit un r?spuns HTTP nea?teptat de la server."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"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."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Eroare la cererea unui ,,token" de autentificare"
+
+msgid "Incorrect password."
+msgstr "Parol? incorect?."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Nu s-a putut intra ?n camera de chat"
 
@@ -6643,14 +6732,35 @@ msgstr ""
 "valid? sau s? ?nceap? cu o liter? ?i s? con?in? doar litere, numere ?i "
 "spa?ii sau s? con?in? doar numere."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"S-ar putea s? intervin? ?n scurt timp deconectarea de la server. Dac? se "
+"?nt?mpl?, vizita?i %s pentru actualiz?ri."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nu s-a putut ob?ine un hash valid pentru autentificarea AIM."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"S-ar putea s? fi?i ?n scurt timp deconectat(?). Vizita?i %s pentru "
+"actualiz?ri."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nu s-a putut ob?ine un hash valid pentru autentificare."
+
+msgid "Could Not Connect"
+msgstr "Conectare e?uat?"
+
+msgid "Received authorization"
+msgstr "Autorizarea a fost primit?"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Nume invalid de utilizator"
 
-msgid "Incorrect password."
-msgstr "Parol? incorect?."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Contul dumneavoastr? este momentan suspendat."
@@ -6659,25 +6769,19 @@ msgstr "Serviciul de mesagerie instant A
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Serviciul de mesagerie instant AOL este temporar indisponibil."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Versiunea clientului folosit este prea veche. Actualiza?i-l la %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "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."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Versiunea clientului folosit este prea veche. Actualiza?i-l la %s"
-
-msgid "Could Not Connect"
-msgstr "Conectare e?uat?"
-
-msgid "Received authorization"
-msgstr "Autorizarea a fost primit?"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Cheia SecurID introdus? este invalid?."
 
@@ -6693,24 +6797,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"S-ar putea s? intervin? ?n scurt timp deconectarea de la server. Dac? se "
-"?nt?mpl?, vizita?i %s pentru actualiz?ri."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nu s-a putut ob?ine un hash valid pentru autentificarea AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"S-ar putea s? fi?i ?n scurt timp deconectat(?). Vizita?i %s pentru "
-"actualiz?ri."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nu s-a putut ob?ine un hash valid pentru autentificare."
-
 msgid "Password sent"
 msgstr "Parola a fost trimis?"
 
@@ -7245,6 +7331,7 @@ msgstr "Introducere detalii (online)..."
 msgid "Set User Info (web)..."
 msgstr "Introducere detalii (online)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Schimbare parol? (online)"
 
@@ -7274,6 +7361,10 @@ msgstr "C?utare contact dup? detalii"
 msgid "Search for Buddy by Information"
 msgstr "C?utare contact dup? detalii"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Utilizator neconectat"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9603,12 +9694,6 @@ msgstr "Autentificare domeniu"
 msgid "Auth Domain"
 msgstr "Autentificare domeniu"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s v-a trimis o invita?ie de a-i vedea webcam-ul, invita?ie ce nu este ?nc? "
-"suportat?"
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9636,6 +9721,44 @@ msgstr "Ad?ugarea contactului a fost re
 msgid "Add buddy rejected"
 msgstr "Ad?ugarea contactului a fost refuzat?"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "S-au primit date invalide de la server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Parol? gre?it?"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Eroare necunoscut? cu num?rul %d. Autentificarea la www.yahoo.com ar putea "
+"rezolva aceast? problem?."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Utilizator inexistent"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Eroare necunoscut? cu num?rul %d. Autentificarea la www.yahoo.com ar putea "
+"rezolva aceast? problem?."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nume de utilizator sau parol? incorecte."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9749,8 +9872,8 @@ msgstr "M?zg?lituri"
 msgid "Start Doodling"
 msgstr "M?zg?lituri"
 
-msgid "Activate which ID?"
-msgstr "Ce identitate dori?i s? activa?i?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Cui dori?i s? v? al?tura?i ?n chat?"
@@ -10549,16 +10672,17 @@ msgstr "Trebuie s? actualiza?i c?mpur
 msgid "Please update the necessary fields."
 msgstr "Trebuie s? actualiza?i c?mpurile cerute."
 
-msgid "Room _List"
-msgstr "_List? de camere"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Cont"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduce?i detaliile chat-ului ?n care dori?i s? intra?i.\n"
 
-msgid "_Account:"
-msgstr "C_ont:"
+msgid "Room _List"
+msgstr "_List? de camere"
 
 msgid "_Block"
 msgstr "_Blocheaz?"
@@ -11001,6 +11125,112 @@ msgstr "/Contacte/Sorteaz? contactele"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacte/Sorteaz? contactele"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Culoare fundal"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Acest grup a fost ad?ugat la lista dumneavoastr? de contacte"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Culoare fundal"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Des_f?"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Selecta?i culoarea fundalului"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Str?nge"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Selecta?i culoarea fundalului"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Combina?ie de semne"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Conectat"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Absent"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Deconectat"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Text dispozi?ie"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "A?i trimis un mesaj"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Modificare detalii pentru %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servere SSL"
@@ -11504,6 +11734,10 @@ msgstr "Maghiar?"
 msgid "Hungarian"
 msgstr "Maghiar?"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rom?n?"
+
 msgid "Indonesian"
 msgstr "Indonezian?"
 
@@ -11602,6 +11836,9 @@ msgstr "Suedez?"
 msgid "Swedish"
 msgstr "Suedez?"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -12031,11 +12268,9 @@ msgstr "Salveaz? imaginea"
 msgid "Save Image"
 msgstr "Salveaz? imaginea"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Salveaz? imaginea..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Adaug? iconi?? simbolic?..."
 
@@ -12125,9 +12360,6 @@ msgstr "Nume font"
 msgid "Font Face"
 msgstr "Nume font"
 
-msgid "Background Color"
-msgstr "Culoare fundal"
-
 msgid "Foreground Color"
 msgstr "Culoare text"
 
@@ -12461,6 +12693,9 @@ msgstr "?nt?mpinare pentru"
 msgid "Pounce on Whom"
 msgstr "?nt?mpinare pentru"
 
+msgid "_Account:"
+msgstr "C_ont:"
+
 msgid "_Buddy name:"
 msgstr "Nu_me contact:"
 
@@ -12571,9 +12806,18 @@ msgstr "Eveniment necunoscut ?n ?nt?m
 msgid "Unknown.... Please report this!"
 msgstr "Eveniment necunoscut ?n ?nt?mpinare. Raporta?i aceast? eroare."
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Tema de iconi?e simbolice nu a putut fi dezarhivat?."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Tema de iconi?e simbolice nu a putut fi dezarhivat?."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Tema de iconi?e simbolice nu a putut fi dezarhivat?."
+
 msgid "Install Theme"
 msgstr "Instalare tem?"
 
@@ -13134,6 +13378,10 @@ msgstr "Administrator de iconi?e person
 msgid "Custom Smiley Manager"
 msgstr "Administrator de iconi?e personalizate"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Selectare contact"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Clic aici pentru a v? schimba avatarul pentru acest cont."
 
@@ -13356,6 +13604,79 @@ msgstr "Arat? statistici despre disponi
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Arat? statistici despre disponibilitatea contactelor"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adres? server"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Conectare la un server de conferin?e"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Selecta?i un server de conferin?e pentru interogare"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Servicii de conectare"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Trimite lista de contacte"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Intrarea ?n absen??"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Director ?nregistr?ri"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Selecta?i un sunet"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Serviciu PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Descriere"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Detalii servicii descoperite"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Navigator:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Utilizator inexistent"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Serverul nu permite blocarea"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Detalii servicii descoperite"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Acest modul poate fi utilizat pentru depanarea serverelor ?i clien?ilor XMPP."
+
 msgid "Buddy is idle"
 msgstr "Contactul este inactiv"
 
@@ -13860,12 +14181,6 @@ msgstr ""
 "- Inverseaz? textul mesajelor primite\n"
 "- Trimite un mesaj contactelor din list? atunci c?nd se autentific?."
 
-msgid "Cursor Color"
-msgstr "Culoare cursor"
-
-msgid "Secondary Cursor Color"
-msgstr "Culoare cursor secundar"
-
 msgid "Hyperlink Color"
 msgstr "Culoare adres? web"
 
@@ -13875,6 +14190,10 @@ msgstr "Numele culorii pentru eviden?ie
 msgid "Highlighted Message Name Color"
 msgstr "Numele culorii pentru eviden?ierea mesajelor"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Culoarea mesajelor de notificare"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separare orizontal? GtkTreeView"
 
@@ -13904,35 +14223,24 @@ msgstr "Tem? combina?ii de taste GTK+ 
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tem? combina?ii de taste GTK+ Text"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Culori interfa??"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Activeaz? mesajele de notificare"
 
-msgid "Widget Sizes"
-msgstr "M?rimi widget-uri"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Control tem? GTK+ Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "?nchide"
+
 msgid "Fonts"
 msgstr "Fonturi"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Unelte fi?iere Gtkrc"
 
@@ -14070,12 +14378,119 @@ msgstr "Schimb? mesajele trimise dup? 
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Schimb? mesajele trimise dup? reguli predefinite de utilizator."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Neautentificat"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Neautentificat"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Intr? ?ntr-un chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignor?"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Mai tare"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizare acordat?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Erori "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Detalii"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Dialog cerere"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Nivel de avertizare"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status pentru %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Op?iuni locale chat"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Salvare avatar"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Control tem? GTK+ Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Detalii contact"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "List? de contacte"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "List? de contacte"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Control tem? GTK+ Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Control tem? GTK+ Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "List? glisant? de contacte"
 
@@ -14281,6 +14696,21 @@ msgstr ""
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor ?i clien?ilor XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Ce identitate dori?i s? activa?i?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Culoare cursor"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Culoare cursor secundar"
+
+#~ msgid "Interface colors"
+#~ msgstr "Culori interfa??"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "M?rimi widget-uri"
+
 #~ msgid "Invite message"
 #~ msgstr "Mesaj de invitare"
 
@@ -14734,9 +15164,6 @@ msgstr ""
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Cererea de a v? al?tura grupului %d v-a fost aprobat? de adminul %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Acest grup a fost ad?ugat la lista dumneavoastr? de contacte"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Solicit ?nscrierea"
 
@@ -14816,9 +15243,6 @@ msgstr ""
 #~ msgid "Group Operation Error"
 #~ msgstr "Eroare de operare asupra grupului"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Eroare la cererea unui ,,token" de autentificare"
-
 #~ msgid "TCP Address"
 #~ msgstr "Adres? TCP"
 
============================================================
--- po/ru.po	dfe39bf439ed4821d891eee252e3c9f4721ee98c
+++ po/ru.po	c34e4d246e388fd5d2f35948f23f4c1cf258efa2
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: ????? ?????????? <samant.ua at mail.ru>\n"
 "Language-Team: \n"
@@ -1788,6 +1788,8 @@ msgstr "+++ %s ?????"
 msgid "+++ %s signed off"
 msgstr "+++ %s ?????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "??????????? ??????"
 
@@ -2191,6 +2193,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?????? ???????? ??????????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "?? ??????????? %s, ? ???? ?????? ??????? %s."
@@ -3171,6 +3177,11 @@ msgstr "_??? ????:"
 msgid "Chat _name:"
 msgstr "_??? ????:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?? ??????? ??????????? ? ????????."
+
 msgid "Chat error"
 msgstr "?????? ????"
 
@@ -3219,6 +3230,10 @@ msgstr "???????????? Gadu-Ga
 msgid "Gadu-Gadu User"
 msgstr "???????????? Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "????????? ???????"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "??????????? ???????: %s"
@@ -3261,7 +3276,8 @@ msgstr "_??????:"
 msgid "_Password:"
 msgstr "_??????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "?????????? IRC ?? ????? ????????? ???????"
 
 #. 1. connect to server
@@ -3742,6 +3758,9 @@ msgstr "?????? ?? ???????
 msgid "Server does not use any supported authentication method"
 msgstr "?????? ?? ?????????? ?? ?????? ??????????????? ?????? ??????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "?? ????????? ??????????, ?? ??? ?????????? ?? ???????."
+
 msgid "Invalid challenge from server"
 msgstr "???????? ?????? ? ???????"
 
@@ -4017,6 +4036,14 @@ msgstr "??????"
 msgid "Resource"
 msgstr "??????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "? ????"
+
 msgid "Middle Name"
 msgstr "????????"
 
@@ -4185,9 +4212,18 @@ msgstr "?????? ???????"
 msgid "Find Rooms"
 msgstr "?????? ???????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "?? ????????? ??????????, ?? ??? ?????????? ?? ???????."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????????:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "???????????? ?? ???????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "?????????"
+
 msgid "Ping timeout"
 msgstr "????? ???????? ??? ???????? ???????"
 
@@ -4207,7 +4243,7 @@ msgstr "???????? XMPP ID. ???
 msgstr "???????? XMPP ID. ?????? ???? ????? ?????."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?? ??????? ??????????? ? ????????."
 
 #, c-format
@@ -4234,9 +4270,6 @@ msgstr "?? ??????? ??????
 msgid "Unregistration Failed"
 msgstr "?? ??????? ????????? ?????? ???????????"
 
-msgid "Already Registered"
-msgstr "??? ????????????????"
-
 msgid "State"
 msgstr "???????"
 
@@ -4249,6 +4282,9 @@ msgstr "????"
 msgid "Date"
 msgstr "????"
 
+msgid "Already Registered"
+msgstr "??? ????????????????"
+
 msgid "Unregister"
 msgstr "???????? ???????????"
 
@@ -4277,6 +4313,10 @@ msgstr "???????? ???????? msgid "Change Registration"
 msgstr "???????? ???????????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?? ??????? ??????????? ? ????????."
+
 msgid "Error unregistering account"
 msgstr "?????? ?????? ??????????? ??????? ??????"
 
@@ -4640,16 +4680,18 @@ msgstr "ban &lt;????????????
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;????????????&gt; [???????]:  ??????? ???????????? ?? ???????."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "??????? &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ?????????? "
 "???????????????? ???????? ? ???????."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "???? &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ?????????? "
 "???????????????? ? ???????."
@@ -4715,6 +4757,9 @@ msgstr "?????? ???????? ?
 msgid "File transfer proxies"
 msgstr "?????? ???????? ??????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5118,6 +5163,10 @@ msgstr "?? IM-????????"
 msgid "Non-IM Contacts"
 msgstr "?? IM-????????"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ?????? ??? ??????????? ? ???-??????, ??????? ??? ?? ??????????????."
+
 msgid "Nudge"
 msgstr "???????????"
 
@@ -5468,66 +5517,29 @@ msgstr "?????????????? Win
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "?????????????? Windows Live ID: ???????? ?????"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s ?? ???????? ?????????? ???????."
-
-msgid "Unknown error."
-msgstr "??????????? ??????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?? %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ?????? ?????????? ???!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "??????????? ?????? (%d)"
 
 msgid "Unable to add user"
 msgstr "?? ??????? ???????? ????????????"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "??????????? ?????? (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "????????? ???????????? ??????????? ? ????? ???????? ?????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "?? ??????? ???????? ???????????? ?? %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "?? ??????? ????????????? ???????????? ?? %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "?? ??????? ????????? ???????????? ?? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ?? ????? ???? ????????, ??? ??? ?????? ???????????? ?????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?? ???????? ?????????? ?????????? ??????? ???????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "?????? ???????? ??????????."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "????????? ????????? ?? ???????????, ??? ??? ??? ??????? ???????."
 
-msgid "Unable to rename group"
-msgstr "?? ??????? ????????????? ??????"
-
-msgid "Unable to delete group"
-msgstr "?? ??????? ??????? ??????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5625,6 +5637,9 @@ msgstr ""
 msgstr ""
 "??? ?????? ???????????? MSN ???????? ??????????. ????????? ??????? ?????."
 
+msgid "Unknown error."
+msgstr "??????????? ??????."
+
 msgid "Handshaking"
 msgstr "????????????"
 
@@ -5643,6 +5658,14 @@ msgstr "???????? ?????? ?
 msgid "Retrieving buddy list"
 msgstr "???????? ?????? ????????????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ?????? ??? ??????????? ? ???-??????, ??????? ??? ?? ??????????????."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ?????? ??? ??????????? ? ???-??????, ??????? ??? ?? ??????????????."
+
 msgid "Away From Computer"
 msgstr "?????? ?? ??????????"
 
@@ -5689,14 +5712,6 @@ msgstr ""
 msgstr ""
 "????????? ????? ???? ?? ??????????, ??? ??? ????????? ??????????? ??????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ??????? ??? ? ???? ?????? ????????????."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ?????? ??? ?? ?????? ?????? ????????????."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "??????? ???????? ?? ???????? ??????"
@@ -5728,6 +5743,51 @@ msgstr "?????? ????????? 
 msgstr "?????? ????????? MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ?? ???????? ?????????? ???????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "?? ??????? ???????? ???????????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "?? ??????? ????????????? ???????????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "?? ??????? ????????? ???????????? ?? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ?? ????? ???? ????????, ??? ??? ?????? ???????????? ?????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?? ???????? ?????????? ?????????? ??????? ???????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "?????? ???????? ??????????."
+
+msgid "Unable to rename group"
+msgstr "?? ??????? ????????????? ??????"
+
+msgid "Unable to delete group"
+msgstr "?? ??????? ??????? ??????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ??????? ??? ? ???? ?????? ????????????."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ?????? ??? ?? ?????? ?????? ????????????."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "??? ?????? ????????????: %s"
 
@@ -5757,6 +5817,8 @@ msgstr "???????? ???????? msgstr "???????? ?????????? ? ????????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "????? ????????? ?????"
 
@@ -5808,17 +5870,19 @@ msgstr "?????? ?????????,
 msgid "Protocol error, code %d: %s"
 msgstr "?????? ?????????, ??? %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s ??? ?????? - %d ????????, ??????, ??? ????????? ???????????? ????? %d ??? "
 "MySpaceIM. ??????????, ????????? ??? ?????? ?? http://profileedit.myspace."
 "com/index.cfm?fuseaction=accountSettings.changePassword ? ?????????? ?????."
 
+msgid "Incorrect username or password"
+msgstr "???????????? ??? ???????????? ??? ??????"
+
 msgid "MySpaceIM Error"
 msgstr "?????? MySpaceIM"
 
@@ -6140,9 +6204,6 @@ msgstr "??????? ????? ?? ? msgid "Master archive is misconfigured"
 msgstr "??????? ????? ?? ????????"
 
-msgid "Incorrect username or password"
-msgstr "???????????? ??? ???????????? ??? ??????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "?? ??????? ?????? ???? ?????????? ????? ????????????"
 
@@ -6363,6 +6424,28 @@ msgstr "???? ???????"
 msgid "Server port"
 msgstr "???? ???????"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "??????? ?????????????? HTTP-?????? ?? ???????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?? ??????????? ? ????????????? ??????? ?????. ????????? 10 ????? ? "
+"??????????? ?????. ???? ?? ?????????? ???????, ??? ???????? ????? ??? ??????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?????? ??????? ??????? ?????"
+
+msgid "Incorrect password."
+msgstr "???????????? ??????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "?? ??????? ?????????????? ? ????"
 
@@ -6664,14 +6747,34 @@ msgstr ""
 "?????? ???????????? ?????? ???? ?????????? ????? ??.????? ??? ?????????? ? "
 "????? ? ????????? ?????? ?????, ????? ? ???????, ??? ????????? ?????? ?????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"?? ?????? ???? ??????????? ?????????.  ???? ??? ????????, ????????? %s ?? "
+"???? ??????????."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "?? ??????? ???????? ?????????? ??? ????? AIM."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"?????????? ? ???? ?????? ????? ???? ?????????. ???????? ?????????? ?? %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "?? ??????? ???????? ?????????? ??? ?????."
+
+msgid "Could Not Connect"
+msgstr "?? ??????? ?????????? ??????????"
+
+msgid "Received authorization"
+msgstr "???????? ???????????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "???????? ??? ????????????."
 
-msgid "Incorrect password."
-msgstr "???????????? ??????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "???? ??????? ?????? ?????? ?????????????."
@@ -6680,25 +6783,19 @@ msgstr "?????? AOL Instant Messeng
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????? AOL Instant Messenger ???????? ??????????."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "?????? ???????, ??????? ?? ???????????, ??????? ?????. ???????? ?? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "?? ??????????? ? ????????????? ??????? ?????. ????????? 10 ????? ? "
 "??????????? ?????. ???? ?? ?????????? ???????, ??? ???????? ????? ??? ??????."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "?????? ???????, ??????? ?? ???????????, ??????? ?????. ???????? ?? %s"
-
-msgid "Could Not Connect"
-msgstr "?? ??????? ?????????? ??????????"
-
-msgid "Received authorization"
-msgstr "???????? ???????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "????????? ???? SecurID ????????."
 
@@ -6714,23 +6811,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"?? ?????? ???? ??????????? ?????????.  ???? ??? ????????, ????????? %s ?? "
-"???? ??????????."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "?? ??????? ???????? ?????????? ??? ????? AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"?????????? ? ???? ?????? ????? ???? ?????????. ???????? ?????????? ?? %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "?? ??????? ???????? ?????????? ??? ?????."
-
 msgid "Password sent"
 msgstr "?????? ?????????"
 
@@ -7269,6 +7349,7 @@ msgstr "?????????? ?????? msgid "Set User Info (web)..."
 msgstr "?????????? ???????????????? ?????????? (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "???????? ?????? (web)"
 
@@ -7298,6 +7379,10 @@ msgstr "?????? ?????????? msgid "Search for Buddy by Information"
 msgstr "?????? ??????????? ?? ??????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "???????????? ?? ? ????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9651,10 +9736,6 @@ msgstr "????? ??????????? msgid "Auth Domain"
 msgstr "????? ???????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ?????? ??? ??????????? ? ???-??????, ??????? ??? ?? ??????????????."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9679,6 +9760,42 @@ msgstr "? ?????????? ????
 msgid "Add buddy rejected"
 msgstr "? ?????????? ??????????? ????????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "??? ?????????? ? ???????? ???????? ???????????? ??????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "???????????? ??????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"??????????? ?????? ????? %d. ???? ? web-????? Yahoo! ????? ????????? ???."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "???????????? ?? ??????????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"??????????? ?????? ????? %d. ???? ? web-????? Yahoo! ????? ????????? ???."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "???????????? ??? ???????????? ??? ??????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9791,8 +9908,8 @@ msgstr "?????? ?????????? msgid "Start Doodling"
 msgstr "?????? ?????????????"
 
-msgid "Activate which ID?"
-msgstr "????? ID ?????????????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "? ???? ?????????????? ? ?????"
@@ -10595,8 +10712,9 @@ msgstr "???????? ?????? ?
 msgid "Please update the necessary fields."
 msgstr "???????? ?????? ????."
 
-msgid "Room _List"
-msgstr "_?????? ??????"
+#, fuzzy
+msgid "A_ccount"
+msgstr "??????? ??????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10605,8 +10723,8 @@ msgstr ""
 "??????? ??????????????? ?????????? ? ????, ? ???????? ?? ?????? ?? "
 "??????????????.\n"
 
-msgid "_Account:"
-msgstr "?_?????? ??????:"
+msgid "Room _List"
+msgstr "_?????? ??????"
 
 msgid "_Block"
 msgstr "_???????????"
@@ -11049,6 +11167,112 @@ msgstr "/???????????/????
 msgid "/Buddies/Sort Buddies"
 msgstr "/???????????/??????????? ????????????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "???? ????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "??? ?????? ???? ????????? ? ?????? ????????????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "????????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???? ????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "?_?????????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??????? ???? ????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_????????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??????? ???? ????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "? ????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?? ? ????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "????? ??????????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "????????? ??????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "???????? ???????????????? ?????????? ??? %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-???????"
@@ -11554,6 +11778,10 @@ msgstr "??????????"
 msgid "Hungarian"
 msgstr "??????????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "?????????"
+
 msgid "Indonesian"
 msgstr "?????????????"
 
@@ -11652,6 +11880,9 @@ msgstr "????????"
 msgid "Swedish"
 msgstr "????????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "??????????"
 
@@ -12099,11 +12330,9 @@ msgstr "????????? ??????? msgid "Save Image"
 msgstr "????????? ???????????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_????????? ???????????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_???????? ???? ??????..."
 
@@ -12193,9 +12422,6 @@ msgstr "????? ??????"
 msgid "Font Face"
 msgstr "????? ??????"
 
-msgid "Background Color"
-msgstr "???? ????"
-
 msgid "Foreground Color"
 msgstr "???? ??????"
 
@@ -12526,6 +12752,9 @@ msgstr "?? ??? ???????"
 msgid "Pounce on Whom"
 msgstr "?? ??? ???????"
 
+msgid "_Account:"
+msgstr "?_?????? ??????:"
+
 msgid "_Buddy name:"
 msgstr "_??? ???????????:"
 
@@ -12636,9 +12865,18 @@ msgstr "??????????? ????? msgid "Unknown.... Please report this!"
 msgstr "??????????? ??????? ????????. ???????? ?? ????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "?? ??????? ??????????? ???? ?????????."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?? ??????? ??????????? ???? ?????????."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "?? ??????? ??????????? ???? ?????????."
+
 msgid "Install Theme"
 msgstr "?????????? ????"
 
@@ -13213,6 +13451,10 @@ msgstr "?????????? ?????? msgstr "?????????? ?????? ????????"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "??????? ???????????"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "????????, ????? ???????? ???? ?????? ??? ???? ??????? ??????."
 
@@ -13442,6 +13684,78 @@ msgstr "?????????? ?????? msgid "Displays statistical information about your buddies' availability"
 msgstr "?????????? ?????????????? ?????????? ? ??????????? ????? ?????????"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "????? ???????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "????? ?? ?????? ???????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "???????? ?????? ??????????? ??? ??????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "??????? ??????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "????????? ?????? ????????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "???????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "??????? ???????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ?????"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "?????? PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "????????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?????????? ? ?????? ???????????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_???????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "???????????? ?? ??????????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "?????? ?? ???????????? ??????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?????????? ? ?????? ???????????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "???? ?????? ??????? ??? ??????? XMPP ???????? ??? ????????."
+
 msgid "Buddy is idle"
 msgstr "?????????? ????????????"
 
@@ -13954,12 +14268,6 @@ msgstr ""
 "- ?????????? ????????? ????????????? ?? ?????? ?????? ????? ????? ?? "
 "???????????"
 
-msgid "Cursor Color"
-msgstr "???? ???????"
-
-msgid "Secondary Cursor Color"
-msgstr "????????? ???? ???????"
-
 msgid "Hyperlink Color"
 msgstr "???? ???????????"
 
@@ -13971,6 +14279,10 @@ msgstr "???? ????? ??????
 msgid "Highlighted Message Name Color"
 msgstr "???? ????? ????????????? ?????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "???? ?????? ???????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "?????????????? ?????????? GtkTreeView"
 
@@ -14000,35 +14312,24 @@ msgstr "???? ?????? ?????
 msgid "GTK+ Text Shortcut Theme"
 msgstr "???? ?????? ?????? GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "????? ??????????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "???????? ????? ???????????"
 
-msgid "Widget Sizes"
-msgstr "?????? ????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "?????????? ????? GTK+ ??? Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "???????"
+
 msgid "Fonts"
 msgstr "??????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "??????????? ????? Gtkrc"
 
@@ -14174,12 +14475,119 @@ msgstr ""
 "???????? ????? ? ????????? ?????????? ? ???????????? ? ?????????, "
 "????????????? ?????????????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "?? ? ????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "?? ? ????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "?????????????? ? ????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "????????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "??????????? ????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "?????? "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??????????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??????? ??????????????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "?????? ??? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "???????? ?????? ????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "???????? ??????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "?????????? ????? GTK+ ??? Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "?????????? ??????????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????? ????????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????? ????????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "?????????? ????? GTK+ ??? Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "?????????? ????? GTK+ ??? Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "????? ????????????"
 
@@ -14384,6 +14792,21 @@ msgstr "???? ?????? ?????
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "???? ?????? ??????? ??? ??????? XMPP ???????? ??? ????????."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "????? ID ?????????????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "???? ???????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "????????? ???? ???????"
+
+#~ msgid "Interface colors"
+#~ msgstr "????? ??????????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "?????? ????????"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "??????????????? ?????????"
@@ -14770,18 +15193,12 @@ msgstr "???? ?????? ?????
 #~ msgid "Reason: %s"
 #~ msgstr "???????: %s"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "??? ?????? ???? ????????? ? ?????? ????????????"
-
 #~ msgid "Code [0x%02X]: %s"
 #~ msgstr "??? [0x%02X]: %s"
 
 #~ msgid "Enter your reason:"
 #~ msgstr "??????? ???????:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "?????? ??????? ??????? ?????"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP-?????"
 
============================================================
--- po/si.po	c8ca47af7be3dfb509dd8d75c6bf5f13646a8aa4
+++ po/si.po	3479e3952bc63927442c74aba3bdc333907ec230
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-05-17 11:08+0530\n"
 "Last-Translator: Yajith Ajantha Dayarathna <yajith at gmail.com>\n"
 "Language-Team: Sinhala <sinhala at linux.lk>\n"
@@ -1704,6 +1704,8 @@ msgstr ""
 msgid "+++ %s signed off"
 msgstr ""
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "??????? ??????"
 
@@ -2068,6 +2070,9 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+msgid "Error creating conference."
+msgstr ""
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3000,6 +3005,11 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "???????? ?????????? ?????"
+
 msgid "Chat error"
 msgstr ""
 
@@ -3048,6 +3058,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+#, fuzzy
+msgid "GG server"
+msgstr "SILC ???????? ??? ??????? ?????? ????"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -3090,7 +3104,7 @@ msgstr "???????: (_P)"
 msgid "_Password:"
 msgstr "???????: (_P)"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -3518,6 +3532,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3777,6 +3794,14 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "??? ???"
+
 msgid "Middle Name"
 msgstr ""
 
@@ -3942,9 +3967,17 @@ msgstr ""
 msgid "Find Rooms"
 msgstr ""
 
-msgid "You require encryption, but it is not available on this server."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??????:"
+
+msgid "No users found"
 msgstr ""
 
+#, fuzzy
+msgid "Roles:"
+msgstr "???????"
+
 msgid "Ping timeout"
 msgstr ""
 
@@ -3963,7 +3996,7 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr ""
 
 #, c-format
@@ -3990,9 +4023,6 @@ msgstr ""
 msgid "Unregistration Failed"
 msgstr ""
 
-msgid "Already Registered"
-msgstr ""
-
 msgid "State"
 msgstr "?????? ?????"
 
@@ -4005,6 +4035,9 @@ msgstr "????"
 msgid "Date"
 msgstr "????"
 
+msgid "Already Registered"
+msgstr ""
+
 msgid "Unregister"
 msgstr ""
 
@@ -4032,6 +4065,9 @@ msgstr ""
 msgid "Change Registration"
 msgstr ""
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4394,13 +4430,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4460,6 +4496,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4849,6 +4888,10 @@ msgstr "??????? ????msgid "Non-IM Contacts"
 msgstr "??????? ?????????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5191,63 +5234,26 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr ""
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "??????? ??????"
 
 msgid "Unable to add user"
 msgstr ""
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
+msgid "Unknown error (%d)"
 msgstr ""
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
+msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5318,6 +5324,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5336,6 +5345,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5372,14 +5389,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "????? ???? ?????? ?????"
@@ -5410,6 +5419,51 @@ msgstr ""
 msgstr ""
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5439,6 +5493,8 @@ msgstr "SILC ???????? ? msgstr "SILC ???????? ??? ??????? ?????? ????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr ""
 
@@ -5485,12 +5541,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "??????? ?????????."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -5804,10 +5863,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "??????? ?????????."
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6007,6 +6062,25 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s ????? ?????? ??????."
+
+msgid "Incorrect password."
+msgstr "??????? ?????????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6292,14 +6366,31 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr ""
 
-msgid "Incorrect password."
-msgstr "??????? ?????????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6308,23 +6399,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr ""
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6340,20 +6424,6 @@ msgstr "??? (_O)"
 msgid "_OK"
 msgstr "??? (_O)"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -6797,6 +6867,7 @@ msgstr "??????? ????msgid "Set User Info (web)..."
 msgstr "??????? ??????? ??? ????"
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "??????? ????? ?????"
@@ -6827,6 +6898,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9030,10 +9104,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9057,6 +9127,37 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "??????? ?????????."
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "??????? ??"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??????? ?????????."
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9157,7 +9258,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -9898,16 +9999,17 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "???? ?????????"
+msgid "A_ccount"
+msgstr "?????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
-msgid "_Account:"
-msgstr "????? (_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "???? ?????????"
 
 msgid "_Block"
 msgstr ""
@@ -10333,6 +10435,108 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+msgid "Background Color"
+msgstr "??????? ??????"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "???? ???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "??????? ??????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+msgid "Expanded Text"
+msgstr ""
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??????? ??????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+msgid "Collapsed Text"
+msgstr ""
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??????? ??????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "????? ?????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?????? ???????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "????? ????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -10827,6 +11031,10 @@ msgstr "??????????"
 msgid "Hungarian"
 msgstr "??????????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "??????"
+
 msgid "Indonesian"
 msgstr "?????????????"
 
@@ -10925,6 +11133,9 @@ msgstr "??????"
 msgid "Swedish"
 msgstr "??????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "????"
 
@@ -11340,11 +11551,9 @@ msgstr "????????? ??msgid "Save Image"
 msgstr "????????? ????????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr ""
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -11429,9 +11638,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-msgid "Background Color"
-msgstr "??????? ??????"
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -11716,6 +11922,9 @@ msgstr ""
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "????? (_A):"
+
 msgid "_Buddy name:"
 msgstr ""
 
@@ -11826,9 +12035,15 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+msgid "Theme failed to load."
+msgstr ""
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12384,6 +12599,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "???????? ??????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -12595,6 +12814,69 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+msgid "Server name request"
+msgstr ""
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??????? ?????? ?????"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+msgid "Find Services"
+msgstr ""
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "?????? ?????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "????? ??"
+
+#, fuzzy
+msgid "Directory"
+msgstr "????"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "???????"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "??????"
+
+msgid "Server does not exist"
+msgstr ""
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "??? ?????? XMPP ???? ????????? ?????????????? ?????? ??????????? ??."
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13077,12 +13359,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13092,6 +13368,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "?? ?????? ???????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13121,35 +13401,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "?? ?????? ???????"
+
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "?????"
 
 msgid "Fonts"
 msgstr "?????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13284,12 +13552,113 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "????? ?????? ??"
+
+msgid "Just logged out"
+msgstr ""
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???????? ??? ????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???? ?????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????? ?????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "?????? ??? ????? ??? ??????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "???????"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "??????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "?????"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "??????? ????? ?????"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "???????? ????? ????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????? ?????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????? ?????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
============================================================
--- po/sk.po	bbc433bf73efec9e29a470c2e2a12223afd53fc1
+++ po/sk.po	150195151bc88b1f0572c4939e2b91ca27244911
@@ -11,7 +11,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-22 21:22+0100\n"
 "Last-Translator: loptosko <loptosko at gmail.com>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -1774,6 +1774,8 @@ msgstr "+++ pou??vate? %s sa odhl?si
 msgid "+++ %s signed off"
 msgstr "+++ pou??vate? %s sa odhl?sil"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nezn?ma chyba"
 
@@ -2167,6 +2169,10 @@ msgstr "(%s) %s <AUTOMATICK? ODPOVE?>:
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATICK? ODPOVE?>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Chyba pri vytv?ran? spojenia"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Pou??vate %s, ale tento modul vy?aduje %s."
@@ -3134,6 +3140,11 @@ msgstr "Me_no na chate:"
 msgid "Chat _name:"
 msgstr "Me_no na chate:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Nepodarilo sa pripoji? na server."
+
 msgid "Chat error"
 msgstr "Chyba chatu"
 
@@ -3182,6 +3193,10 @@ msgstr "Pou??vate? Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Pou??vate? Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Z?skava sa server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nezn?my pr?kaz: %s"
@@ -3224,7 +3239,8 @@ msgstr "_Heslo:"
 msgid "_Password:"
 msgstr "_Heslo:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Prez?vky na IRC nesm? obsahova? medzery"
 
 #. 1. connect to server
@@ -3701,6 +3717,9 @@ msgstr "Server nepou??va ?iadny z pod
 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"
 
@@ -3971,6 +3990,14 @@ msgstr "Zdroj"
 msgid "Resource"
 msgstr "Zdroj"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Prihl?sen?"
+
 msgid "Middle Name"
 msgstr "Prostredn? meno"
 
@@ -4138,9 +4165,18 @@ msgstr "H?ada? miestnosti"
 msgid "Find Rooms"
 msgstr "H?ada? miestnosti"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Po?adovali ste ?ifrovanie, ale na tomto serveri nie je dostupn?."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Prez?vka:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Neboli n?jden? ?iadni zodpovedaj?ci pou??vatelia"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Postavenie"
+
 msgid "Ping timeout"
 msgstr "Interval ping"
 
@@ -4160,7 +4196,7 @@ msgstr "XMPP ID je chybn?. Mus?te zada
 msgstr "XMPP ID je chybn?. Mus?te zada? dom?nu."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Nepodarilo sa spoji? so serverom."
 
 #, c-format
@@ -4187,9 +4223,6 @@ msgstr "Zru?enie registr?cie zlyhalo"
 msgid "Unregistration Failed"
 msgstr "Zru?enie registr?cie zlyhalo"
 
-msgid "Already Registered"
-msgstr "U? zaregistrovan?"
-
 msgid "State"
 msgstr "?t?t"
 
@@ -4202,6 +4235,9 @@ msgstr "D?tum"
 msgid "Date"
 msgstr "D?tum"
 
+msgid "Already Registered"
+msgstr "U? zaregistrovan?"
+
 msgid "Unregister"
 msgstr "Zru?i? registr?ciu"
 
@@ -4232,6 +4268,10 @@ msgstr "Zmeni? registr?ciu"
 msgid "Change Registration"
 msgstr "Zmeni? registr?ciu"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Nepodarilo sa spoji? so serverom."
+
 msgid "Error unregistering account"
 msgstr "Chyba pri ru?en? ??tu"
 
@@ -4596,16 +4636,18 @@ msgstr "ban &lt;pou??vate?&gt; [d?vo
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;pou??vate?&gt; [d?vod]:  Vyk?za? pou??vate?a z miestnosti."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;pou??vate?&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Nastav? pou??vate?ov? pri?lenenie v miestnosti."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;pou??vate?&gt; &lt;moderator|participant|visitor|none&gt;: Nastav? "
 "postavenie pou??vate?a v miestnosti."
@@ -4669,6 +4711,9 @@ msgstr "Proxy prenosu s?borov"
 msgid "File transfer proxies"
 msgstr "Proxy prenosu s?borov"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5067,6 +5112,10 @@ msgstr "Kontakty bez rozhovoru"
 msgid "Non-IM Contacts"
 msgstr "Kontakty bez rozhovoru"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s v?m poslal pozv?nku na webkameru, ktor? zatia? nie je podporovan?."
+
 msgid "Nudge"
 msgstr "?tuchanec"
 
@@ -5410,63 +5459,26 @@ msgstr "Autentifik?cia Windows Live ID:
 msgstr "Autentifik?cia Windows Live ID:Chybn? odpove?"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nie je spr?vna skupina."
-
-msgid "Unknown error."
-msgstr "Nezn?ma chyba."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s v?m pr?ve poslal ,,??uchanec"!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Nezn?ma chyba (%d)"
 
 msgid "Unable to add user"
 msgstr "Nebolo mo?n? prida? pou??vate?a"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Nasleduj?ci pou??vatelia ch?baj? vo va?om adres?ri"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Nebolo mo?n? prida? pou??vate?a %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Nezn?ma chyba (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Nebolo mo?n? blokova? pou??vate?a %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "Nasleduj?ci pou??vatelia ch?baj? vo va?om adres?ri"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Nebolo mo?n? povoli? pou??vate?a %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s sa nepridal, preto?e v?? zoznam priate?ov je pln?."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nie je platn? ??et pasu."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Slu?ba je do?asne nedostupn?."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiln? spr?va nebola odoslan?, preto?e bola pr?li? dlh?."
 
-msgid "Unable to rename group"
-msgstr "Nepodarilo sa premenova? skupinu"
-
-msgid "Unable to delete group"
-msgstr "Nepodarilo sa odstr?ni? skupinu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5557,6 +5569,9 @@ msgstr ""
 msgstr ""
 "V?? zoznam priate?ov MSN je do?asne nedostupn?. Sk?ste to, pros?m, nesk?r."
 
+msgid "Unknown error."
+msgstr "Nezn?ma chyba."
+
 msgid "Handshaking"
 msgstr "Prevzatie"
 
@@ -5575,6 +5590,14 @@ msgstr "Prij?ma sa zoznam priate?ov"
 msgid "Retrieving buddy list"
 msgstr "Prij?ma sa zoznam priate?ov"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s v?m poslal pozv?nku na webkameru, ktor? zatia? nie je podporovan?."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s v?m poslal pozv?nku na webkameru, ktor? zatia? nie je podporovan?."
+
 msgid "Away From Computer"
 msgstr "Pre? od po??ta?a"
 
@@ -5613,14 +5636,6 @@ msgstr "Spr?vu sa nepodarilo odosla?, 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Spr?vu sa nepodarilo odosla?, preto?e sa vyskytla nezn?ma chyba:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Pou??vate? %s si v?s pridal do svojho zoznamu priate?ov."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Pou??vate? %s v?s odstr?nil zo svojho zoznamu priate?ov."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Odstr?ni? priate?a z adres?ra?"
 
@@ -5650,6 +5665,51 @@ msgstr "Modul protokolu HTTP"
 msgstr "Modul protokolu HTTP"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nie je spr?vna skupina."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Nebolo mo?n? prida? pou??vate?a %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Nebolo mo?n? blokova? pou??vate?a %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Nebolo mo?n? povoli? pou??vate?a %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s sa nepridal, preto?e v?? zoznam priate?ov je pln?."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nie je platn? ??et pasu."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Slu?ba je do?asne nedostupn?."
+
+msgid "Unable to rename group"
+msgstr "Nepodarilo sa premenova? skupinu"
+
+msgid "Unable to delete group"
+msgstr "Nepodarilo sa odstr?ni? skupinu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Pou??vate? %s si v?s pridal do svojho zoznamu priate?ov."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Pou??vate? %s v?s odstr?nil zo svojho zoznamu priate?ov."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Neexistuj?ci pou??vate?: %s"
 
@@ -5678,6 +5738,8 @@ msgstr "Pripojenie zo serverom je strate
 msgstr "Pripojenie zo serverom je straten?"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nov? po?tov? spr?vy"
 
@@ -5729,17 +5791,19 @@ msgstr "Chyba protokolu, k?d %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Chyba protokolu, k?d %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Va?e heslo m? %d znakov, viac ne? je maxim?lna d??ka %d na MySpaceIM. "
 "Skr??te, pros?m, va?e heslo na adrese http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword a sk?ste znovu."
 
+msgid "Incorrect username or password"
+msgstr "Nespr?vne pou??vate?sk? meno alebo heslo"
+
 msgid "MySpaceIM Error"
 msgstr "Chyba MySpaceIM"
 
@@ -6057,9 +6121,6 @@ msgstr "Hlavn? arch?v je nespr?vne na
 msgid "Master archive is misconfigured"
 msgstr "Hlavn? arch?v je nespr?vne nastaven?"
 
-msgid "Incorrect username or password"
-msgstr "Nespr?vne pou??vate?sk? meno alebo heslo"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nepodarilo sa zisti? hostite?a dan?ho pou??vate?sk?ho mena"
 
@@ -6276,6 +6337,28 @@ msgstr "Port servera"
 msgid "Server port"
 msgstr "Port servera"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Zo servera bola prijat? neo?ak?van? HTTP odpove?."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"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."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Chyba pri po?adovan? prihlasovacieho tokenu"
+
+msgid "Incorrect password."
+msgstr "Nespr?vne heslo."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Nepodarilo sa pripoji? do miestnosti"
 
@@ -6577,14 +6660,32 @@ msgstr ""
 "mailov? adresa, alebo mus? by? prv? znak p?smeno a mus? obsahova? len "
 "p?smen?, ??slice a medzery, alebo len ??slice."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Onedlho m??e d?js? k odpojeniu. Ak sa tak stane, h?adajte aktualiz?cie na %s."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nebolo mo?n? z?ska? platn? AIM prihlasovac? hash."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Zakr?tko m??ete by? odpojen?. Skontrolujte aktualiz?cie na %s."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nebolo mo?n? z?ska? platn? prihlasovac? hash."
+
+msgid "Could Not Connect"
+msgstr "Nepodarilo sa pripoji?"
+
+msgid "Received authorization"
+msgstr "Prijat? autoriz?cia"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Nespr?vne pou??vate?sk? meno."
 
-msgid "Incorrect password."
-msgstr "Nespr?vne heslo."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "V?? ??et je moment?lne pozastaven?"
@@ -6593,27 +6694,21 @@ msgstr "Slu?ba AOL je do?asne nedostup
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Slu?ba AOL je do?asne nedostupn?."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"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."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Verzia klienta, ktor?ho pou??vate, je pr?li? star?. Pros?m, aktualizujte ho "
 "na %s"
 
-msgid "Could Not Connect"
-msgstr "Nepodarilo sa pripoji?"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 desa? min?t a sk?ste "
+"znova. Ak budete i na?alej sk??a?, budete musie? ?aka? este dlh?ie."
 
-msgid "Received authorization"
-msgstr "Prijat? autoriz?cia"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Zadan? k??? SecurID je neplatn?."
 
@@ -6629,21 +6724,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Onedlho m??e d?js? k odpojeniu. Ak sa tak stane, h?adajte aktualiz?cie na %s."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nebolo mo?n? z?ska? platn? AIM prihlasovac? hash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Zakr?tko m??ete by? odpojen?. Skontrolujte aktualiz?cie na %s."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nebolo mo?n? z?ska? platn? prihlasovac? hash."
-
 msgid "Password sent"
 msgstr "Heslo odoslan?"
 
@@ -7168,6 +7248,7 @@ msgstr "Nastavi? podrobnosti pou??vat
 msgid "Set User Info (web)..."
 msgstr "Nastavi? podrobnosti pou??vate?a (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Zmeni? heslo (web)"
 
@@ -7197,6 +7278,10 @@ msgstr "H?ada? priate?a pod?a podrob
 msgid "Search for Buddy by Information"
 msgstr "H?ada? priate?a pod?a podrobnost?"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Pou??vate? nie je prihl?sen?"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9459,10 +9544,6 @@ msgstr "Autentifika?n? dom?na"
 msgid "Auth Domain"
 msgstr "Autentifika?n? dom?na"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s v?m poslal pozv?nku na webkameru, ktor? zatia? nie je podporovan?."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9490,6 +9571,42 @@ msgstr "Pridanie kamar?ta bolo odmietnu
 msgid "Add buddy rejected"
 msgstr "Pridanie kamar?ta bolo odmietnut?"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Prijat? neplatn? d?ta po?as spojenia so serverom."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Nespr?vne heslo"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Nezn?me ??slo chyby %d. Prihl?senie sa na str?nke Yahoo! to m??e napravi?."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Pou??vate? neexistuje"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Nezn?me ??slo chyby %d. Prihl?senie sa na str?nke Yahoo! to m??e napravi?."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Nespr?vne pou??vate?sk? meno alebo heslo"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9603,8 +9720,8 @@ msgstr "Za?a? ?m?ra?"
 msgid "Start Doodling"
 msgstr "Za?a? ?m?ra?"
 
-msgid "Activate which ID?"
-msgstr "Aktivova? s ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "S k?m sa spoji? v chate?"
@@ -10405,8 +10522,9 @@ msgstr "Pros?m, aktualizujte potrebn? 
 msgid "Please update the necessary fields."
 msgstr "Pros?m, aktualizujte potrebn? pol??ka."
 
-msgid "Room _List"
-msgstr "_Zoznam miestnost?"
+#, fuzzy
+msgid "A_ccount"
+msgstr "??e_t:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10415,8 +10533,8 @@ msgstr ""
 "Pros?m, zadajte zodpovedaj?ce inform?cie o chate, ku ktor?mu sa chcete "
 "pripoji?.\n"
 
-msgid "_Account:"
-msgstr "_??et:"
+msgid "Room _List"
+msgstr "_Zoznam miestnost?"
 
 msgid "_Block"
 msgstr "_Blokova?"
@@ -10854,6 +10972,112 @@ msgstr "/Priatelia/Zoradi? priate?ov"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Priatelia/Zoradi? priate?ov"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Farba pozadia"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Skupina bola pridan? do v??ho zoznamu priate?ov"
+
+#, fuzzy
+msgid "Layout"
+msgstr "lao?tina"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Farba pozadia"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Rozbali?"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Vybra? farbu pozadia"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Zbali?"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Vybra? farbu pozadia"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Skratka"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Pripojen?"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Nepr?tomn?"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Odpojen?"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Popis n?lady"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Spr?va odoslan?"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Zmeni? podrobnosti o pou??vate?ovi %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL servery"
@@ -11356,6 +11580,10 @@ msgstr "ma?ar?ina"
 msgid "Hungarian"
 msgstr "ma?ar?ina"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "rumun?ina"
+
 msgid "Indonesian"
 msgstr "indon?z?tina"
 
@@ -11453,6 +11681,9 @@ msgstr "?v?d?ina"
 msgid "Swedish"
 msgstr "?v?d?ina"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "tamil?ina"
 
@@ -11884,11 +12115,9 @@ msgstr "Ulo?i? obr?zok"
 msgid "Save Image"
 msgstr "Ulo?i? obr?zok"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Ulo?i? obr?zok..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Prida? vlastn?ho smajl?ka..."
 
@@ -11976,9 +12205,6 @@ msgstr "Rez p?sma"
 msgid "Font Face"
 msgstr "Rez p?sma"
 
-msgid "Background Color"
-msgstr "Farba pozadia"
-
 msgid "Foreground Color"
 msgstr "Farba popredia"
 
@@ -12304,6 +12530,9 @@ msgstr "Koho sledova?"
 msgid "Pounce on Whom"
 msgstr "Koho sledova?"
 
+msgid "_Account:"
+msgstr "_??et:"
+
 msgid "_Buddy name:"
 msgstr "_Meno priate?a:"
 
@@ -12414,9 +12643,18 @@ msgstr "Nezn?ma udalos? sledovania. Oz
 msgid "Unknown.... Please report this!"
 msgstr "Nezn?ma udalos? sledovania. Ozn?mte to, pros?m!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Nepodarilo sa rozbali? t?mu smajl?kov."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Nepodarilo sa rozbali? t?mu smajl?kov."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Nepodarilo sa rozbali? t?mu smajl?kov."
+
 msgid "Install Theme"
 msgstr "In?talova? t?mu"
 
@@ -12977,6 +13215,10 @@ msgstr "Spr?vca vlastn?ch smajl?kov"
 msgid "Custom Smiley Manager"
 msgstr "Spr?vca vlastn?ch smajl?kov"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Vybra? priate?a"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Kliknut?m zmen?te va?u ikonu pre tento ??et."
 
@@ -13199,6 +13441,78 @@ msgstr "Zobrazuje ?tatistick? inform?
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Zobrazuje ?tatistick? inform?cie o pr?tomnosti va?ich priate?ov"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adresa servera"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Zadajte konferen?n? server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Vyberte konferen?n? server, ktor? kontaktova?"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online slu?by"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Odosla? zoznam priate?ov"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Stane sa nepr?tomn?"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Prie?inok z?znamov"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "V?ber zvuku"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub slu?ba"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Popis"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Prieskum slu?ieb"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Prehliada?:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Pou??vate? neexistuje"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server nepodporuje blokovanie"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Prieskum slu?ieb"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Tento modul je vhodn? pre ladenie XMPP serverov alebo klientov."
+
 msgid "Buddy is idle"
 msgstr "Priate? je ne?inn?"
 
@@ -13702,12 +14016,6 @@ msgstr ""
 "- Prevracia ka?d? prich?dzaj?ci text\n"
 "- Posiela spr?vu ?u?om z v??ho zoznamu, akon?hle sa prihlasia"
 
-msgid "Cursor Color"
-msgstr "Farba kurzoru"
-
-msgid "Secondary Cursor Color"
-msgstr "Druhotn? farba kurzoru"
-
 msgid "Hyperlink Color"
 msgstr "Farba odkazu"
 
@@ -13717,6 +14025,10 @@ msgstr "Farba zv?raznenia mena v spr?v
 msgid "Highlighted Message Name Color"
 msgstr "Farba zv?raznenia mena v spr?ve"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Odstr?nenie upozornenia"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Vodorovn? medzera v GtkTreeView"
 
@@ -13746,35 +14058,24 @@ msgstr "Textov? t?ma odkazov GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Textov? t?ma odkazov GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Farby rozhrania"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Zapn?? upozornenie na p?sanie"
 
-msgid "Widget Sizes"
-msgstr "Ve?kos? ovl?dac?ch prvkov"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Ovl?d?nie t?my GTK+ programu Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Zavrie?"
+
 msgid "Fonts"
 msgstr "P?sma"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "N?stroje s?boru Gtkrc"
 
@@ -13917,12 +14218,119 @@ msgstr ""
 msgstr ""
 "Nahradzuje text v odosielan?ch spr?vach pod?a pou??vate?om ur?en?ch pravidiel"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Neprihl?sen?"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Neprihl?sen?"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Pripoji? sa k chatu"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorova?"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Hlasnej?ia"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autoriz?cia udelen?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Chyba "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Inform?cie"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Dial?g po?iadavku"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "?rove? upozornenia"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Stav pre %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Jazyk chatovacej miestnosti"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Zmeni? ikonu"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Ovl?d?nie t?my GTK+ programu Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktn? inform?cie"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Zoznam priate?ov"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Zoznam priate?ov"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Ovl?d?nie t?my GTK+ programu Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Ovl?d?nie t?my GTK+ programu Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Vybera? priate?ov"
 
@@ -14127,6 +14535,21 @@ 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 "Activate which ID?"
+#~ msgstr "Aktivova? s ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Farba kurzoru"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Druhotn? farba kurzoru"
+
+#~ msgid "Interface colors"
+#~ msgstr "Farby rozhrania"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Ve?kos? ovl?dac?ch prvkov"
+
 #~ msgid "Invite message"
 #~ msgstr "Spr?va pozv?nky"
 
@@ -14630,9 +15053,6 @@ msgstr "Tento modul je vhodn? pre laden
 #~ msgstr ""
 #~ "Va?a po?iadavka pre vstup do skupiny %d bola vyhoven? administr?torom %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Skupina bola pridan? do v??ho zoznamu priate?ov"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Uch?dzam sa o ?lenstvo"
 
@@ -14660,9 +15080,6 @@ msgstr "Tento modul je vhodn? pre laden
 #~ msgid "You have successfully modified Qun information"
 #~ msgstr "?spe?ne ste zmenili Qun inform?cie"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Chyba pri po?adovan? prihlasovacieho tokenu"
-
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Nepodarilo sa prihl?si?. Pozrite ladiaci z?znam."
 
@@ -14755,9 +15172,6 @@ msgstr "Tento modul je vhodn? pre laden
 #~ "zobrazova? v zozname priate?ov namiesto mena pou??vate?a v?dy, ke? to "
 #~ "bude mo?n?.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "??e_t:"
-
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Sledova?, len ak som nedostupn?"
 
============================================================
--- po/sl.po	705a47b24850fef9ebe443c541b8d30b66135e5b
+++ po/sl.po	265f3f95fbc5d54c9f2f1a86befc2200aebfa888
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 22:19-0700\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-05-02 16:54+0100\n"
 "Last-Translator: Martin Srebotnjak  <miles at filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles at filmsi.net>\n"
@@ -2185,6 +2185,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Napaka pri ustvarjanju povezave"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Uporabljate %s, a ta vti?nik zahteva %s."
@@ -3182,6 +3186,11 @@ msgstr "_Ime za klepet:"
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Ni se bilo mogo?e povezati na stre?nik."
+
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
@@ -3230,6 +3239,10 @@ msgstr "Uporabnik Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Pridobivanje stre?nika"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Neznan ukaz: %s"
@@ -3272,7 +3285,8 @@ msgstr "_Geslo:"
 msgid "_Password:"
 msgstr "_Geslo:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC vzdevki ne smejo vsebovati presledka"
 
 #. 1. connect to server
@@ -4217,7 +4231,8 @@ msgstr "Neveljaven ID za XMPP. Domena mo
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neveljaven ID za XMPP. Domena mora biti dolo?ena."
 
-msgid "Malformed BOSH Connect Server"
+#, fuzzy
+msgid "Malformed BOSH URL"
 msgstr "Nepravilno oblikovan povezovalni stre?nik BOSH"
 
 #, c-format
@@ -4244,9 +4259,6 @@ msgstr "Napaka pri odregistraciji"
 msgid "Unregistration Failed"
 msgstr "Napaka pri odregistraciji"
 
-msgid "Already Registered"
-msgstr "?e registriran"
-
 msgid "State"
 msgstr "Zvezna dr?ava"
 
@@ -4259,6 +4271,9 @@ msgstr "Datum"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "?e registriran"
+
 msgid "Unregister"
 msgstr "Odregistriraj se"
 
@@ -4287,6 +4302,9 @@ msgstr "Spremeni registracijo"
 msgid "Change Registration"
 msgstr "Spremeni registracijo"
 
+msgid "Malformed BOSH Connect Server"
+msgstr "Nepravilno oblikovan povezovalni stre?nik BOSH"
+
 msgid "Error unregistering account"
 msgstr "Napaka pri odregistraciji ra?una"
 
@@ -4726,6 +4744,9 @@ msgstr "Posredovalni stre?niki za preno
 msgid "File transfer proxies"
 msgstr "Posredovalni stre?niki za prenos datotek"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5122,6 +5143,10 @@ msgstr "Stiki, s katerimi ne klepetate"
 msgid "Non-IM Contacts"
 msgstr "Stiki, s katerimi ne klepetate"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s vam je poslal povabilo s spletno kamero, kar ?e ni podprto."
+
 msgid "Nudge"
 msgstr "Pome?ikni"
 
@@ -5488,32 +5513,6 @@ msgstr "Naslednji uporabniki manjkajo v 
 msgid "The following users are missing from your addressbook"
 msgstr "Naslednji uporabniki manjkajo v va?em adresarju"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Uporabnika ni mogo?e dodati na %s (%s)."
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ni mogo?e blokirati uporabnika %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Uporabniku ni mogo?e dovoliti na %s (%s)."
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ni mogo?e dodati, saj je va? seznam prijateljev poln."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ni veljaven ra?un potnega lista."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Storitev je trenutno nedosegljiva."
-
-msgid "Unknown error."
-msgstr "Neznana napaka."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilnega sporo?ila ni mogo?e poslati, ker je predolgo."
 
@@ -5613,6 +5612,9 @@ msgstr ""
 "Va? seznam prijateljev MSN je trenutno nedostopen. Prosimo po?akajte in "
 "poskusite znova."
 
+msgid "Unknown error."
+msgstr "Neznana napaka."
+
 msgid "Handshaking"
 msgstr "Rokovanje"
 
@@ -5631,6 +5633,14 @@ msgstr "Prejemanje seznama prijateljev"
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s vam je poslal povabilo s spletno kamero, kar ?e ni podprto."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s vam je poslal povabilo s spletno kamero, kar ?e ni podprto."
+
 msgid "Away From Computer"
 msgstr "Stran od ra?unalnika"
 
@@ -5707,6 +5717,29 @@ msgstr "%s na %s (%s)"
 msgid "%s on %s (%s)"
 msgstr "%s na %s (%s)"
 
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Uporabnika ni mogo?e dodati na %s (%s)."
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ni mogo?e blokirati uporabnika %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Uporabniku ni mogo?e dovoliti na %s (%s)."
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ni mogo?e dodati, saj je va? seznam prijateljev poln."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ni veljaven ra?un potnega lista."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Storitev je trenutno nedosegljiva."
+
 msgid "Unable to rename group"
 msgstr "Skupine ni mogo?e preimenovati"
 
@@ -5806,17 +5839,19 @@ msgstr "Napaka protokola, koda %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Napaka protokola, koda %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Va?e geslo ima %d znakov, ve? kot je dovoljenih %d znakov za MySpaceIM. "
 "Skraj?ajte svoje geslo na naslovu http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword in poskusite znova."
 
+msgid "Incorrect username or password"
+msgstr "Neveljavno uporabni?ko ime ali geslo"
+
 msgid "MySpaceIM Error"
 msgstr "Napaka MySpaceIM"
 
@@ -6133,9 +6168,6 @@ msgstr "Glavni arhiv je narobe nastavlje
 msgid "Master archive is misconfigured"
 msgstr "Glavni arhiv je narobe nastavljen"
 
-msgid "Incorrect username or password"
-msgstr "Neveljavno uporabni?ko ime ali geslo"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Gostitelja uporabni?kega imena, ki ste ga vnesli, ni mogo?e prepoznati"
 
@@ -6347,6 +6379,28 @@ msgstr "Vrata stre?nika"
 msgid "Server port"
 msgstr "Vrata stre?nika"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Prejet neveljaven odgovor HTTP stre?nika."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Povezava ste preve?krat vzpostavili in prekinili. Po?akajte deset minut in "
+"poskusite ponovno. ?e ne po?akate sedaj, boste ?akali ?e dalj."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Napaka pri zahtevanju prijavnega ?etona"
+
+msgid "Incorrect password."
+msgstr "Neveljavno geslo."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Pogovorni sobi se ni mogo?e pridru?iti"
 
@@ -6650,14 +6704,33 @@ msgstr ""
 "s ?rko in lahko vsebujejo le ?rke, ?tevilke in presledke ali pa so "
 "sestavljena zgolj iz ?tevil."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Morda bo povezava v kratkem prekinjena. V tem primeru preverite %s za "
+"posodobitve."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Veljavnega prijavnega izvle?ka za AIM ni mogo?e pridobiti."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
+
+msgid "Unable to get a valid login hash."
+msgstr "Veljavnega prijavnega izvle?ka ni mogo?e pridobiti."
+
+msgid "Could Not Connect"
+msgstr "Povezava ni uspela"
+
+msgid "Received authorization"
+msgstr "Ponovno zahtevaj pooblastitev"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Neveljavno uporabni?ko ime."
 
-msgid "Incorrect password."
-msgstr "Neveljavno geslo."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Va? ra?un je trenutno zamrznjen."
@@ -6666,27 +6739,21 @@ msgstr "Storitev AOL neposrednih sporo?
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporo?il je trenuno nedosegljiva."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"Povezava ste preve?krat vzpostavili in prekinili. Po?akajte deset minut in "
-"poskusite ponovno. ?e ne po?akate sedaj, boste ?akali ?e dalj."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Razli?ica odjemalca, ki ga uporabljate, je prestara. Prosim posodobite ga "
 "pri %s"
 
-msgid "Could Not Connect"
-msgstr "Povezava ni uspela"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"Povezava ste preve?krat vzpostavili in prekinili. Po?akajte deset minut in "
+"poskusite ponovno. ?e ne po?akate sedaj, boste ?akali ?e dalj."
 
-msgid "Received authorization"
-msgstr "Ponovno zahtevaj pooblastitev"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Vne?eni klju? SecurID ni veljaven."
 
@@ -6702,22 +6769,6 @@ msgstr "V _redu"
 msgid "_OK"
 msgstr "V _redu"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Morda bo povezava v kratkem prekinjena. V tem primeru preverite %s za "
-"posodobitve."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Veljavnega prijavnega izvle?ka za AIM ni mogo?e pridobiti."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
-
-msgid "Unable to get a valid login hash."
-msgstr "Veljavnega prijavnega izvle?ka ni mogo?e pridobiti."
-
 msgid "Password sent"
 msgstr "Geslo poslano"
 
@@ -7259,6 +7310,7 @@ msgstr "Nastavi informacije o uporabniku
 msgid "Set User Info (web)..."
 msgstr "Nastavi informacije o uporabniku (splet) ..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Spremeni geslo (splet)"
 
@@ -7288,6 +7340,10 @@ msgstr "I??i prijatelja po informaciji
 msgid "Search for Buddy by Information"
 msgstr "I??i prijatelja po informaciji"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Uporabnik ni prijavljen"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9538,10 +9594,6 @@ msgstr "Avtoriziraj domeno"
 msgid "Auth Domain"
 msgstr "Avtoriziraj domeno"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s vam je poslal povabilo s spletno kamero, kar ?e ni podprto."
-
 msgid "Your SMS was not delivered"
 msgstr "Va? SMS ni bil dostavljen"
 
@@ -9579,8 +9631,13 @@ msgstr "Neveljavno geslo"
 msgstr "Neveljavno geslo"
 
 #. security lock from too many failed login attempts
-msgid "Account locked: Too many failed login attempts"
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
 msgstr ""
+"Neznana ?tevilka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
+"odpravi."
 
 #. the username does not exist
 #, fuzzy
@@ -9588,8 +9645,13 @@ msgstr "Uporabnik ne obstaja"
 msgstr "Uporabnik ne obstaja"
 
 #. indicates a lock of some description
-msgid "Account locked: See the debug log"
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
 msgstr ""
+"Neznana ?tevilka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
+"odpravi."
 
 #. username or password missing
 #, fuzzy
@@ -9708,8 +9770,8 @@ msgstr "Za?ni Doodlati"
 msgid "Start Doodling"
 msgstr "Za?ni Doodlati"
 
-msgid "Activate which ID?"
-msgstr "Kateri ID naj bo aktiviran?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Komu se ?elite pridru?iti v pomenku?"
@@ -10964,6 +11026,112 @@ msgstr "/Prijatelji/Razvrsti prijatelje"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Barva ozadja"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Skupina je bila dodana na va? seznam prijateljev."
+
+#, fuzzy
+msgid "Layout"
+msgstr "lao?ko"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Barva ozadja"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Raz?iri"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Nastavi barvo ozadja"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Strni"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Nastavi barvo ozadja"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Besedilo za bli?njico"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Prisoten"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Odsoten"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Brez povezave"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Besedilo razpolo?enja"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Sporo?ilo poslano"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Spremeni podatke za uporabika %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Stre?niki SSL"
@@ -11460,6 +11628,10 @@ msgstr "mad?arsko"
 msgid "Hungarian"
 msgstr "mad?arsko"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "romunsko"
+
 msgid "Indonesian"
 msgstr "indonezijsko"
 
@@ -11556,6 +11728,9 @@ msgstr "?vedsko"
 msgid "Swedish"
 msgstr "?vedsko"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "tamilsko"
 
@@ -12078,9 +12253,6 @@ msgstr "Vrsta pisave"
 msgid "Font Face"
 msgstr "Vrsta pisave"
 
-msgid "Background Color"
-msgstr "Barva ozadja"
-
 msgid "Foreground Color"
 msgstr "Barva ospredja"
 
@@ -12525,9 +12697,18 @@ msgstr "Neznano ... Poro?ajte o tem!"
 msgid "Unknown.... Please report this!"
 msgstr "Neznano ... Poro?ajte o tem!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Teme smej?kov ni mogo?e razpakirati."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Teme smej?kov ni mogo?e razpakirati."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Teme smej?kov ni mogo?e razpakirati."
+
 msgid "Install Theme"
 msgstr "Namesti temo"
 
@@ -13306,6 +13487,79 @@ msgstr "Prika?e statisti?ne podatke o 
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Prika?e statisti?ne podatke o dostopnosti va?ega prijatelja"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Naslov stre?nika"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Vnesite konferen?ni stre?nik"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Izberite konferen?ni stre?nik za pogovor"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Storitve na zvezi"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Po?lji seznam prijateljev"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "postane odsoten"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Mapa dnevnika"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Izbira zvoka"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Storitev PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Opis"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Podatki iskanja storitev"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Brskalnik:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Uporabnik ne obstaja"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Stre?nik ne podpira blokiranja"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Podatki iskanja storitev"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ta vti?nik je uporaben za razhro??evanje stre?nikov ali odjemalcev XMPP."
+
 msgid "Buddy is idle"
 msgstr "Prijatelj je nedejaven"
 
@@ -13815,12 +14069,6 @@ msgstr ""
 "- prika?e vsa prispela sporo?ila, ?rkovana nazaj;\n"
 "- po?lje sporo?ilo prijateljem na va?em seznamu, takoj ko se prijavijo;"
 
-msgid "Cursor Color"
-msgstr "Barva kazalke"
-
-msgid "Secondary Cursor Color"
-msgstr "Drugotna barva kazalke"
-
 msgid "Hyperlink Color"
 msgstr "Barva povezave"
 
@@ -13830,6 +14078,10 @@ msgstr "Ime barve poudarjenih sporo?il"
 msgid "Highlighted Message Name Color"
 msgstr "Ime barve poudarjenih sporo?il"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Barva obvestila o tipkanju"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Vodoravno lo?ilo GtkTreeView"
 
@@ -13859,35 +14111,24 @@ msgstr "Tema bli?njic besedila GTK+"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bli?njic besedila GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Barve vmesnika"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Omogo?i obve??anje o tipkanju"
 
-msgid "Widget Sizes"
-msgstr "Velikosti gradnikov"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Nadzor teme Pidgin GTK+ v Pidginu"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Zapri"
+
 msgid "Fonts"
 msgstr "Pisave"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Datote?na orodja Gtkrc"
 
@@ -14029,12 +14270,119 @@ msgstr ""
 msgstr ""
 "Zamenja besedilo v odhodnih sporo?ilih po uporabni?ko dolo?enih pravilih."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Neprijavljen"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Neprijavljen"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Pridru?i se pomenku"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Prezri"
+
+#, fuzzy
+msgid "Founder"
+msgstr "glasneje"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Pooblastilo odobreno"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Napaka"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Podatki"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Pogovorno okno zahteve"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Stopnja opozoril"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Stanje za %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Razpored tipk sobe pomenkov"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Spremeni ikono"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Nadzor teme Pidgin GTK+ v Pidginu"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Podatki o stiku"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Tema seznama prijateljev"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Tema seznama prijateljev"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Nadzor teme Pidgin GTK+ v Pidginu"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Nadzor teme Pidgin GTK+ v Pidginu"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Nabodalo prijateljev"
 
@@ -14240,6 +14588,21 @@ msgstr ""
 msgstr ""
 "Ta vti?nik je uporaben za razhro??evanje stre?nikov ali odjemalcev XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Kateri ID naj bo aktiviran?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Barva kazalke"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Drugotna barva kazalke"
+
+#~ msgid "Interface colors"
+#~ msgstr "Barve vmesnika"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Velikosti gradnikov"
+
 #~ msgid "Invite message"
 #~ msgstr "Sporo?ilo povabila"
 
@@ -14697,9 +15060,6 @@ msgstr ""
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Va?o zahtevo za pridru?itev skupini %d je odobril administrator %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Skupina je bila dodana na va? seznam prijateljev."
-
 #~ msgid "I am applying to join"
 #~ msgstr "Prijavljam se za ?lanstvo"
 
@@ -14770,9 +15130,6 @@ msgstr ""
 #~ msgid "Group Operation Error"
 #~ msgstr "Napaka skupinske operacije"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Napaka pri zahtevanju prijavnega ?etona"
-
 #~ msgid "TCP Address"
 #~ msgstr "Naslov TCP"
 
============================================================
--- po/sq.po	778e8149f83f22be54ce2cd67d9f2eebf272c96a
+++ po/sq.po	a9823547a0c0fccf06feb0c2d85b87eec8c87958
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-11-14 13:56+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <besnik at programeshqip.org>\n"
@@ -1815,6 +1815,8 @@ msgstr "+++ %s ?n?nshkroi"
 msgid "+++ %s signed off"
 msgstr "+++ %s ?n?nshkroi"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Gabim i panjohur"
 
@@ -2229,6 +2231,10 @@ msgstr "(%s) %s <VET?-P?RGJIGJU>: %s\n
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <VET?-P?RGJIGJU>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Gabim n? krijimin e lidhjes"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Po p?rdorni %s, por kjo shtojc? lyp %s."
@@ -3350,6 +3356,11 @@ msgstr "_Em?r fjalosjeje:"
 msgid "Chat _name:"
 msgstr "_Em?r fjalosjeje:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "I pazoti t? lidhet me sh?rbyesin."
+
 msgid "Chat error"
 msgstr "Gabim fjalosjeje"
 
@@ -3409,6 +3420,10 @@ msgstr "P?rdorues Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "P?rdorues Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Kap sh?rbyesin ..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Urdh?r i panjohur: %s"
@@ -3451,7 +3466,8 @@ msgstr "_Fjal?kalim:"
 msgid "_Password:"
 msgstr "_Fjal?kalim:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Nofka IRC nuk duhet t? p?rmbajn? hap?sira"
 
 #  connect to the server
@@ -3946,6 +3962,9 @@ msgstr "Sh?rbyesi nuk p?rdor ndonj? m
 msgid "Server does not use any supported authentication method"
 msgstr "Sh?rbyesi nuk p?rdor ndonj? metod? mir?fillt?simi q? mbulohet"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "K?rkoni kodim, por ky nuk ?sht? i mundsh?m n? k?t? sh?rbyes."
+
 msgid "Invalid challenge from server"
 msgstr "Sfid? e pavlefshme prej sh?rbyesit."
 
@@ -4225,6 +4244,14 @@ msgstr "Burime"
 msgid "Resource"
 msgstr "Burime"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "I futur"
+
 msgid "Middle Name"
 msgstr "Em?r i Mesit"
 
@@ -4399,9 +4426,18 @@ msgstr "Gjej Dhoma"
 msgid "Find Rooms"
 msgstr "Gjej Dhoma"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "K?rkoni kodim, por ky nuk ?sht? i mundsh?m n? k?t? sh?rbyes."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "S'u gjet?n p?rputhje me ndonj? p?rdorues"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rol"
+
 msgid "Ping timeout"
 msgstr "Skadim kohe p?r ping-un"
 
@@ -4421,7 +4457,7 @@ msgstr "ID XMPP i pavlefsh?m. Duhet cak
 msgstr "ID XMPP i pavlefsh?m. Duhet caktuar p?rkat?sia."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "D?shtoi n? lidhjen me sh?rbyesin."
 
 #, c-format
@@ -4448,9 +4484,6 @@ msgstr "?regjistrimi D?shtoi"
 msgid "Unregistration Failed"
 msgstr "?regjistrimi D?shtoi"
 
-msgid "Already Registered"
-msgstr "Tashm? i Regjistruar"
-
 #  State
 msgid "State"
 msgstr "Shtet"
@@ -4464,6 +4497,9 @@ msgstr "Dat?"
 msgid "Date"
 msgstr "Dat?"
 
+msgid "Already Registered"
+msgstr "Tashm? i Regjistruar"
+
 #  Register button
 msgid "Unregister"
 msgstr "?regjistrohuni"
@@ -4497,6 +4533,10 @@ msgstr "Ndrysho Regjistrimin"
 msgid "Change Registration"
 msgstr "Ndrysho Regjistrimin"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "D?shtoi n? lidhjen me sh?rbyesin."
+
 msgid "Error unregistering account"
 msgstr "Gabim n? ?regjistrimin e llogaris?"
 
@@ -4865,16 +4905,18 @@ msgstr "ban &lt;p?rdorues&gt; [arsye]: 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;p?rdorues&gt; [arsye]:  Ndaloji nj? p?rdoruesi dhom?n."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "deg?zon &lt;p?rdorues&gt; &lt;zot?rues|admin|an?tar|outcast|asnj?&gt;: "
 "Vendos lidhjen e p?rdoruesit me dhom?n."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "rol &lt;p?rdorues&gt; &lt;moderator|pjes?marr?s|vizitor|asnj?&gt;: Cakto rol "
 "p?rdoruesi n? dhom?."
@@ -4951,6 +4993,9 @@ msgstr "Nd?rmjet?sa shp?rnguljesh kar
 msgid "File transfer proxies"
 msgstr "Nd?rmjet?sa shp?rnguljesh kartelash"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5352,6 +5397,10 @@ msgstr "Kontakte Jo-IM"
 msgid "Non-IM Contacts"
 msgstr "Kontakte Jo-IM"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ju d?rgoi nj? ftes? p?r kamera web, ?ka nuk mbulohet ende."
+
 msgid "Nudge"
 msgstr ""
 
@@ -5722,64 +5771,27 @@ msgstr "Mir?fillt?sim ID-je Windows Li
 msgstr "Mir?fillt?sim ID-je Windows Live:P?rgjigje e pavlefshme"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nuk ?sht? nj? grup i vlefsh?m."
-
-msgid "Unknown error."
-msgstr "Gabim i panjohur."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s n? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s sapo ju d?rgoi nj? B?rryl!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Gabim i panjohur (%d)"
 
 msgid "Unable to add user"
 msgstr "I pazoti t? shtoj? p?rdorues"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Mungojn? p?rdoruesit vijues te libri juaj i vendndodhjeve"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "I pazoti t? shtoj? p?rdorues te %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Gabim i panjohur (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "I pazoti t? bllokoj? p?rdorues te %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "Mungojn? p?rdoruesit vijues te libri juaj i vendndodhjeve"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "I pazoti t? lejoj? p?rdorues te %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s nuk mund t? shtohej sepse lista juaj e shok?ve ?sht? plot."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nuk ?sht? pasaport? e vlefshme llogarie"
-
-msgid "Service Temporarily Unavailable."
-msgstr "Sh?rbim P?rkoh?sisht i Pakapsh?m"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mesazhi p?r celular nuk u d?rgua dot, ngaq? qe shum? i gjat?."
 
-msgid "Unable to rename group"
-msgstr "I pazoti t? riem?rtoj? grup"
-
-msgid "Unable to delete group"
-msgstr "I pazoti t? fshij? grup"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5868,6 +5880,9 @@ msgstr ""
 "Lista juaj shok?sh MSN ?sht? p?rkoh?sisht e pakapshme. Ju lutem prisni dhe "
 "riprovoni."
 
+msgid "Unknown error."
+msgstr "Gabim i panjohur."
+
 msgid "Handshaking"
 msgstr "Duarshtr?ngim"
 
@@ -5886,6 +5901,14 @@ msgstr "Po merret list? shok?sh"
 msgid "Retrieving buddy list"
 msgstr "Po merret list? shok?sh"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ju d?rgoi nj? ftes? p?r kamera web, ?ka nuk mbulohet ende."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ju d?rgoi nj? ftes? p?r kamera web, ?ka nuk mbulohet ende."
+
 msgid "Away From Computer"
 msgstr "Larg Prej Kompjuterit"
 
@@ -5925,14 +5948,6 @@ msgstr "Mesazhi nuk u d?rgua dot ngaq?
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Mesazhi nuk u d?rgua dot ngaq? ndodhi nj? gabim i panjohur:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ju ka shtuar te lista e tij (saj) e shok?ve."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ju ka hequr prej list?s s? tij (saj) t? shok?ve."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Ta Fshij? Shokun prej Libri Vendndodhjesh?"
 
@@ -5973,6 +5988,51 @@ msgstr "Shtojc? Protokolli MSN"
 msgstr "Shtojc? Protokolli MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nuk ?sht? nj? grup i vlefsh?m."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s n? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "I pazoti t? shtoj? p?rdorues te %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "I pazoti t? bllokoj? p?rdorues te %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "I pazoti t? lejoj? p?rdorues te %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s nuk mund t? shtohej sepse lista juaj e shok?ve ?sht? plot."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nuk ?sht? pasaport? e vlefshme llogarie"
+
+msgid "Service Temporarily Unavailable."
+msgstr "Sh?rbim P?rkoh?sisht i Pakapsh?m"
+
+msgid "Unable to rename group"
+msgstr "I pazoti t? riem?rtoj? grup"
+
+msgid "Unable to delete group"
+msgstr "I pazoti t? fshij? grup"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ju ka shtuar te lista e tij (saj) e shok?ve."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ju ka hequr prej list?s s? tij (saj) t? shok?ve."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "S'ka p?rdorues t? till?: %s"
 
@@ -6006,6 +6066,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Mesazhe poste t? rinj"
 
@@ -6054,18 +6116,20 @@ msgstr "Gabim protokolli, kod %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Gabim protokolli, kod %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Fjal?kalimi juaj ?sht? %d shenja i gjat?, m? tep?r se gjat?sia maksimum e "
 "pritshme prej %d p?r MySpaceIM. Ju lutem shkurtojeni fjal?kalimin tuaj te "
 "http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
 "changePassword dhe riprovoni."
 
+msgid "Incorrect username or password"
+msgstr "Em?r p?rdoruesi ose fjal?kalim i pavlefsh?m"
+
 msgid "MySpaceIM Error"
 msgstr "Gabim MySpaceIM"
 
@@ -6382,9 +6446,6 @@ msgstr "Arkiva kryesore ?sht? e keqfor
 msgid "Master archive is misconfigured"
 msgstr "Arkiva kryesore ?sht? e keqform?suar"
 
-msgid "Incorrect username or password"
-msgstr "Em?r p?rdoruesi ose fjal?kalim i pavlefsh?m"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Nuk u njoh dot streha e emrit t? p?rdoruesit q? dhat?"
 
@@ -6620,6 +6681,28 @@ msgstr "Port? Sh?rbyesi"
 msgid "Server port"
 msgstr "Port? Sh?rbyesi"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "U mor prej sh?rbyesit p?rgjigje HTTP e papritur."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"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?."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Gabim n? shquajtjen e %s"
+
+msgid "Incorrect password."
+msgstr "Fjal?kalim i pasakt?."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Nuk u b? dot futja n? dhom?n e fjalosjes"
 
@@ -6944,14 +7027,31 @@ msgstr ""
 "ose duhet 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."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Edhe pak edhe mundet t'ju shk?pusin.  Shihni %s p?r p?rdit?sime."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Nuk u mor dot hash i vlefsh?m hyrjeje n? AIM."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Edhe pak edhe mundet t'ju shk?pusin.  Shihni %s p?r p?rdit?sime."
+
+msgid "Unable to get a valid login hash."
+msgstr "Nuk u mor dot hash i vlefsh?m hyrjeje"
+
+msgid "Could Not Connect"
+msgstr "Nuk u Lidh Dot"
+
+msgid "Received authorization"
+msgstr "Mir?fillt?sim i marr?"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Em?r p?rdoruesi i pavlefsh?m."
 
-msgid "Incorrect password."
-msgstr "Fjal?kalim i pasakt?."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Llogaria juaj p?r ?astin ?sht? e pezulluar."
@@ -6961,27 +7061,21 @@ msgstr "Sh?rbimi AOL Instant Messenger 
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Sh?rbimi AOL Instant Messenger ?sht? p?rkoh?sisht i pamundur."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"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?."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Versioni i klientit q? po p?rdorni ?sht? shum? i vjet?r. Ju lutem "
 "p?rdit?sojeni prej %s"
 
-msgid "Could Not Connect"
-msgstr "Nuk u Lidh Dot"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"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 "Received authorization"
-msgstr "Mir?fillt?sim i marr?"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Ky?i SecurID i dh?n? ?sht? i pavlefsh?m."
 
@@ -6997,20 +7091,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Edhe pak edhe mundet t'ju shk?pusin.  Shihni %s p?r p?rdit?sime."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Nuk u mor dot hash i vlefsh?m hyrjeje n? AIM."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Edhe pak edhe mundet t'ju shk?pusin.  Shihni %s p?r p?rdit?sime."
-
-msgid "Unable to get a valid login hash."
-msgstr "Nuk u mor dot hash i vlefsh?m hyrjeje"
-
 msgid "Password sent"
 msgstr "Fjal?kalim u d?rguar"
 
@@ -7534,6 +7614,7 @@ msgstr "Caktoni T? dh?na P?rdoruesi (
 msgid "Set User Info (web)..."
 msgstr "Caktoni T? dh?na P?rdoruesi (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Ndryshoni Fjal?klimin p?r (web)"
 
@@ -7563,6 +7644,10 @@ msgstr "K?rko p?r Shok? sipas T? dh? msgid "Search for Buddy by Information"
 msgstr "K?rko p?r Shok? sipas T? dh?nash"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "P?rdoruesi nuk ka hyr?"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9916,10 +10001,6 @@ msgstr "Mir?fillt?sim P?rkat?sie"
 msgid "Auth Domain"
 msgstr "Mir?fillt?sim P?rkat?sie"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ju d?rgoi nj? ftes? p?r kamera web, ?ka nuk mbulohet ende."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9947,6 +10028,44 @@ msgstr "Shto shok t? hedhur tej"
 msgid "Add buddy rejected"
 msgstr "Shto shok t? hedhur tej"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "U mor?n t? dh?na t? pavlefshme rreth lidhjes me sh?rbyesin."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Fjal?kalim i pasakt?."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Numr? gabimi t? panjohur %d. Hyrja te \"site\"-i web Yahoo! mund ta ndreq? "
+"k?t?."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "P?rdoruesi nuk ekziston"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Numr? gabimi t? panjohur %d. Hyrja te \"site\"-i web Yahoo! mund ta ndreq? "
+"k?t?."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Em?r p?rdoruesi ose fjal?kalim i pavlefsh?m"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10058,8 +10177,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "Veprues cila ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "T'i bashkohem kujt n? fjalosje?"
@@ -10881,8 +11000,9 @@ msgstr "Ju lutem, p?rdit?soni fushat e
 msgid "Please update the necessary fields."
 msgstr "Ju lutem, p?rdit?soni fushat e nevojshme."
 
-msgid "Room _List"
-msgstr "_List? Dhomash"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Llogari"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10890,8 +11010,8 @@ msgstr ""
 msgstr ""
 "Ju lutem jepni t? dh?nat e duhura rreth fjalosjes ku doni t? merrni pjes?.\n"
 
-msgid "_Account:"
-msgstr "_Llogari:"
+msgid "Room _List"
+msgstr "_List? Dhomash"
 
 #  Block button
 msgid "_Block"
@@ -11336,6 +11456,111 @@ msgstr "/Shok?/Radhit Shok?"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Shok?/Radhit Shok?"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Ngjyr? Sfondi"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Ngjyr? Sfondi"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Zgjero"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "P?rzgjidhni Ngjyr? Sfondi"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Tkurr"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "P?rzgjidhni Ngjyr? Sfondi"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Shkurtore"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "I lidhur"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Larguar"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Jo i lidhur"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tekst Humori"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mesazh i d?rguar"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Ndrysho t? dh?na p?rdoruesi p?r %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Sh?rbyesa SSL"
@@ -11846,6 +12071,10 @@ msgstr "Hungareze"
 msgid "Hungarian"
 msgstr "Hungareze"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rumune"
+
 msgid "Indonesian"
 msgstr "Indoneziane"
 
@@ -11944,6 +12173,9 @@ msgstr "Suedeze"
 msgid "Swedish"
 msgstr "Suedeze"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamileze"
 
@@ -12374,11 +12606,9 @@ msgstr "Ruaj Pamje"
 msgid "Save Image"
 msgstr "Ruaj Pamje"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Ruaj Pamje..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Shto Emotikon Vetjak..."
 
@@ -12469,9 +12699,6 @@ msgstr "Em?r G?rmash"
 msgid "Font Face"
 msgstr "Em?r G?rmash"
 
-msgid "Background Color"
-msgstr "Ngjyr? Sfondi"
-
 msgid "Foreground Color"
 msgstr "Ngjyr? e P?rparme"
 
@@ -12808,6 +13035,9 @@ msgstr ""
 msgid "Pounce on Whom"
 msgstr ""
 
+msgid "_Account:"
+msgstr "_Llogari:"
+
 msgid "_Buddy name:"
 msgstr "Em?r _shoku:"
 
@@ -12919,9 +13149,18 @@ msgstr "Akt i panjohur cytjeje. Ju lutem
 msgid "Unknown.... Please report this!"
 msgstr "Akt i panjohur cytjeje. Ju lutem njoftojeni k?t?!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "D?shtoi ?paketimi i tem?s s? emotikoneve,."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "D?shtoi ?paketimi i tem?s s? emotikoneve,."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "D?shtoi ?paketimi i tem?s s? emotikoneve,."
+
 msgid "Install Theme"
 msgstr "Instalo Tem?"
 
@@ -13491,6 +13730,10 @@ msgstr "P?rgjegj?s Emotikonesh Vetjake
 msgid "Custom Smiley Manager"
 msgstr "P?rgjegj?s Emotikonesh Vetjake"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "P?rzgjidhni Shok"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klikoni p?r t? ndryshuar ikon?n tuaj t? shokut p?r k?t? llogari."
 
@@ -13718,6 +13961,79 @@ msgstr "Shfaq t? dh?na statistikore rr
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Shfaq t? dh?na statistikore rreth qenies n? linj? p?r shok?t tuaj"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Vendndodhje sh?rbyesi"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Jepni nj? Sh?rbyes Konferencash"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "P?rzgjidhni nj? sh?rbyes konferencash p?r k?rkes?"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Sh?rbime Online"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "D?rgo List? Shok?sh"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Largohet"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Drejtori Regjistrimesh"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "P?rzgjedhje Tingulli"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "Sh?rbim PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "P?rshkrim"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "T? dh?na Zbulimi Sh?rbimesh"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Shfletues:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "P?rdoruesi nuk ekziston"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Sh?rbyesi nuk p?rdor ndonj? metod? mir?fillt?simi q? mbulohet"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "T? dh?na Zbulimi Sh?rbimesh"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Kjo shtojc? ?sht? e dobishme p?r diagnostikim sh?rbyesish apo klient?sh XMPP."
+
 msgid "Buddy is idle"
 msgstr "Shoku ?sht? i plog?sht"
 
@@ -14313,12 +14629,6 @@ msgstr ""
 "- Kthen t?r? tekstet ardh?s\n"
 "- U d?rgon personave n? list?n tuaj nj? mesazh sapo futen"
 
-msgid "Cursor Color"
-msgstr "Ngjyr? Kursori"
-
-msgid "Secondary Cursor Color"
-msgstr "Ngjyr? e Dyt? Kursori"
-
 msgid "Hyperlink Color"
 msgstr "Ngjyr? Tejlidhjeje"
 
@@ -14328,6 +14638,11 @@ msgstr "Em?r Ngjyre p?r Theksim Mesazh
 msgid "Highlighted Message Name Color"
 msgstr "Em?r Ngjyre p?r Theksim Mesazhi"
 
+#  ---------- "Notification Removals" ----------
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Ngjyr? njoftimesh shtypjeje"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Ndarje Horizontale GtkTreeView"
 
@@ -14359,35 +14674,31 @@ msgstr "Tem? Shkurtoresh GTK+ Tekst"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tem? Shkurtoresh GTK+ Tekst"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Ngjyra nd?rfaqeje"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Aktivizo njoftime shtypjesh"
 
-msgid "Widget Sizes"
-msgstr "Madh?si Widget-i"
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kontroll Teme Pidgin GTK+"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Mbyll"
+
 msgid "Fonts"
 msgstr "G?rma"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -14560,6 +14871,75 @@ msgstr ""
 "Z?vend?son tekst n? mesazhe q? d?rgohen, bazuar n? rregulla t? p?rcaktuar "
 "nga p?rdoruesi."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Jo i futur."
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Jo i futur."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Bashkoju nj? Fjalosjeje"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Shp?rfill"
+
+#, fuzzy
+msgid "Founder"
+msgstr "M? fort"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Autorizim i Dh?n?"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Gabim"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "T? dh?na"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Dialog K?rkese"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Shkall? Sinjalizimi"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Gjendje p?r %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Vendore dhome fjalosjeje"
+
+msgid "Dialog Icons"
+msgstr ""
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -14567,12 +14947,70 @@ msgstr ""
 #  *< dependencies
 #  *< priority
 #  *< id
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kontroll Teme Pidgin GTK+"
+
+#, fuzzy
+msgid "Contact"
+msgstr "T? dh?na Kontakti"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "List? Shok?sh"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "List? Shok?sh"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kontroll Teme Pidgin GTK+"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kontroll Teme Pidgin GTK+"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -14799,6 +15237,21 @@ msgstr ""
 msgstr ""
 "Kjo shtojc? ?sht? e dobishme p?r diagnostikim sh?rbyesish apo klient?sh XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Veprues cila ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Ngjyr? Kursori"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Ngjyr? e Dyt? Kursori"
+
+#~ msgid "Interface colors"
+#~ msgstr "Ngjyra nd?rfaqeje"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Madh?si Widget-i"
+
 #~ msgid "Invite message"
 #~ msgstr "Mesazh ftese"
 
============================================================
--- po/sr.po	ad5337acfed971ff5eda382db709ff65a67aadab
+++ po/sr.po	bdc0a855e9e5d829fefdc7894bcef8bf1017f119
@@ -13,7 +13,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: ????? ??????? <gpopac at gmail.com>\n"
 "Language-Team: Serbian <gnome at prevod.org>\n"
@@ -1755,6 +1755,8 @@ msgstr "+++ %s ?? ???????(??)
 msgid "+++ %s signed off"
 msgstr "+++ %s ?? ???????(??)"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????????? ??????"
 
@@ -2147,6 +2149,10 @@ msgstr "(%s) %s <????-???????
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????-???????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?????? ??? ???????????? ????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "????????? %s, ??? ???? ??????? ??????? %s."
@@ -3113,6 +3119,11 @@ msgstr "_??? ???????:"
 msgid "Chat _name:"
 msgstr "_??? ???????:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?? ???? ?? ?? ??????? ?? ??????."
+
 msgid "Chat error"
 msgstr "?????? ? ???????"
 
@@ -3161,6 +3172,10 @@ msgstr "????-???? ???????
 msgid "Gadu-Gadu User"
 msgstr "????-???? ????????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???????? ??????"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "????????? ???????: %s"
@@ -3203,7 +3218,8 @@ msgstr "_???????:"
 msgid "_Password:"
 msgstr "_???????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ??????? ?? ???? ???????? ??????"
 
 #. 1. connect to server
@@ -3677,6 +3693,9 @@ msgstr "?????? ?? ???????
 msgid "Server does not use any supported authentication method"
 msgstr "?????? ?? ??????? ??????? ?? ????????? ?????? ??????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "????????? ?????????, ??? ??? ???? ???????? ?? ???? ???????."
+
 msgid "Invalid challenge from server"
 msgstr "?????????? ?????? ???????"
 
@@ -3948,6 +3967,14 @@ msgstr "??????"
 msgid "Resource"
 msgstr "??????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?????????"
+
 # ???? ?? ?????? ??????? '??? ???'. ??? ??? ?? ?????? ??? ???????? ???
 # ???, ??? ?? ??????????? ?? ???? ?? ???? ?????? ?? ?????? ???????. ???
 # ? ????????? ?? ???? ?????????? ?? ???? ????? ?? 4-5 ?????; ???? ?? ???
@@ -4120,9 +4147,20 @@ msgstr "??????? ????"
 msgid "Find Rooms"
 msgstr "??????? ????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "????????? ?????????, ??? ??? ???? ???????? ?? ???? ???????."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "???????:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "???? ??????? ?????????"
+
+# ,,????? ?????" ? ?????????????
+# ????? ?? ???????? ?????? ? ? ???-?, ????. ????.
+#, fuzzy
+msgid "Roles:"
+msgstr "?????"
+
 msgid "Ping timeout"
 msgstr ""
 
@@ -4142,7 +4180,7 @@ msgstr "?????????? ????? 
 msgstr "?????????? ????? ??????. ?????? ????? ?????."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?? ???? ?? ?? ??????? ?? ??????."
 
 #, c-format
@@ -4169,9 +4207,6 @@ msgstr "?????? ?????????? msgid "Unregistration Failed"
 msgstr "?????? ???????????? ????????"
 
-msgid "Already Registered"
-msgstr "??? ?? ???????????"
-
 msgid "State"
 msgstr "??????"
 
@@ -4184,6 +4219,9 @@ msgstr "?????"
 msgid "Date"
 msgstr "?????"
 
+msgid "Already Registered"
+msgstr "??? ?? ???????????"
+
 msgid "Unregister"
 msgstr "?????? ????????????"
 
@@ -4211,6 +4249,10 @@ msgstr "?????? ?????????? msgid "Change Registration"
 msgstr "?????? ????????????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?? ???? ?? ?? ??????? ?? ??????."
+
 msgid "Error unregistering account"
 msgstr "?????? ??? ?????? ????????????"
 
@@ -4574,16 +4616,18 @@ msgstr "ban &lt;????????&gt; [?
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;????????&gt; [??????]:  ????? ??????? ????????? ? ??????????."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;????????&gt; &lt;owner|admin|member|outcast|none&gt;: ???????? "
 "?????????? ????????? ?? ???????????."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "??????? &lt;????????&gt; &lt;owner|admin|member|outcast|none&gt;: ???????? "
 "?????????? ??????? ? ??????????."
@@ -4647,6 +4691,9 @@ msgstr "?????????? ?? ???
 msgid "File transfer proxies"
 msgstr "?????????? ?? ?????? ????????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5045,6 +5092,12 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s ??? ?? ??????(??) ????? ?? ???????? ????? ??????, ???? ??? ???? ???? "
+"???????."
+
 msgid "Nudge"
 msgstr "????????"
 
@@ -5390,63 +5443,26 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ???? ????????? ?????."
-
-msgid "Unknown error."
-msgstr "????????? ??????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ??? ?????!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "????????? ?????? (%d)"
 
 msgid "Unable to add user"
 msgstr "?? ???? ?? ???????? ?????????"
 
-msgid "The following users are missing from your addressbook"
-msgstr "??????? ????????? ????????? ? ????? ????????"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "?? ???? ?? ????? ????????? ?? %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "????????? ?????? (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "?? ???? ?? ????????? ????????? ?? %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "??????? ????????? ????????? ? ????? ????????"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "?? ???? ?? ???????? ????????? ?? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ?? ?? ???? ?????? ????? ??? ?? ?????? ??????? ???????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ???? ???????? ????? ??????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "?????? ???????? ???? ????????."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "?????? ?? ??????? ???? ??????? ??? ?? ??????????."
 
-msgid "Unable to rename group"
-msgstr "?? ???? ?? ??????????? ?????"
-
-msgid "Unable to delete group"
-msgstr "?? ???? ?? ??????? ?????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5542,6 +5558,9 @@ msgstr ""
 "??? ?????? ??? ??????? ?? ?????????? ??????????. ????????? ???? ?? ????????? "
 "??????."
 
+msgid "Unknown error."
+msgstr "????????? ??????."
+
 msgid "Handshaking"
 msgstr "????????"
 
@@ -5560,6 +5579,18 @@ msgstr "????????? ?????? 
 msgid "Retrieving buddy list"
 msgstr "????????? ?????? ???????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s ??? ?? ??????(??) ????? ?? ???????? ????? ??????, ???? ??? ???? ???? "
+"???????."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s ??? ?? ??????(??) ????? ?? ???????? ????? ??????, ???? ??? ???? ???? "
+"???????."
+
 msgid "Away From Computer"
 msgstr "??????? ?? ????????"
 
@@ -5598,14 +5629,6 @@ msgstr "?????? ????? ????
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????? ????? ???? ??????? ???? ??? ?? ????? ?? ????????? ??????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ??? ?? ????? ? ???? ?????? ???????."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ??? ?? ??????? ?? ?????? ??? ???? ????? ???????."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "?? ??????? ??????? ?? ?????????"
 
@@ -5635,6 +5658,51 @@ msgstr "??????? ?? ??? ??? msgstr "??????? ?? ??? ????????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ???? ????????? ?????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "?? ???? ?? ????? ????????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "?? ???? ?? ????????? ????????? ?? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "?? ???? ?? ???????? ????????? ?? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ?? ?? ???? ?????? ????? ??? ?? ?????? ??????? ???????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ???? ???????? ????? ??????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "?????? ???????? ???? ????????."
+
+msgid "Unable to rename group"
+msgstr "?? ???? ?? ??????????? ?????"
+
+msgid "Unable to delete group"
+msgstr "?? ???? ?? ??????? ?????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ??? ?? ????? ? ???? ?????? ???????."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ??? ?? ??????? ?? ?????? ??? ???? ????? ???????."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "???????? %s ?? ???????"
 
@@ -5664,6 +5732,8 @@ msgstr "???? ?? ???????? ? msgstr "???? ?? ???????? ?? ?????????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "???? ?-?????"
 
@@ -5720,12 +5790,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "?????????? ?????????? ??? ??? ???????"
+
 msgid "MySpaceIM Error"
 msgstr "?????? ? ??? ???????"
 
@@ -6042,9 +6114,6 @@ msgstr "?????? ?????? ???
 msgid "Master archive is misconfigured"
 msgstr "?????? ?????? ???? ????? ????????"
 
-msgid "Incorrect username or password"
-msgstr "?????????? ?????????? ??? ??? ???????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "?? ???? ?? ????????? ???????? ?? ??????? ?????????? ???"
 
@@ -6259,6 +6328,28 @@ msgstr "???? ???????"
 msgid "Server port"
 msgstr "???? ???????"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "??????? ?? ?????????? ??????? HTTP ???????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"???????????? ??? ? ????????? ???? ?????? ?????. ????????? ????? ?????? ?? "
+"????????? ??????. ??? ????????? ?? ??????????, ???????? ?? ???????? ??? ????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?????? ? ??????? ?????? ?? ???????"
+
+msgid "Incorrect password."
+msgstr "?????????? ???????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "?? ???? ?? ?? ??????? ?? ??????????"
 
@@ -6559,14 +6650,33 @@ msgstr ""
 "?????????? ???. ?????????? ????? ?????? ???? ???????? ?????? ?-?????, ?????? "
 "?????? ? ???????? ???? ?????, ??????? ? ???????, ??? ???????? ???? ???????."
 
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "???? ?? ?????? ???? ?????????.  ?????????? %s ?? ??????."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "???????? ????????? ????????? ???? ?? ??????? ?? ???."
+
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "???? ?? ?????? ???? ?????????. ?????????? %s ?? ??????."
+
+msgid "Unable to get a valid login hash."
+msgstr "?? ???? ?? ????? ???????? ??? ?? ???????."
+
+msgid "Could Not Connect"
+msgstr "?? ???? ?? ?? ???????"
+
+msgid "Received authorization"
+msgstr "?????? ?????????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "?????????? ?????????? ???."
 
-msgid "Incorrect password."
-msgstr "?????????? ???????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "??? ????? ?? ???????? ??????????."
@@ -6575,25 +6685,19 @@ msgstr "?????? ??? ????? ? msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????? ??? ????? ?????? ?? ?????????? ??????????."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "??????? ???? ????????? ?? ????????. ???????? ?? ?? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "???????????? ??? ? ????????? ???? ?????? ?????. ????????? ????? ?????? ?? "
 "????????? ??????. ??? ????????? ?? ??????????, ???????? ?? ???????? ??? ????."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "??????? ???? ????????? ?? ????????. ???????? ?? ?? %s"
-
-msgid "Could Not Connect"
-msgstr "?? ???? ?? ?? ???????"
-
-msgid "Received authorization"
-msgstr "?????? ?????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "????? SecurID ???? ?? ??????????."
 
@@ -6609,22 +6713,6 @@ msgstr "_? ????"
 msgid "_OK"
 msgstr "_? ????"
 
-# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "???? ?? ?????? ???? ?????????.  ?????????? %s ?? ??????."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "???????? ????????? ????????? ???? ?? ??????? ?? ???."
-
-# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "???? ?? ?????? ???? ?????????. ?????????? %s ?? ??????."
-
-msgid "Unable to get a valid login hash."
-msgstr "?? ???? ?? ????? ???????? ??? ?? ???????."
-
 msgid "Password sent"
 msgstr "??????? ???????"
 
@@ -7150,6 +7238,7 @@ msgstr "??????? ??????? (? msgid "Set User Info (web)..."
 msgstr "??????? ??????? (????? ????)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "??????? ??????? (????? ????)"
 
@@ -7179,6 +7268,10 @@ msgstr "??????? ??????? ?
 msgid "Search for Buddy by Information"
 msgstr "??????? ??????? ????? ????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "???????? ???? ?????????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9439,12 +9532,6 @@ msgstr "??????? ?????"
 msgid "Auth Domain"
 msgstr "??????? ?????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s ??? ?? ??????(??) ????? ?? ???????? ????? ??????, ???? ??? ???? ???? "
-"???????."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9471,6 +9558,40 @@ msgstr "???????? ???????? msgid "Add buddy rejected"
 msgstr "???????? ???????? ???????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "???????? ?? ???????? ?????? ?? ???????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "?????????? ???????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "???????? ???? ??????: %d. ??????? ?? ???? ????? ???? ?? ?? ???????."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "???????? ?? ???????."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "???????? ???? ??????: %d. ??????? ?? ???? ????? ???? ?? ?? ???????."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "?????????? ?????????? ??? ??? ???????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9579,8 +9700,8 @@ msgstr "????? ??????"
 msgid "Start Doodling"
 msgstr "????? ??????"
 
-msgid "Activate which ID?"
-msgstr "???? ?? ?? ??????????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "???????? ??????? ?? ????"
@@ -10376,16 +10497,17 @@ msgstr "?????????? ?????? msgid "Please update the necessary fields."
 msgstr "?????????? ????????? ????."
 
-msgid "Room _List"
-msgstr "_?????? ????"
+#, fuzzy
+msgid "A_ccount"
+msgstr "?????"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "??????? ??????? ? ??????? ????? ?????? ?? ?? ??????????.\n"
 
-msgid "_Account:"
-msgstr "_?????:"
+msgid "Room _List"
+msgstr "_?????? ????"
 
 msgid "_Block"
 msgstr "_???????"
@@ -10824,6 +10946,112 @@ msgstr "/???????/??????? ? msgid "/Buddies/Sort Buddies"
 msgstr "/???????/??????? ???????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "???? ????????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "??? ????? ?? ?????? ? ???? ????? ???????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "???? ????????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_?????????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????????? ???? ????????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_?????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????????? ???? ????????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?? ????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?????????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "????? ? ???????????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?????? ???????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?????? ??????? ? ????????? ?? %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ???????"
@@ -11326,6 +11554,10 @@ msgstr "????????"
 msgid "Hungarian"
 msgstr "????????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "????????"
+
 msgid "Indonesian"
 msgstr "????????????"
 
@@ -11423,6 +11655,9 @@ msgstr "???????"
 msgid "Swedish"
 msgstr "???????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "????????"
 
@@ -11856,11 +12091,9 @@ msgstr "??????? ?????"
 msgid "Save Image"
 msgstr "??????? ?????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_??????? ?????..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_????? ?????????? ??????..."
 
@@ -11947,9 +12180,6 @@ msgstr "?????? ?????"
 msgid "Font Face"
 msgstr "?????? ?????"
 
-msgid "Background Color"
-msgstr "???? ????????"
-
 msgid "Foreground Color"
 msgstr "???? ??????"
 
@@ -12280,6 +12510,9 @@ msgstr "?????? ?? ????"
 msgid "Pounce on Whom"
 msgstr "?????? ?? ????"
 
+msgid "_Account:"
+msgstr "_?????:"
+
 msgid "_Buddy name:"
 msgstr "_??? ???????:"
 
@@ -12390,9 +12623,18 @@ msgstr "????????? ??????.
 msgid "Unknown.... Please report this!"
 msgstr "????????? ??????. ?????? ??? ?? ??? ?????????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "???? ?????? ?? ???? ?? ?? ?????????."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "???? ?????? ?? ???? ?? ?? ?????????."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "???? ?????? ?? ???? ?? ?? ?????????."
+
 msgid "Install Theme"
 msgstr "????? ????"
 
@@ -12947,6 +13189,10 @@ msgstr "????????? ??????? msgid "Custom Smiley Manager"
 msgstr "????????? ??????????? ???????"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "??????? ???????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "???????? ?? ?????? ???? ??????? ?? ???? ?????."
 
@@ -13169,6 +13415,79 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "?????? ?? ?????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "????????? ?????? ?? ???????????? ???? ?? ???????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????? ??????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "?????? ?????? ???????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??????? ???????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "???????????? ?? ???????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ?????"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub ??????"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?????? ????????? ???????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_??? ??????????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "???????? ?? ???????."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "?????? ?? ??????? ??????? ?? ????????? ?????? ??????????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?????? ????????? ???????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"???? ??????? ?? ???????? ?? ???????? ??????? ????? ??????? ??? ????????"
+
 msgid "Buddy is idle"
 msgstr "?????? ?? ?????????"
 
@@ -13669,12 +13988,6 @@ msgstr ""
 "-- ?????? ??? ???????? ?????\n"
 "-- ???? ?????? ?????? ?? ????? ?????? ??? ?? ??? ???????"
 
-msgid "Cursor Color"
-msgstr "???? ???????"
-
-msgid "Secondary Cursor Color"
-msgstr "?????????? ???? ???????"
-
 msgid "Hyperlink Color"
 msgstr "???? ???-????"
 
@@ -13684,6 +13997,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "???? ?????????? ? ??????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ???????????? ??????????"
 
@@ -13713,35 +14030,24 @@ msgstr "??????? ?? ?????"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "??????? ?? ?????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "???? ??????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??????? ?????????? ? ??????"
 
-msgid "Widget Sizes"
-msgstr "???????? ????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "???????? ???????? ???+ ????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "???????"
+
 msgid "Fonts"
 msgstr "???????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "????? gtkrc ????????"
 
@@ -13878,12 +14184,119 @@ msgstr "???????? ????? ? ? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "???????? ????? ? ????????? ???????? ????? ??????????? ?????????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "???????????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???????? ?? ???????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "????????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????????? ?? ????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "??????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "_????? ?????????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "????? ?? %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "???????????? ??????????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "??????? ???????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "???????? ???????? ???+ ????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "??????? ??????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????? ???????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "???????? ???????? ???+ ????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "???????? ???????? ???+ ????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "????? ?? ??????? ???????"
 
@@ -14089,6 +14502,21 @@ msgstr ""
 msgstr ""
 "???? ??????? ?? ???????? ?? ???????? ??????? ????? ??????? ??? ????????"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "???? ?? ?? ??????????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "???? ???????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "?????????? ???? ???????"
+
+#~ msgid "Interface colors"
+#~ msgstr "???? ??????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "???????? ????????"
+
 #~ msgid "Invite message"
 #~ msgstr "??????? ??????"
 
@@ -14514,9 +14942,6 @@ msgstr ""
 #~ msgid "Please enter external group ID"
 #~ msgstr "??????? ?????????????? ?????? ?????"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "??? ????? ?? ?????? ? ???? ????? ???????"
-
 #~ msgid "I am applying to join"
 #~ msgstr "????? ?? ?? ?????????"
 
@@ -14544,9 +14969,6 @@ msgstr ""
 #~ msgid "You have successfully modified Qun information"
 #~ msgstr "??????? ??? ???????? Qun ???????"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "?????? ? ??????? ?????? ?? ???????"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "?? ???? ?? ?? ???????, ??????? ??????? ???????"
 
============================================================
--- po/sr at latin.po	85991c02c1ca02c9db1938c473d9ba084441ce8d
+++ po/sr at latin.po	4f0711d4291bf9ffc046002f808bdf7fa864f830
@@ -13,7 +13,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Milo? Popovi? <gpopac at gmail.com>\n"
 "Language-Team: Serbian <gnome at prevod.org>\n"
@@ -1758,6 +1758,8 @@ msgstr "+++ %s se odjavio(la)"
 msgid "+++ %s signed off"
 msgstr "+++ %s se odjavio(la)"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Nepoznata gre?ka"
 
@@ -2151,6 +2153,10 @@ msgstr "(%s) %s <SAMO-ODGOVOR>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <SAMO-ODGOVOR>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Gre?ka pri uspostavljanju veze"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Koristite %s, ali ovaj dodatak zahteva %s."
@@ -3118,6 +3124,11 @@ msgstr "_Ime ?askanja:"
 msgid "Chat _name:"
 msgstr "_Ime ?askanja:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Ne mogu da se pove?em na server."
+
 msgid "Chat error"
 msgstr "Gre?ka u ?askanju"
 
@@ -3166,6 +3177,10 @@ msgstr "Gadu-Gadu korisnik"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu korisnik"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Dobavljam server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nepoznata naredba: %s"
@@ -3208,7 +3223,8 @@ msgstr "_Lozinka:"
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nadimci ne mogu sadr?ati beline"
 
 #. 1. connect to server
@@ -3683,6 +3699,9 @@ msgstr "Server ne koristi nijedan od pod
 msgid "Server does not use any supported authentication method"
 msgstr "Server ne koristi nijedan od podr?anih na?ina identifikovanja"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Zahtevate ?ifrovanje, ali ono nije dostupno na ovom serveru."
+
 msgid "Invalid challenge from server"
 msgstr "Neispravan izazov servera"
 
@@ -3954,6 +3973,14 @@ msgstr "Resurs"
 msgid "Resource"
 msgstr "Resurs"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Prijavljen"
+
 # Ovde je nekada stajalo 'ime oca'. Kod nas je srednje ime uglavnom ime
 # oca, ali to definitivno ne mora da bude slu?aj na drugim mestima. Npr
 # u Holandiji je vrlo uobi?ajeno da ljudi imaju po 4-5 imena; uvek se zna
@@ -4126,9 +4153,20 @@ msgstr "Prona?i sobe"
 msgid "Find Rooms"
 msgstr "Prona?i sobe"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Zahtevate ?ifrovanje, ali ono nije dostupno na ovom serveru."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Nadimak:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Nema na?enih korisnika"
+
+# ,,radno mesto" u organizaciji?
+# Uloga je zvani?ni termin i u UML-u, prim. prev.
+#, fuzzy
+msgid "Roles:"
+msgstr "Uloga"
+
 msgid "Ping timeout"
 msgstr ""
 
@@ -4148,7 +4186,7 @@ msgstr "Neispravna D?aber adresa. Morat
 msgstr "Neispravna D?aber adresa. Morate uneti domen."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Ne mogu da se pove?em na server."
 
 #, c-format
@@ -4175,9 +4213,6 @@ msgstr "Odjava registracije neuspela"
 msgid "Unregistration Failed"
 msgstr "Odjava registracije neuspela"
 
-msgid "Already Registered"
-msgstr "Ve? je registrovan"
-
 msgid "State"
 msgstr "Oblast"
 
@@ -4190,6 +4225,9 @@ msgstr "Datum"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Ve? je registrovan"
+
 msgid "Unregister"
 msgstr "Odjavi registraciju"
 
@@ -4217,6 +4255,10 @@ msgstr "Izmeni registraciju"
 msgid "Change Registration"
 msgstr "Izmeni registraciju"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Ne mogu da se pove?em na server."
+
 msgid "Error unregistering account"
 msgstr "Gre?ka pri odjavi registracije"
 
@@ -4580,16 +4622,18 @@ msgstr "ban &lt;korisnik&gt; [razlog]:  
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;korisnik&gt; [razlog]:  Brani pristup korisniku u pri?aonici."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;korisnik&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Postavlja povezanost korisnika sa pri?aonicom."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "pravilo &lt;korisnik&gt; &lt;owner|admin|member|outcast|none&gt;: Postavlja "
 "korisni?ko pravilo u pri?aonici."
@@ -4654,6 +4698,9 @@ msgstr "Posrednici za prenos datoteka"
 msgid "File transfer proxies"
 msgstr "Posrednici za prenos datoteka"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5053,6 +5100,12 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+"%s Vam je poslao(la) poziv za razgovor preko kamere, koji jo? uvek nije "
+"podr?an."
+
 msgid "Nudge"
 msgstr "Potap?aj"
 
@@ -5398,63 +5451,26 @@ msgstr ""
 msgstr ""
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s nije dozvoljena grupa."
-
-msgid "Unknown error."
-msgstr "Nepoznata gre?ka."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s na %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vas gurka!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Nepoznata gre?ka (%d)"
 
 msgid "Unable to add user"
 msgstr "Ne mogu da zabranim korisnika"
 
-msgid "The following users are missing from your addressbook"
-msgstr "Slede?i korisnici nedostaju u va?em adresaru"
-
 #, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Ne mogu da dodam korisnika na %s (%s)"
+msgid "Unknown error (%d)"
+msgstr "Nepoznata gre?ka (%d)"
 
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Ne mogu da odstranim korisnika na %s (%s)"
+msgid "The following users are missing from your addressbook"
+msgstr "Slede?i korisnici nedostaju u va?em adresaru"
 
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Ne mogu da dozvolim korisnika na %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s se ne mo?e dodati po?to vam je spisak drugara popunjen."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s nije ispravan nalog paso?a."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Usluge trenutno nisu dostupne."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Poruka za mobilni nije poslata jer je preduga?ka."
 
-msgid "Unable to rename group"
-msgstr "Ne mogu da preimenujem grupu"
-
-msgid "Unable to delete group"
-msgstr "Ne mogu da uklonim grupu"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5550,6 +5566,9 @@ msgstr ""
 "Va? spisak MSN drugara je privremeno nedostupan. Sa?ekajte malo pa poku?ajte "
 "ponovo."
 
+msgid "Unknown error."
+msgstr "Nepoznata gre?ka."
+
 msgid "Handshaking"
 msgstr "Rukovanje"
 
@@ -5568,6 +5587,18 @@ msgstr "Preuzimam spisak drugara"
 msgid "Retrieving buddy list"
 msgstr "Preuzimam spisak drugara"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+"%s Vam je poslao(la) poziv za razgovor preko kamere, koji jo? uvek nije "
+"podr?an."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s Vam je poslao(la) poziv za razgovor preko kamere, koji jo? uvek nije "
+"podr?an."
+
 msgid "Away From Computer"
 msgstr "Odsutan od ra?unara"
 
@@ -5606,14 +5637,6 @@ msgstr "Poruka mo?da nije poslata zato 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Poruka mo?da nije poslata zato ?to je do?lo do nepoznate gre?ke:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s vas je dodao u svoj spisak drugara."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s vas je uklonio sa njegove ili njene liste drugara."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Da obri?em drugara iz adresara?"
 
@@ -5643,6 +5666,51 @@ msgstr "Dodatak za MSN protokol"
 msgstr "Dodatak za MSN protokol"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s nije dozvoljena grupa."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s na %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Ne mogu da dodam korisnika na %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Ne mogu da odstranim korisnika na %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Ne mogu da dozvolim korisnika na %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s se ne mo?e dodati po?to vam je spisak drugara popunjen."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s nije ispravan nalog paso?a."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Usluge trenutno nisu dostupne."
+
+msgid "Unable to rename group"
+msgstr "Ne mogu da preimenujem grupu"
+
+msgid "Unable to delete group"
+msgstr "Ne mogu da uklonim grupu"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s vas je dodao u svoj spisak drugara."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s vas je uklonio sa njegove ili njene liste drugara."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Korisnik %s ne postoji"
 
@@ -5672,6 +5740,8 @@ msgstr "Veza sa serverom je prekinuta"
 msgstr "Veza sa serverom je prekinuta"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nova e-po?ta"
 
@@ -5728,12 +5798,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr "Neispravno korisni?ko ime ili lozinka"
+
 msgid "MySpaceIM Error"
 msgstr "Gre?ka u Mom svemiru"
 
@@ -6050,9 +6122,6 @@ msgstr "Glavna arhiva nije dobro pode?e
 msgid "Master archive is misconfigured"
 msgstr "Glavna arhiva nije dobro pode?ena"
 
-msgid "Incorrect username or password"
-msgstr "Neispravno korisni?ko ime ili lozinka"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Ne mogu da prepoznam doma?ina za uneseno korisni?ko ime"
 
@@ -6268,6 +6337,28 @@ msgstr "Port servera"
 msgid "Server port"
 msgstr "Port servera"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Dobijen je neo?ekivan odgovor HTTP servera."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Uspostavljali ste i prekidali vezu suvi?e ?esto. Sa?ekajte deset minuta pa "
+"poku?ajte ponovo. Ako nastavite da poku?avate, mora?ete da sa?ekate jo? du?e."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Gre?ka u zahtevu tokena za prijavu"
+
+msgid "Incorrect password."
+msgstr "Neispravna lozinka."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Ne mogu da se pove?em na pri?aonicu"
 
@@ -6568,14 +6659,33 @@ msgstr ""
 "korisni?ko ime. Korisni?ka imena moraju biti ispravne adrese e-po?te, po?eti "
 "slovom i sadr?ati samo slova, brojeve i razmake, ili sadr?ati samo brojeve."
 
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "Veza se uskoro mo?e prekinuti.  Pogledajte %s za dopune."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Neuspelo dobavljanje ispravnog he?a za prijavu na AIM."
+
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Veza se uskoro mo?e prekinuti. Pogledajte %s za dopune."
+
+msgid "Unable to get a valid login hash."
+msgstr "Ne mogu da primi ispravan he? za prijavu."
+
+msgid "Could Not Connect"
+msgstr "Ne mogu da se pove?em"
+
+msgid "Received authorization"
+msgstr "Primio ovla??enje"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Neispravno korisni?ko ime."
 
-msgid "Incorrect password."
-msgstr "Neispravna lozinka."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Va? nalog je trenutno nedostupan."
@@ -6584,25 +6694,19 @@ msgstr "Usluga AOL brzih poruka je privr
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Usluga AOL brzih poruka je privremeno nedostupna."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Program koji koristite je zastareo. Osve?ite ga sa %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Uspostavljali ste i prekidali vezu suvi?e ?esto. Sa?ekajte deset minuta pa "
 "poku?ajte ponovo. Ako nastavite da poku?avate, mora?ete da sa?ekate jo? du?e."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Program koji koristite je zastareo. Osve?ite ga sa %s"
-
-msgid "Could Not Connect"
-msgstr "Ne mogu da se pove?em"
-
-msgid "Received authorization"
-msgstr "Primio ovla??enje"
-
 msgid "The SecurID key entered is invalid."
 msgstr "Uneti SecurID klju? je neispravan."
 
@@ -6618,22 +6722,6 @@ msgstr "_U redu"
 msgid "_OK"
 msgstr "_U redu"
 
-# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Veza se uskoro mo?e prekinuti.  Pogledajte %s za dopune."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Neuspelo dobavljanje ispravnog he?a za prijavu na AIM."
-
-# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Veza se uskoro mo?e prekinuti. Pogledajte %s za dopune."
-
-msgid "Unable to get a valid login hash."
-msgstr "Ne mogu da primi ispravan he? za prijavu."
-
 msgid "Password sent"
 msgstr "Lozinka poslata"
 
@@ -7163,6 +7251,7 @@ msgstr "Postavi podatke (preko veba)..."
 msgid "Set User Info (web)..."
 msgstr "Postavi podatke (preko veba)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Promeni lozinku (preko veba)"
 
@@ -7192,6 +7281,10 @@ msgstr "Prona?i drugara prema podacima"
 msgid "Search for Buddy by Information"
 msgstr "Prona?i drugara prema podacima"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Korisnik nije prijavljen"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9454,12 +9547,6 @@ msgstr "Ovlasti domen"
 msgid "Auth Domain"
 msgstr "Ovlasti domen"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s Vam je poslao(la) poziv za razgovor preko kamere, koji jo? uvek nije "
-"podr?an."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9486,6 +9573,40 @@ msgstr "Odbijeno dodavanje drugara"
 msgid "Add buddy rejected"
 msgstr "Odbijeno dodavanje drugara"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Dobijeni su pogre?ni podaci od servera."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Neispravna lozinka"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Nepoznat broj gre?ke: %d. Prijava na Jahu mo?da mo?e da to otkloni."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Korisnik ne postoji."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Nepoznat broj gre?ke: %d. Prijava na Jahu mo?da mo?e da to otkloni."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Neispravno korisni?ko ime ili lozinka"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9594,8 +9715,8 @@ msgstr "Po?ni crtati"
 msgid "Start Doodling"
 msgstr "Po?ni crtati"
 
-msgid "Activate which ID?"
-msgstr "Koji ID da aktiviram?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Priklju?i ?askanju sa kim?"
@@ -10392,16 +10513,17 @@ msgstr "A?urirajte neophodna polja."
 msgid "Please update the necessary fields."
 msgstr "A?urirajte neophodna polja."
 
-msgid "Room _List"
-msgstr "_Spisak soba"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Nalog"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Unesite podatke o ?askanju kojem ?elite da se priklju?ite.\n"
 
-msgid "_Account:"
-msgstr "_Nalog:"
+msgid "Room _List"
+msgstr "_Spisak soba"
 
 msgid "_Block"
 msgstr "_Zabrani"
@@ -10840,6 +10962,112 @@ msgstr "/Drugari/Pore?aj drugare"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Drugari/Pore?aj drugare"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Boja pozadine"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Ova grupa je dodata u va?u listu drugara"
+
+#, fuzzy
+msgid "Layout"
+msgstr "lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Boja pozadine"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Razgranaj"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Izaberite boju pozadine"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Skupi"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Izaberite boju pozadine"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Stanje"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Na vezi"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Odsutan"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Nepovezan"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Tekst o raspolo?enju"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Poruka poslata"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Izmeni podatke o korisniku za %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL serveri"
@@ -11342,6 +11570,10 @@ msgstr "ma?arski"
 msgid "Hungarian"
 msgstr "ma?arski"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "rumunski"
+
 msgid "Indonesian"
 msgstr "indonezijski"
 
@@ -11439,6 +11671,9 @@ msgstr "?vedski"
 msgid "Swedish"
 msgstr "?vedski"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "tamilski"
 
@@ -11872,11 +12107,9 @@ msgstr "Sa?uvaj sliku"
 msgid "Save Image"
 msgstr "Sa?uvaj sliku"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Sa?uvaj sliku..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Dodaj proizvoljne sme?ke..."
 
@@ -11963,9 +12196,6 @@ msgstr "Izgled fonta"
 msgid "Font Face"
 msgstr "Izgled fonta"
 
-msgid "Background Color"
-msgstr "Boja pozadine"
-
 msgid "Foreground Color"
 msgstr "Boja teksta"
 
@@ -12296,6 +12526,9 @@ msgstr "Zaseda na koga"
 msgid "Pounce on Whom"
 msgstr "Zaseda na koga"
 
+msgid "_Account:"
+msgstr "_Nalog:"
+
 msgid "_Buddy name:"
 msgstr "_Ime drugara:"
 
@@ -12406,9 +12639,18 @@ msgstr "Nepoznata zaseda. Molimo Vas da 
 msgid "Unknown.... Please report this!"
 msgstr "Nepoznata zaseda. Molimo Vas da ovo prijavite!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Skup sme?ka ne mo?e da se raspakuje."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Skup sme?ka ne mo?e da se raspakuje."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Skup sme?ka ne mo?e da se raspakuje."
+
 msgid "Install Theme"
 msgstr "Dodaj temu"
 
@@ -12963,6 +13205,10 @@ msgstr "Ure?ivanje proizvoljnih sme?ak
 msgid "Custom Smiley Manager"
 msgstr "Ure?ivanje proizvoljnih sme?aka"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Izaberi drugara"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Kliknite za izmenu va?e ikonice za ovaj nalog."
 
@@ -13185,6 +13431,79 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Adresa servera"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Server za razgovore"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Izaberite server za konferencije koji se upituje"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Mre?ne usluge"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Po?alji spisak drugara"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Postade odsutan"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Direktorijum za dnevnik"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Izbor zvuka"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub servis"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Opis"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Podaci otkrivanja servisa"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Veb preglednik:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Korisnik ne postoji."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server ne koristi nijedan od podr?anih na?ina identifikovanja"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Podaci otkrivanja servisa"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ovaj dodatak je koristan za uklanjanje gre?aka D?aber servera ili programa"
+
 msgid "Buddy is idle"
 msgstr "Drugar je neaktivan"
 
@@ -13685,12 +14004,6 @@ msgstr ""
 "-- Izvr?e sav prispeli tekst\n"
 "-- ?alje poruku ljudima iz va?eg spiska ?im se oni prijave"
 
-msgid "Cursor Color"
-msgstr "Boja kursora"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekundarna boja kursora"
-
 msgid "Hyperlink Color"
 msgstr "Boja nad-veze"
 
@@ -13700,6 +14013,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Boja obave?tenja o kucanju"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horizontalni razdvojnik"
 
@@ -13729,35 +14046,24 @@ msgstr "Pre?ice za tekst"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Pre?ice za tekst"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Boja su?elja"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Omogu?i obave?tenje o kucanju"
 
-msgid "Widget Sizes"
-msgstr "Veli?ina elementa"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Kontrola Pid?inove GTK+ teme"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Zatvori"
+
 msgid "Fonts"
 msgstr "Fontovi"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Alati gtkrc datoteke"
 
@@ -13895,12 +14201,119 @@ msgstr "Zamenjuje tekst u odlaze?im por
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Zamenjuje tekst u odlaze?im porukama prema korisni?kim pravilima."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Neprijavljen"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Neprijavljen"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Priklju?i se ?askanju"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignori?i"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Glasnije"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Ovla??enje je dato"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Gre?ka"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Podaci"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Prozor zahteva"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "_Nivoi upozorenja"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Stanje za %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Lokalizacija pri?aonice"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Sa?uvaj ikonicu"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Kontrola Pid?inove GTK+ teme"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontakt podaci"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Spisak drugara"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Spisak drugara"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Kontrola Pid?inove GTK+ teme"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Kontrola Pid?inove GTK+ teme"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Traka sa spiskom drugara"
 
@@ -14107,6 +14520,21 @@ msgstr ""
 msgstr ""
 "Ovaj dodatak je koristan za uklanjanje gre?aka D?aber servera ili programa"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Koji ID da aktiviram?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "Boja kursora"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekundarna boja kursora"
+
+#~ msgid "Interface colors"
+#~ msgstr "Boja su?elja"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Veli?ina elementa"
+
 #~ msgid "Invite message"
 #~ msgstr "Pozivna poruka"
 
@@ -14532,9 +14960,6 @@ msgstr ""
 #~ msgid "Please enter external group ID"
 #~ msgstr "Unesite identifikaciju spoljne grupe"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Ova grupa je dodata u va?u listu drugara"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Molim da se pridru?im"
 
@@ -14562,9 +14987,6 @@ msgstr ""
 #~ msgid "You have successfully modified Qun information"
 #~ msgstr "Uspe?no ste izmenili Qun podatke"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Gre?ka u zahtevu tokena za prijavu"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Ne mogu da se pove?em, proveri dnevnik gre?aka"
 
============================================================
--- po/sv.po	b1dfd964afe0a5d88350cf6d141fe99d955c4987
+++ po/sv.po	f22ccf335fafb6b630b2ce719cbe5b97425b6eaa
@@ -9,7 +9,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-25 23:14+0100\n"
 "Last-Translator: Peter Hjalmarsson <xake at rymdraket.net>\n"
 "Language-Team: \n"
@@ -1771,6 +1771,8 @@ msgstr "+++ %s har kopplat ifr?n"
 msgid "+++ %s signed off"
 msgstr "+++ %s har kopplat ifr?n"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Ok?nt fel"
 
@@ -2158,6 +2160,10 @@ msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Fel vid skapandet av anslutning"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du anv?nder %s men denna modul beh?ver %s."
@@ -3137,6 +3143,11 @@ msgstr "Chatt_namn:"
 msgid "Chat _name:"
 msgstr "Chatt_namn:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Kan inte ansluta till servern."
+
 msgid "Chat error"
 msgstr "Chattfel"
 
@@ -3185,6 +3196,10 @@ msgstr "Gadu-Gadu-anv?ndare"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-anv?ndare"
 
+#, fuzzy
+msgid "GG server"
+msgstr "H?mtar server"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ok?nt kommando: %s"
@@ -3227,7 +3242,8 @@ msgstr "_L?senord:"
 msgid "_Password:"
 msgstr "_L?senord:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-nickar f?r inte inneh?lla blanksteg"
 
 #. 1. connect to server
@@ -3706,6 +3722,9 @@ msgstr "Servern anv?nder inga autentise
 msgid "Server does not use any supported authentication method"
 msgstr "Servern anv?nder inga autentiseringsmetoder som st?ds"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "Du kr?ver cryptering, men server st?djer det inte."
+
 msgid "Invalid challenge from server"
 msgstr "Ogiltigt utmaning fr?n servern"
 
@@ -3994,6 +4013,14 @@ msgstr "Resurs"
 msgid "Resource"
 msgstr "Resurs"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Ansluten"
+
 msgid "Middle Name"
 msgstr "Andranamn"
 
@@ -4161,9 +4188,18 @@ msgstr "S?k rum"
 msgid "Find Rooms"
 msgstr "S?k rum"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "Du kr?ver cryptering, men server st?djer det inte."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Inga matchande anv?ndare funna"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Roll"
+
 msgid "Ping timeout"
 msgstr "Ping ?verskred en tidsgr?ns"
 
@@ -4183,7 +4219,7 @@ msgstr "Ogiltigt XMPP IP. Dom?n m?ste 
 msgstr "Ogiltigt XMPP IP. Dom?n m?ste anges."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Kunde inte ansluta till servern."
 
 #, c-format
@@ -4210,9 +4246,6 @@ msgstr "Avregistreringen misslyckades"
 msgid "Unregistration Failed"
 msgstr "Avregistreringen misslyckades"
 
-msgid "Already Registered"
-msgstr "Redan registrerad"
-
 msgid "State"
 msgstr "Delstat"
 
@@ -4225,6 +4258,9 @@ msgstr "Datum"
 msgid "Date"
 msgstr "Datum"
 
+msgid "Already Registered"
+msgstr "Redan registrerad"
+
 msgid "Unregister"
 msgstr "Avregistrera"
 
@@ -4252,6 +4288,10 @@ msgstr "?ndra registrering"
 msgid "Change Registration"
 msgstr "?ndra registrering"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Kunde inte ansluta till servern."
+
 msgid "Error unregistering account"
 msgstr "Fel vid avregistrering av konto"
 
@@ -4615,16 +4655,18 @@ msgstr "ban &lt;anv?ndare&gt; [anlednin
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;anv?ndare&gt; [anledning]:  Bannlys en anv?ndare fr?n rummet."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;anv?ndare&gt; &lt;?gare|admin|medlem|utst?tt|ingen&gt;: Ange "
 "en anv?ndares koppling till rummet."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;anv?ndare&gt; &lt;moderator|deltagare|bes?kare|inget&gt;: Ange en "
 "anv?ndares roll i rummet."
@@ -4691,6 +4733,9 @@ msgstr "Filetransports proxies"
 msgid "File transfer proxies"
 msgstr "Filetransports proxies"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5091,6 +5136,10 @@ msgstr "Icke-IM kontakter"
 msgid "Non-IM Contacts"
 msgstr "Icke-IM kontakter"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s har skickat dig en webbkamerainbjudan, vilket ?nnu inte st?ds."
+
 msgid "Nudge"
 msgstr "Vibba"
 
@@ -5435,63 +5484,26 @@ msgstr "Windows Live ID autentisering: O
 msgstr "Windows Live ID autentisering: Ogiltigt svar"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ?r inte en giltig grupp."
-
-msgid "Unknown error."
-msgstr "Ok?nt fel."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s p? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s skickade just en vibb!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Ok?nt fel (%d)"
 
 msgid "Unable to add user"
 msgstr "Kan inte l?gga till anv?ndaren"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Ok?nt fel (%d)"
+
 msgid "The following users are missing from your addressbook"
 msgstr "De f?ljande anv?ndarna saknas i din adressbok"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kan inte l?gga till anv?ndare p? %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kan inte blockera anv?ndaren p? %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kan inte till?ta anv?ndaren p? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s kunde inte l?ggas till eftersom din kompislista ?r full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?r inte ett giltigt passport-konto."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Tj?nst tillf?lligt on?bar."
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilmeddelandet s?ndes inte d? det var f?r l?ngt."
 
-msgid "Unable to rename group"
-msgstr "Kan inte byta namn p? grupp"
-
-msgid "Unable to delete group"
-msgstr "Kan inte ta bort grupp"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5580,6 +5592,9 @@ msgstr ""
 msgstr ""
 "Din MSN-kompislista ?r otillg?nglig tempor?rt. Var god f?rs?k igen senare."
 
+msgid "Unknown error."
+msgstr "Ok?nt fel."
+
 msgid "Handshaking"
 msgstr "Handskakning"
 
@@ -5598,6 +5613,14 @@ msgstr "Tar emot kompislista"
 msgid "Retrieving buddy list"
 msgstr "Tar emot kompislista"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s har skickat dig en webbkamerainbjudan, vilket ?nnu inte st?ds."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s har skickat dig en webbkamerainbjudan, vilket ?nnu inte st?ds."
+
 msgid "Away From Computer"
 msgstr "Inte vid datorn"
 
@@ -5638,14 +5661,6 @@ msgstr ""
 msgstr ""
 "Meddelandet kunde kanske inte skickas p? grund av att ett ok?nt fel uppstod:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s har lagt till dig till sin kompislista."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s har tagit bort dig fr?n sin kontaktlista."
-
 msgid "Delete Buddy from Address Book?"
 msgstr "Ta bort kompisen fr?n adressboken?"
 
@@ -5675,6 +5690,51 @@ msgstr "Insticksmodul f?r MSN-protokoll
 msgstr "Insticksmodul f?r MSN-protokollet"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ?r inte en giltig grupp."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s p? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kan inte l?gga till anv?ndare p? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kan inte blockera anv?ndaren p? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kan inte till?ta anv?ndaren p? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s kunde inte l?ggas till eftersom din kompislista ?r full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?r inte ett giltigt passport-konto."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Tj?nst tillf?lligt on?bar."
+
+msgid "Unable to rename group"
+msgstr "Kan inte byta namn p? grupp"
+
+msgid "Unable to delete group"
+msgstr "Kan inte ta bort grupp"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s har lagt till dig till sin kompislista."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s har tagit bort dig fr?n sin kontaktlista."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Ingen s?dan anv?ndare: %s"
 
@@ -5703,6 +5763,8 @@ msgstr "Tappade anslutningen till server
 msgstr "Tappade anslutningen till servern"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Nya e-postmeddelanden"
 
@@ -5751,18 +5813,20 @@ msgstr "Protokollfel, gav felkod %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfel, gav felkod %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s Ditt l?senord ?r %d tecken, l?ngre ?n den f?rv?ntade max-gr?nsen p? %d "
 "f?r MySpaceIM. Var v?nlig f?rkorta ditt l?senord p? f?ljande adress http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
 "och f?rs?k sedan igen."
 
+msgid "Incorrect username or password"
+msgstr "Felaktigt anv?ndarnamn eller l?senord"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fel"
 
@@ -6083,9 +6147,6 @@ msgstr "Huvudarkiv ?r felkonfigurerat"
 msgid "Master archive is misconfigured"
 msgstr "Huvudarkiv ?r felkonfigurerat"
 
-msgid "Incorrect username or password"
-msgstr "Felaktigt anv?ndarnamn eller l?senord"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kan inte k?nna igen v?rden f?r anv?ndarnamnet du angav"
 
@@ -6300,6 +6361,28 @@ msgstr "Serverport"
 msgid "Server port"
 msgstr "Serverport"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Mottog ov?ntat HTTP-svar fr?n servern."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Du har anslutit och kopplat ifr?n f?r m?nga g?nger. V?nta tio minuter och "
+"prova igen. Om du forts?tter att f?rs?ka kommer du att f? v?nta ?nnu l?ngre."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Problem att efterfr?ga inloggningsmark?r"
+
+msgid "Incorrect password."
+msgstr "Felaktigt l?senord."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Kunde inte ansluta till chatrummet"
 
@@ -6604,14 +6687,33 @@ msgstr ""
 "en bokstav och f?r endast inneh?lla bokst?ver, nummer och mellanslag, eller "
 "enbart inneh?lla nummer."
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Du kanske snart blir fr?nkopplad.  I s? fall kan du kolla p? %s efter "
+"uppdateringar."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kunde inte h?mta en giltig AIM-inloggnings-hash."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "Du kanske snart blir fr?nkopplad. Kolla p? %s efter uppdateringar."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kunde inte h?mta en giltig login-hash."
+
+msgid "Could Not Connect"
+msgstr "Kunde inte ansluta"
+
+msgid "Received authorization"
+msgstr "Mottog auktorisering"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "Ogiltigt anv?ndarnamn"
 
-msgid "Incorrect password."
-msgstr "Felaktigt l?senord."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Ditt konto ?r avst?ngt f?r tillf?llet."
@@ -6620,25 +6722,19 @@ msgstr "Tj?nsten ?r tillf?lligt on?b
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tj?nsten ?r tillf?lligt on?bar."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Versionen av klienten du anv?nder ?r f?r gammal. Uppgradera p? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Du har anslutit och kopplat ifr?n f?r m?nga g?nger. V?nta tio minuter och "
 "prova igen. Om du forts?tter att f?rs?ka kommer du att f? v?nta ?nnu l?ngre."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Versionen av klienten du anv?nder ?r f?r gammal. Uppgradera p? %s"
-
-msgid "Could Not Connect"
-msgstr "Kunde inte ansluta"
-
-msgid "Received authorization"
-msgstr "Mottog auktorisering"
-
 msgid "The SecurID key entered is invalid."
 msgstr "SecurID-nyckeln som ?r angiven ?r ogiltig."
 
@@ -6654,22 +6750,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Du kanske snart blir fr?nkopplad.  I s? fall kan du kolla p? %s efter "
-"uppdateringar."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kunde inte h?mta en giltig AIM-inloggnings-hash."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Du kanske snart blir fr?nkopplad. Kolla p? %s efter uppdateringar."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kunde inte h?mta en giltig login-hash."
-
 msgid "Password sent"
 msgstr "L?senord skickat"
 
@@ -7186,6 +7266,7 @@ msgstr "?ndra anv?ndarinformation (web
 msgid "Set User Info (web)..."
 msgstr "?ndra anv?ndarinformation (web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "Byt l?senord (web)"
 
@@ -7215,6 +7296,10 @@ msgstr "S?k efter kompis via informatio
 msgid "Search for Buddy by Information"
 msgstr "S?k efter kompis via information"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Anv?ndaren ?r inte inloggad"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9480,10 +9565,6 @@ msgstr "Autentiserad dom?n"
 msgid "Auth Domain"
 msgstr "Autentiserad dom?n"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s har skickat dig en webbkamerainbjudan, vilket ?nnu inte st?ds."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9511,6 +9592,40 @@ msgstr "L?gg till kompisavvisning"
 msgid "Add buddy rejected"
 msgstr "L?gg till kompisavvisning"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Tog emot felaktig data vid anslutning till server."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Felaktigt l?senord"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Ok?nt felnummer %d. Logga in p? Yahoo!s hemsida kan fixa detta."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Anv?ndaren finns inte"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Ok?nt felnummer %d. Logga in p? Yahoo!s hemsida kan fixa detta."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Felaktigt anv?ndarnamn eller l?senord"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9620,8 +9735,8 @@ msgstr "Starta kladda"
 msgid "Start Doodling"
 msgstr "Starta kladda"
 
-msgid "Activate which ID?"
-msgstr "Vilket ID ska aktiveras?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "G? med vem in i chatten?"
@@ -10402,16 +10517,17 @@ msgstr "Var v?nlig uppdatera de n?dv?
 msgid "Please update the necessary fields."
 msgstr "Var v?nlig uppdatera de n?dv?ndiga f?lten."
 
-msgid "Room _List"
-msgstr "Rums_lista"
+#, fuzzy
+msgid "A_ccount"
+msgstr "Konto"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Var god ange information om chatten du vill ansluta till.\n"
 
-msgid "_Account:"
-msgstr "_Konto:"
+msgid "Room _List"
+msgstr "Rums_lista"
 
 msgid "_Block"
 msgstr "_Blockera"
@@ -10850,6 +10966,112 @@ msgstr "/Kompisar/Sortera kompisar"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kompisar/Sortera kompisar"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Bakgrundsf?rg"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Denna gruppen har lagst till i din kompislista."
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Bakgrundsf?rg"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expandera"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "V?lj bakgrundsf?rg"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_F?ll ihop"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "V?lj bakgrundsf?rg"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Genv?g"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Ansluten"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Fr?nvarande"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Fr?nkopplad"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Hum?rstext"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Meddelande skickas"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?ndra anv?ndarinformationen f?r %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-Server"
@@ -11360,6 +11582,10 @@ msgstr "Ungerska"
 msgid "Hungarian"
 msgstr "Ungerska"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Rum?nska"
+
 msgid "Indonesian"
 msgstr "Indonesiska"
 
@@ -11457,6 +11683,9 @@ msgstr "Svenska"
 msgid "Swedish"
 msgstr "Svenska"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamilska"
 
@@ -11886,11 +12115,9 @@ msgstr "Spara bild"
 msgid "Save Image"
 msgstr "Spara bild"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Spara bild..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "L?gg till egen smiley..."
 
@@ -11980,9 +12207,6 @@ msgstr "Typsnitt"
 msgid "Font Face"
 msgstr "Typsnitt"
 
-msgid "Background Color"
-msgstr "Bakgrundsf?rg"
-
 msgid "Foreground Color"
 msgstr "F?rgrundsf?rg"
 
@@ -12312,6 +12536,9 @@ msgstr "Notifiera vem"
 msgid "Pounce on Whom"
 msgstr "Notifiera vem"
 
+msgid "_Account:"
+msgstr "_Konto:"
+
 msgid "_Buddy name:"
 msgstr "K_ompisnamn:"
 
@@ -12422,9 +12649,18 @@ msgstr "Ok?nd attackh?ndelse. Var sn?
 msgid "Unknown.... Please report this!"
 msgstr "Ok?nd attackh?ndelse. Var sn?ll och rapportera detta!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "Smiley temat kunde inte packas upp."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Smiley temat kunde inte packas upp."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "Smiley temat kunde inte packas upp."
+
 msgid "Install Theme"
 msgstr "Installera tema"
 
@@ -12985,6 +13221,10 @@ msgstr "Hanterare f?r egna Smileys"
 msgid "Custom Smiley Manager"
 msgstr "Hanterare f?r egna Smileys"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "V?lj kompis"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "Klicka h?r f?r att ?ndra kompisikon f?r detta konto."
 
@@ -13205,6 +13445,79 @@ msgstr "Visar statistik om dina kompisar
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Visar statistik om dina kompisars tillg?nglighet"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Serveradress"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Ange en konferensserver"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "V?lj en konferensserver att fr?ga"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Anslutningstj?nster"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Skicka kompislista"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Blir fr?nvarande"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Logg katalog"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Ljudval"
+
+# Vad ?r PubSub? Hittar bara antydningar till en s?kmotor med speciella m?jligheter f?r uppf?ljning. ?r det den som avses?
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub Service"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Beskrivning"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Tj?nsteuppt?ckningsinfo"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Webb_l?sare:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Anv?ndaren finns inte"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Servern st?djer inte blockering"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Tj?nsteuppt?ckningsinfo"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "Denna modul ?r anv?ndbar vid fels?kning av XMPP serverar och klienter."
+
 msgid "Buddy is idle"
 msgstr "Kompisen ?r inaktiv"
 
@@ -13711,12 +14024,6 @@ msgstr ""
 "- Den s?nder ett meddelande till personerna p? din kompislista direkt n?r du "
 "loggar in"
 
-msgid "Cursor Color"
-msgstr "F?rg p? mark?ren"
-
-msgid "Secondary Cursor Color"
-msgstr "Sekund?r f?rg p? mark?ren"
-
 msgid "Hyperlink Color"
 msgstr "F?rg p? l?nkar"
 
@@ -13726,6 +14033,10 @@ msgstr "F?rg p? namn i markerade f?rg
 msgid "Highlighted Message Name Color"
 msgstr "F?rg p? namn i markerade f?rger"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "F?rg p? notifiering"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horisontal separation"
 
@@ -13755,36 +14066,24 @@ msgstr "GTK+ Textgenv?gstema"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Textgenv?gstema"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Gr?nssnittsf?rger"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Aktivera skriftnotifiering"
 
-# Os?ker: Finns smidigare l?sning?
-msgid "Widget Sizes"
-msgstr "Storlek p? grafiska element"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ temakontroll"
 
+#, fuzzy
+msgid "Colors"
+msgstr "St?ng"
+
 msgid "Fonts"
 msgstr "Typsnitt"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc filverktyg"
 
@@ -13924,12 +14223,119 @@ msgstr "Ers?tter text i utg?ende medde
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Ers?tter text i utg?ende meddelanden enligt dina egna regler."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Inte inloggad"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Inte inloggad"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Anslut till chatt"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignorera"
+
+#, fuzzy
+msgid "Founder"
+msgstr "H?gre"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Auktorisering given"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Fel"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "F?rfr?gningsdialog"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Varningsniv?er"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status f?r %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chatrummets spr?k"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "?ndra ikon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ temakontroll"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Kontaktinformation"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Kompislista"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Kompislista"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ temakontroll"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ temakontroll"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Kompistickare"
 
@@ -14134,6 +14540,22 @@ msgstr "Denna modul ?r anv?ndbar vid f
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Denna modul ?r anv?ndbar vid fels?kning av XMPP serverar och klienter."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Vilket ID ska aktiveras?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "F?rg p? mark?ren"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "Sekund?r f?rg p? mark?ren"
+
+#~ msgid "Interface colors"
+#~ msgstr "Gr?nssnittsf?rger"
+
+# Os?ker: Finns smidigare l?sning?
+#~ msgid "Widget Sizes"
+#~ msgstr "Storlek p? grafiska element"
+
 #~ msgid "Invite message"
 #~ msgstr "Inbjudningsmeddelande"
 
@@ -14576,9 +14998,6 @@ msgstr "Denna modul ?r anv?ndbar vid f
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Din f?rfr?gan att f? g? med i %d godk?ndes av moderator %d"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Denna gruppen har lagst till i din kompislista."
-
 #~ msgid "I am applying to join"
 #~ msgstr "Jag s?ker f?r att g? med"
 
@@ -14661,9 +15080,6 @@ msgstr "Denna modul ?r anv?ndbar vid f
 #~ msgid "Group Operation Error"
 #~ msgstr "Gruppoperationsfel"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "Problem att efterfr?ga inloggningsmark?r"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP-adress"
 
============================================================
--- po/sw.po	f664ee8cbe93d221400108f2894adc34756fe6ef
+++ po/sw.po	353557e775bf0e76b79ec17de9b30ffacc9b33e6
@@ -5,7 +5,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 19:54-0700\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-04-16 22:24+0300\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc at lists.kde.org>\n"
@@ -2134,6 +2134,10 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Hitilafu kwenye utengenezaji wa saraka:"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3097,7 +3101,12 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "Imeshindwa kuipata seva wakala"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "Kichamorro"
 
@@ -3147,6 +3156,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+#, fuzzy
+msgid "GG server"
+msgstr "Anza"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
@@ -3192,7 +3205,7 @@ msgstr "Nywila:"
 msgid "_Password:"
 msgstr "Nywila:"
 
-msgid "IRC nicks may not contain whitespace"
+msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
 #. 1. connect to server
@@ -4134,7 +4147,7 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr ""
 
 #, c-format
@@ -4163,10 +4176,6 @@ msgstr "Usajili wa Chrome Umeshindikana"
 msgid "Unregistration Failed"
 msgstr "Usajili wa Chrome Umeshindikana"
 
-#, fuzzy
-msgid "Already Registered"
-msgstr "Ipo"
-
 msgid "State"
 msgstr "Hali"
 
@@ -4181,6 +4190,10 @@ msgstr "Tarehe:"
 msgid "Date"
 msgstr "Tarehe:"
 
+#, fuzzy
+msgid "Already Registered"
+msgstr "Ipo"
+
 msgid "Unregister"
 msgstr ""
 
@@ -4210,6 +4223,9 @@ msgstr "Usajili wa Chrome Umeshindikana"
 msgid "Change Registration"
 msgstr "Usajili wa Chrome Umeshindikana"
 
+msgid "Malformed BOSH Connect Server"
+msgstr ""
+
 #, fuzzy
 msgid "Error unregistering account"
 msgstr "Hitilafu katika kusajili DLL"
@@ -4670,6 +4686,9 @@ msgstr ""
 msgid "File transfer proxies"
 msgstr ""
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5059,6 +5078,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5428,33 +5451,6 @@ msgstr ""
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "Hitilafu isiyojulikana"
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
@@ -5528,6 +5524,10 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Unknown error."
+msgstr "Hitilafu isiyojulikana"
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5548,6 +5548,14 @@ msgstr ""
 msgid "Retrieving buddy list"
 msgstr ""
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr ""
 
@@ -5622,6 +5630,29 @@ msgstr ""
 msgid "%s on %s (%s)"
 msgstr ""
 
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
 #, fuzzy
 msgid "Unable to rename group"
 msgstr "Haiwezi kufuta moduli"
@@ -5719,12 +5750,14 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+msgid "Incorrect username or password"
+msgstr ""
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6052,9 +6085,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-msgid "Incorrect username or password"
-msgstr ""
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6257,6 +6287,27 @@ msgstr ""
 msgid "Server port"
 msgstr ""
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Hitilafu katika kuhifadhi %S"
+
+#, fuzzy
+msgid "Incorrect password."
+msgstr "Nywila ya sasa hivi:"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr ""
 
@@ -6557,16 +6608,33 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+#, fuzzy
+msgid "Could Not Connect"
+msgstr "Imeshindwa kuunganisha"
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Jina batili la moduli."
 
-#, fuzzy
-msgid "Incorrect password."
-msgstr "Nywila ya sasa hivi:"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6575,22 +6643,14 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#, fuzzy
-msgid "Could Not Connect"
-msgstr "Imeshindwa kuunganisha"
-
-msgid "Received authorization"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
 #, fuzzy
@@ -6610,20 +6670,6 @@ msgstr "Sawa"
 msgid "_OK"
 msgstr "Sawa"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 #, fuzzy
 msgid "Password sent"
 msgstr "Nywila"
@@ -7076,6 +7122,7 @@ msgstr ""
 msgid "Set User Info (web)..."
 msgstr ""
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Badil &Nywila"
@@ -7107,6 +7154,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9361,10 +9411,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9398,7 +9444,9 @@ msgstr "Nywila ya sasa hivi:"
 msgstr "Nywila ya sasa hivi:"
 
 #. security lock from too many failed login attempts
-msgid "Account locked: Too many failed login attempts"
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #. the username does not exist
@@ -9407,7 +9455,9 @@ msgstr "Faili %S halipo"
 msgstr "Faili %S halipo"
 
 #. indicates a lock of some description
-msgid "Account locked: See the debug log"
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #. username or password missing
@@ -9519,7 +9569,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -10739,6 +10789,110 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Chapisha rangi za usuli"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Chapisha rangi za usuli"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Tanua"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Chapisha rangi za usuli"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "Kunja"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Chapisha rangi za usuli"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "M&wambaa Hali"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Nenda mkondoni"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "M&wambaa Hali"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Namna ya Nje ya mkondo"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+msgid "Idle Text"
+msgstr ""
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Ujumbe haujaenda."
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11251,6 +11405,10 @@ msgstr "Kihungaria"
 msgid "Hungarian"
 msgstr "Kihungaria"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Kiromania"
+
 msgid "Indonesian"
 msgstr "Kindonesia"
 
@@ -11347,7 +11505,7 @@ msgstr "Kiswidi"
 msgid "Swedish"
 msgstr "Kiswidi"
 
-msgid "Swahili Tanzania"
+msgid "Swahili"
 msgstr ""
 
 msgid "Tamil"
@@ -11852,10 +12010,6 @@ msgstr ""
 msgid "Font Face"
 msgstr ""
 
-#, fuzzy
-msgid "Background Color"
-msgstr "Chapisha rangi za usuli"
-
 msgid "Foreground Color"
 msgstr ""
 
@@ -12262,10 +12416,17 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
 #, fuzzy
+msgid "Theme failed to load."
+msgstr "Imeshindwa Kuingia"
+
+msgid "Theme failed to copy."
+msgstr ""
+
+#, fuzzy
 msgid "Install Theme"
 msgstr "Sakinisha Mandhari"
 
@@ -13066,6 +13227,71 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Seva"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Ingiza neno tafuti:"
+
+msgid "Select an XMPP server to query"
+msgstr ""
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Huduma za tovuti"
+
+msgid "Add to Buddy List"
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+#, fuzzy
+msgid "Directory"
+msgstr "Tafuta historia"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "&Uchanguzi"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "Maelezo"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Tafuta historia"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Vinjari..."
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Faili %S halipo"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+msgid "XMPP Service Discovery"
+msgstr ""
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13555,12 +13781,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13570,6 +13790,10 @@ msgstr ""
 msgid "Highlighted Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Arifisho la Jumla"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13600,35 +13824,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Arifisho la Jumla"
+
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Funga"
 
 msgid "Fonts"
 msgstr "Fonti"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13766,12 +13978,110 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Hajaingia"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Hajaingia"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Hitilafu isiyojulikana"
+
+msgid "Ignored"
+msgstr ""
+
+#, fuzzy
+msgid "Founder"
+msgstr "folda"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Uthibitisho unatakiwa"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Hitikafu "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Taarifa Zaidi"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Jumbe za tahadhari"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Hali"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+msgid "Dialog Icons"
+msgstr ""
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "Yaliyomo"
+
+msgid "Pidgin Buddylist Theme Editor"
+msgstr ""
+
+msgid "Edit Buddylist Theme"
+msgstr ""
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
============================================================
--- po/ta.po	f4a921e4ba8e31295db71aa09dc56c3e88b4e90b
+++ po/ta.po	ae6e0f963ccff065b4a735926aa52f4cbb96cd9b
@@ -10,7 +10,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2006-11-28 22:37+0530\n"
 "Last-Translator: drtvasudevan <agnihot3 at gmail.com>\n"
 "Language-Team: tamil <Ubuntu-l10n-tam at lists.ubuntu.com>\n"
@@ -1883,6 +1883,8 @@ msgstr "+++ %s ?????????msgid "+++ %s signed off"
 msgstr "+++ %s ????????????????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "??????? ????"
 
@@ -2272,6 +2274,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??????? ?????????????? ????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3256,6 +3262,11 @@ msgstr "_? ?????? ??? msgid "Chat _name:"
 msgstr "_? ?????? ?????:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "????????????? ?????? ???????????."
+
 msgid "Chat error"
 msgstr "?????? ????"
 
@@ -3304,6 +3315,10 @@ msgstr "????-???? ??
 msgid "Gadu-Gadu User"
 msgstr "????-???? ???????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??????? ????? ???..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "??????? ??????: %s"
@@ -3347,7 +3362,8 @@ msgstr "_??????????:
 msgid "_Password:"
 msgstr "_??????????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "?????? ????????????? ???????????????? ??????"
 
 #. 1. connect to server
@@ -3830,6 +3846,9 @@ msgstr "???????? ???msgid "Server does not use any supported authentication method"
 msgstr "???????? ???? ???????? ????????????? ?????????? ????????????????."
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "?????????????????? ??????? ?????"
 
@@ -4125,6 +4144,14 @@ msgstr "????"
 msgid "Resource"
 msgstr "????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "??????? ?????????????????????"
+
 msgid "Middle Name"
 msgstr "????? ?????"
 
@@ -4295,10 +4322,19 @@ msgstr "?????? ?????msgid "Find Rooms"
 msgstr "?????? ?????????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "???????????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "??????? ?????? ????? ????????  ???????????????????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "?????"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "?????? ??? ????"
 
@@ -4319,7 +4355,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "????????????? ?????? ???????."
 
 #, c-format
@@ -4348,9 +4384,6 @@ msgstr "?????????? ?msgid "Unregistration Failed"
 msgstr "?????????? ???????"
 
-msgid "Already Registered"
-msgstr "??????? ????????????"
-
 msgid "State"
 msgstr "???????"
 
@@ -4363,6 +4396,9 @@ msgstr "????"
 msgid "Date"
 msgstr "????"
 
+msgid "Already Registered"
+msgstr "??????? ????????????"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "?????"
@@ -4395,6 +4431,10 @@ msgstr "??????? ????msgstr "??????? ????"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "????????????? ?????? ???????."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "???????? ????? ??????????? ????"
 
@@ -4767,16 +4807,18 @@ msgstr "?????????? &
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "?????????? &lt;???????&gt; [???]: ??????? ????????????? ??????????."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "???????? &lt;???????&gt; &lt;????????????|??????|??????????|??????????? ???????|"
 "???????????&gt;: ??????????? ???????? ?????????? ??????????."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "????????? &lt;?????&gt;&lt;??????|?????????????|??????????|??????_?????&gt;: ??????? "
 "????? ??????????? ??????????."
@@ -4845,6 +4887,9 @@ msgstr "?????? ?????msgid "File transfer proxies"
 msgstr "?????? ????????? ????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5251,6 +5296,10 @@ msgstr "??????? ????msgid "Non-IM Contacts"
 msgstr "??????? ???????..."
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5613,65 +5662,28 @@ msgstr "?????? ?????msgstr "?????? ?????? ???????!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ?????? ??????? ????."
-
-msgid "Unknown error."
-msgstr "??????? ????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s - ???? ???? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ?????????? ??? ??????? ???????????????!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "??????? ????"
 
 msgid "Unable to add user"
 msgstr "????? ??????? ???????????"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "??????? ????"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "??????? ????? ????????? ????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s ???? ??????? ??????? ????????? (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s  ???? ??????? ?????? ????????? (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s  ???? ??????? ????????? ????????? (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ??????? ???????? ????????? ??????? ?????? ???????? ??????????????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?????? ??????? ?????????? ??????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "??????????? ???? ?????."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "???????? ?????? ?????????. ??????? ???? ??? ??????? ?????????????."
 
-msgid "Unable to rename group"
-msgstr "??????????? ????? ?????????."
-
-msgid "Unable to delete group"
-msgstr "????? ????? ?????????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5759,6 +5771,9 @@ msgstr ""
 "????????? ?????? ???????? ??????????? ?????????????. ?????????? ???????????? ???????? "
 "??????????????."
 
+msgid "Unknown error."
+msgstr "??????? ????."
+
 msgid "Handshaking"
 msgstr "???????????"
 
@@ -5777,6 +5792,14 @@ msgstr "?????? ?????msgid "Retrieving buddy list"
 msgstr "?????? ???????? ???????????"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "??????? ?????? ????????"
 
@@ -5813,14 +5836,6 @@ msgstr "??????? ????msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "??????? ???? ??????????? ????? ?????????????? ??????????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ????? ?????? ?????????? ?????? ??????????????."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ????? ?????? ?????????? ??????? ?????? ??????????????."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "?????? ???????????? ???????????"
@@ -5854,6 +5869,51 @@ msgstr "?????/??????msgstr "?????/??????? ???????? ????????????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ?????? ??????? ????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s - ???? ???? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s ???? ??????? ??????? ????????? (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s  ???? ??????? ?????? ????????? (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s  ???? ??????? ????????? ????????? (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ??????? ???????? ????????? ??????? ?????? ???????? ??????????????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?????? ??????? ?????????? ??????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "??????????? ???? ?????."
+
+msgid "Unable to rename group"
+msgstr "??????????? ????? ?????????."
+
+msgid "Unable to delete group"
+msgstr "????? ????? ?????????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ????? ?????? ?????????? ?????? ??????????????."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ????? ?????? ?????????? ??????? ?????? ??????????????."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5888,6 +5948,8 @@ msgstr "??????????? msgstr "????????????? ????????????????."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "_????? ???????"
@@ -5937,12 +5999,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "????? ???????????? (?) ????? ??????????."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6284,10 +6349,6 @@ msgstr "????????? ??msgstr "????????? ???????? ????? ?????????????????????"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "????? ???????????? (?) ????? ??????????."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "??????? ???????? ????? ?????????? ??????? ???????? ??? ???????????."
 
@@ -6503,6 +6564,28 @@ msgstr "???????? ???msgstr "???????? ????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "?????????????????? ??????? ?????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"??????? ???????? ??????? ?????? ??????? ???????????????????. ????? ?????????? ???????? ???????? "
+"??????????. ????????? ????????? ?????? ???? ????? ????? ????????????????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "??????? ?????????????? ????"
+
+msgid "Incorrect password."
+msgstr "?????????? ????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "?????? ???????????"
 
@@ -6803,15 +6886,38 @@ msgstr ""
 "??????. ?????? ???????? ??? ????????????? ????????? ????????.???? ?????? ?????? ?????? "
 "????????????, ?????? ?????? ??????? ??????????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"??????? ??????? ?????????????? ??????? ??????. ??? ????????? ??? ????? ?? ???? ?????? "
+"???????????. ????????????????? %s ? ???????????."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "??????????????? ????? ?????? hash ? ??? ???????? ?????????."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"??????? ??????? ?????????????? ??????? ??????. ??? ????????? ??? ????? ?? ???? ?????? "
+"???????????. ????????????????? %s ? ???????????."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "??????????????? ?????? hash ? ??? ???????? ?????????."
+
+msgid "Could Not Connect"
+msgstr "?????? ???????????"
+
+msgid "Received authorization"
+msgstr "???????? ??????? ??????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "?????????????? ??????? ?????"
 
-msgid "Incorrect password."
-msgstr "?????????? ????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "?????? ?????? ??????? ??????????? ???????? ??????? ??????."
@@ -6820,27 +6926,21 @@ msgstr "????? ??????msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "????? ?????? ????? ???? ??????????? ?????."
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"??????? ???????? ??????? ?????? ??????? ???????????????????. ????? ?????????? ???????? ???????? "
-"??????????. ????????? ????????? ?????? ???? ????? ????? ????????????????."
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "??????? ???? ????????? ?????? ?????? ??????? ???? ???? ???????????. ???????????? ???? "
 "??????????.%s"
 
-msgid "Could Not Connect"
-msgstr "?????? ???????????"
+#. IP address connecting too frequently
+#, fuzzy
+msgid ""
+"You have 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 ""
+"??????? ???????? ??????? ?????? ??????? ???????????????????. ????? ?????????? ???????? ???????? "
+"??????????. ????????? ????????? ?????? ???? ????? ????? ????????????????."
 
-msgid "Received authorization"
-msgstr "???????? ??????? ??????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???????? ???? SecurID ???? ????????? ?????."
 
@@ -6857,26 +6957,6 @@ msgstr "???"
 msgid "_OK"
 msgstr "???"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"??????? ??????? ?????????????? ??????? ??????. ??? ????????? ??? ????? ?? ???? ?????? "
-"???????????. ????????????????? %s ? ???????????."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "??????????????? ????? ?????? hash ? ??? ???????? ?????????."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"??????? ??????? ?????????????? ??????? ??????. ??? ????????? ??? ????? ?? ???? ?????? "
-"???????????. ????????????????? %s ? ???????????."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "??????????????? ?????? hash ? ??? ???????? ?????????."
-
 msgid "Password sent"
 msgstr "?????????? ??????????????"
 
@@ -7383,6 +7463,7 @@ msgstr "??????? ????msgid "Set User Info (web)..."
 msgstr "??????? ????? ??? (???????? )..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "???????????? ?????? (???????? )"
@@ -7417,6 +7498,10 @@ msgstr "????? ????? 
 msgid "Search for Buddy by Information"
 msgstr "????? ????? ????? ?????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "??????? ???????????????????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9793,10 +9878,6 @@ msgstr "??? ????????msgid "Auth Domain"
 msgstr "??? ?????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9823,6 +9904,40 @@ msgstr "?????? ?????msgid "Add buddy rejected"
 msgstr "?????? ??????? ??????????????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "????????????? ?????????. ??????? ???????? ?????????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "?????????? ????."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??????? ???? ??? %d. ????! ????????????? ???????? ????? ??? ??? ?????????."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "??????? ?????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??????? ???? ??? %d. ????! ????????????? ???????? ????? ??? ??? ?????????."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "????? ???????????? (?) ????? ??????????."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9928,9 +10043,8 @@ msgstr "????????? ??msgid "Start Doodling"
 msgstr "????????? ?????????"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "???? ??????? ????????????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "???? ?????????? ???????????? ??? ?"
@@ -10724,8 +10838,8 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "??? ????????"
+msgid "A_ccount"
+msgstr "??????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10733,8 +10847,9 @@ msgstr ""
 msgstr ""
 "??????? ???? ?????????? ?????? ?????? ?????? ??????????? ?????????? ???????????.\n"
 
-msgid "_Account:"
-msgstr "_??????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "??? ????????"
 
 msgid "_Block"
 msgstr "_??????????"
@@ -11203,6 +11318,113 @@ msgstr "/?????????/?
 msgid "/Buddies/Sort Buddies"
 msgstr "/?????????/????????? ??????????????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "??????? ?????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "%s ????? ?????? ?????????? ?????? ??????????????."
+
+#, fuzzy
+msgid "Layout"
+msgstr "???????? ????????????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "??????? ?????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_? ??????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??????? ??????? ??????????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_? ????????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??????? ??????? ??????????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??????????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "??????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??????? ?????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "?? ????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "????? ??????????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "??????? ??????? ???????? ?????? %s "
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11726,6 +11948,10 @@ msgstr "??????????"
 msgstr "??????????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "?????????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "?????????????"
 
@@ -11831,6 +12057,9 @@ msgstr "????????"
 msgid "Swedish"
 msgstr "????????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "?????"
 
@@ -12272,11 +12501,10 @@ msgstr "?????? ????"
 msgid "Save Image"
 msgstr "?????? ????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "?????? _? ????..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "????????? ???? ???????? ???????"
 
@@ -12367,10 +12595,6 @@ msgstr "????????? ??msgstr "????????? ?????"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "??????? ?????"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "??????? ????????? ?????"
 
@@ -12721,6 +12945,9 @@ msgstr "???? ???? ??
 msgid "Pounce on Whom"
 msgstr "???? ???? ????????? ???????? ????????"
 
+msgid "_Account:"
+msgstr "_??????:"
+
 msgid "_Buddy name:"
 msgstr "_?????? ?????:"
 
@@ -12832,9 +13059,18 @@ msgstr "??????? ????msgid "Unknown.... Please report this!"
 msgstr "??????? ????????? ?????????? ???????. ??? ????????????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "???????? ????????? ?????????????? ???????."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "???????? ????????? ?????????????? ???????."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "???????? ????????? ?????????????? ???????."
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13424,6 +13660,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "?????? ???????????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13657,6 +13897,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "???????? ??????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "????????????? ?????????? ???????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??????????????? ??? ????????????? ?????????? ?????? ?????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????????? ???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "?????? ???????? ???????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "?????? _? ??????????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "????? ????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ??????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>???????:</b> ????????????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "????? ???????? ???"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_?????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "??????? ?????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???????? ???? ???????? ????????????? ?????????? ????????????????."
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "????? ???????? ???"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "?????? ?????? ???????????"
 
@@ -14175,12 +14487,6 @@ msgstr ""
 "- ??????? ???????? ???????????? ?????????? ??????????\n"
 "- ?????? ??????????? ???? ?????? ????? ???????????? ??????????? ????? ????????????"
 
-msgid "Cursor Color"
-msgstr "?????? ?????????? ?????"
-
-msgid "Secondary Cursor Color"
-msgstr "???????????? ?????? ?????????? ?????"
-
 msgid "Hyperlink Color"
 msgstr "??????????? ?????"
 
@@ -14192,6 +14498,10 @@ msgstr "??????????? msgid "Highlighted Message Name Color"
 msgstr "???????????? ??????? ???????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "????????? ???????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "?????? ???? ?????? ????????????? ????????"
 
@@ -14221,35 +14531,24 @@ msgstr "??????+ ??? ? msgid "GTK+ Text Shortcut Theme"
 msgstr "??????+ ??? ??????????? ?????????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "???????? ????????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "????? ?????? ???????????"
 
-msgid "Widget Sizes"
-msgstr "???? ???? ???????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "?????? ??????+ ????????? ???????????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "?????"
+
 msgid "Fonts"
 msgstr "??????????????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "?????? ?????? ???????????"
@@ -14396,12 +14695,119 @@ msgstr "??????? ????msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "??????? ??????? ????????? ?????????????? ?????????? ?????????? ???????????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???????????????????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "???????????????????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "??? ?????????? ???"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??? ???????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "??????????????? ?????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "???? ?????? ?????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "???????? ???????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "?????????? ????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ????? ????"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "?????? ??? ???? ??????????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "???????????? ????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "?????? ??????+ ????????? ???????????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "???????? ?????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????? ????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????? ????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "?????? ??????+ ????????? ???????????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "?????? ??????+ ????????? ???????????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "?????? ?????? -??????"
 
@@ -14615,6 +15021,22 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "???? ??????? ????????????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "?????? ?????????? ?????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "???????????? ?????? ?????????? ?????"
+
+#~ msgid "Interface colors"
+#~ msgstr "???????? ????????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "???? ???? ???????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "??????? ?????"
 
@@ -15097,10 +15519,6 @@ msgstr ""
 #~ msgstr "%s ?? ???? ??????????: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "%s ????? ?????? ?????????? ?????? ??????????????."
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "?????? ??????? ????"
 
@@ -15109,10 +15527,6 @@ msgstr ""
 #~ msgstr "???????? ??????? ?????????"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "??????? ?????????????? ????"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "????? ??? ????? ???????????"
 
@@ -15233,10 +15647,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_?????:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "??????:"
-
 #~ msgid "DBus"
 #~ msgstr "????? (DBus)"
 
@@ -15345,13 +15755,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>???????:</b> ????????????"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
============================================================
--- po/te.po	b4943ceab544f40548907da6f7a8ed5afdef3238
+++ po/te.po	1a908e7569f54a30ec7a6a8367a209036a8b34b1
@@ -2,7 +2,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin Telugu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-11-14 14:05+0530\n"
 "Last-Translator: RKVS Raman <raman at cdacbangalore.in>\n"
 "Language-Team: GIST CDAC Pune / BharateeyaOO.o <info.gist at cdac.in / "
@@ -1869,6 +1869,8 @@ msgstr "+++ %s ?????? ??
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "?????? ???????"
 
@@ -2256,6 +2258,10 @@ msgstr "(%s) %s <??? ?????msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <??? ??????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "???????? ????????? ???????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s ?? ???? ????????????????, ???? ? ????? ??? ?? %s ?????."
@@ -3368,6 +3374,11 @@ msgstr "??????_????:
 msgid "Chat _name:"
 msgstr "??????_????:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?????????? ??????????????? ??????. "
+
 msgid "Chat error"
 msgstr "???????? ???????"
 
@@ -3428,6 +3439,10 @@ msgstr "Gadu-Gadu ????????msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ???????????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??????????? ??????????? ???? ?????? ..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?????? ??????: %s"
@@ -3474,7 +3489,8 @@ msgstr "_??????????:
 msgid "_Password:"
 msgstr "_??????????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ?????? ?? ????????"
 
 # connect to the server
@@ -3959,6 +3975,9 @@ msgstr " ??????? ???
 msgid "Server does not use any supported authentication method"
 msgstr " ??????? ??????  ??????????  ???????? ?????? ????? ????."
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "???????????? ??????? ????? "
 
@@ -4264,6 +4283,14 @@ msgstr "???? "
 msgid "Resource"
 msgstr "???? "
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???? ??? ?????????"
+
 msgid "Middle Name"
 msgstr "???????? ????????"
 
@@ -4439,10 +4466,19 @@ msgstr "???? ??? ???
 msgid "Find Rooms"
 msgstr "???? ??? ?????????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "???? ????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "??????? ??????????? ???????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "????????? ??? "
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "???????? ???????? "
 
@@ -4463,7 +4499,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "????????? ??????? ??????? ???????. "
 
 #, c-format
@@ -4494,9 +4530,6 @@ msgstr " ????? ?????
 msgid "Unregistration Failed"
 msgstr " ????? ?????????"
 
-msgid "Already Registered"
-msgstr "???????? ????????"
-
 msgid "State"
 msgstr "?????? "
 
@@ -4510,6 +4543,9 @@ msgstr "???? "
 msgid "Date"
 msgstr "???? "
 
+msgid "Already Registered"
+msgstr "???????? ????????"
+
 # Register button
 #, fuzzy
 msgid "Unregister"
@@ -4544,6 +4580,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "????????? ??????? ??????? ???????. "
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "?????? ??????????? ????????? ???????. "
 
@@ -4938,16 +4978,18 @@ msgstr "ban &lt;user&gt; [room]:   ?? msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:   ????????????? ???? ?????  ???????????."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ???? ?? "
 "??????????? ????????????? ???? ??????."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ??????????? ??????? "
 "???? ?? ???? ??????."
@@ -5025,6 +5067,9 @@ msgstr "???? ???????msgid "File transfer proxies"
 msgstr "???? ???????????? ??????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5442,6 +5487,10 @@ msgstr "?????????? ?msgid "Non-IM Contacts"
 msgstr "?????????? ?????????? "
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5814,72 +5863,35 @@ msgstr "??????? ????msgstr "??????? ?????????? ???????!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ????????????? ?????? ????. "
+msgid "%s just sent you a Nudge!"
+msgstr "%s ??????? ????? ?????????? ??????!"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-msgid "Unknown error."
-msgstr "?????? ???????."
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "??????? ???????: 0x%X"
 
-#, c-format
-msgid "%s on %s (%s)"
-msgstr " %s (%s) ??? %s "
+# msgstr "?????? ???????"
+msgid "Unable to add user"
+msgstr "????????????? ????????? ?????? "
 
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ??????? ????? ?????????? ??????!"
-
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-#. char *adl = g_strndup(payload, len);
 #, c-format
 msgid "Unknown error (%d)"
 msgstr ""
 
-# msgstr "?????? ???????"
-msgid "Unable to add user"
-msgstr "????????????? ????????? ?????? "
-
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "?? ???????? ??????? ??? ???????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr " %s (%s) ??? ????????????? ????????? ??????"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) ??? ????????????? ????????????? ?????? "
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s(%s) ?? ????????????? ???????????? ?????? "
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ?? ??????? ????????, ???????? ?? ??????? ?????? ????????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ????????????? ??????????? ?????? ????."
-
-msgid "Service Temporarily Unavailable."
-msgstr "??????? ???????????? ?????????? ????. "
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "???? ?????? ?????? ????????????? ???? ?????????? ???????????:"
 
-msgid "Unable to rename group"
-msgstr "????????? ?????????????????? ??????"
-
-msgid "Unable to delete group"
-msgstr "???????? ??????????? ??????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5968,6 +5980,12 @@ msgstr "?? MSN ???????
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "?? MSN ??????? ?????? ???????????? ?????????? ????. ?????? ?????? ???????  ????? ?????????????. "
 
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+msgid "Unknown error."
+msgstr "?????? ???????."
+
 msgid "Handshaking"
 msgstr "????????????? "
 
@@ -5986,6 +6004,14 @@ msgstr "??????? ????msgid "Retrieving buddy list"
 msgstr "??????? ???????? ?????? ????????? "
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "??????????????? ?????? "
 
@@ -6022,14 +6048,6 @@ msgstr "?????? ?????msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????? ??????? ???????????, ??????? ?????? ??????????????????. "
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ????????? ?? ??????? ???????? ????????."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ????????? ?? ??????? ?????? ????? ??????????."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "?????? ??????? ????????."
@@ -6072,6 +6090,51 @@ msgstr "MSN ??????????msgstr "MSN ?????????? ????????? "
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ????????????? ?????? ????. "
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr " %s (%s) ??? %s "
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr " %s (%s) ??? ????????????? ????????? ??????"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) ??? ????????????? ????????????? ?????? "
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s(%s) ?? ????????????? ???????????? ?????? "
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ?? ??????? ????????, ???????? ?? ??????? ?????? ????????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ????????????? ??????????? ?????? ????."
+
+msgid "Service Temporarily Unavailable."
+msgstr "??????? ???????????? ?????????? ????. "
+
+msgid "Unable to rename group"
+msgstr "????????? ?????????????????? ??????"
+
+msgid "Unable to delete group"
+msgstr "???????? ??????????? ??????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ????????? ?? ??????? ???????? ????????."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ????????? ?? ??????? ?????? ????? ??????????."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -6108,6 +6171,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "?????????? ??????"
@@ -6158,12 +6223,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "??????? ???????? ???? ??? ?????????? "
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6498,10 +6566,6 @@ msgstr "??????? ????msgstr "??????? ??????? ????????????? ??????. "
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "??????? ???????? ???? ??? ?????????? "
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "???? ??????????? ?????? ???????? ?????? (host) ?????????? ???????????"
 
@@ -6736,6 +6800,28 @@ msgstr "??????? ????msgstr "??????? ?????? "
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "?????? ????? ??????? HTTP ??????????? ???????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"???? ?????? ??????? ????????????, ???????????? ????????????. ??? ???????? ??? ??? ?????????????. ???? "
+"???????????? ???????????, ???? ???? ?????? ???? ??????????????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "???????? ????????? ???????"
+
+msgid "Incorrect password."
+msgstr "????? ??????????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "??????? ????? ?????????? ????. "
 
@@ -7059,15 +7145,32 @@ msgstr ""
 "?????? ????? ?????????: ???? %s ????? ???????. ???????? ????????????? ?????????. ????????????? "
 "?????????? ?????????????. ?????? ????????, ??????, ???????? ???? ????? ???????????? ??????????. "
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "???? ?????? ??????????? ????????????.  ??? ????????? %s ??????."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "????????????? AIM ???? ???  ??????? ???????? ???????. "
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "???? ?????? ??????????? ????????????.  ??? ????????? %s ??????."
+
+msgid "Unable to get a valid login hash."
+msgstr "????????????? ???? ???  ??????? ???????? ???????. "
+
+msgid "Could Not Connect"
+msgstr "??????? ????? ?????? ????"
+
+msgid "Received authorization"
+msgstr "?????????? ?????????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "?????????? ???? ????. "
 
-msgid "Incorrect password."
-msgstr "????? ??????????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "????????????? ?? ?????? ???????? ?????????. "
@@ -7077,25 +7180,19 @@ msgstr "AOL ????? ????
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL ????? ???????? ??????? ???????????? ??????. "
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "???? ????????? ?????????? ??????? ???? ?????. ??????  %s ???? ?????????? ??????."
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "???? ?????? ??????? ????????????, ???????????? ????????????. ??? ???????? ??? ??? ?????????????. ???? "
 "???????????? ???????????, ???? ???? ?????? ???? ??????????????."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "???? ????????? ?????????? ??????? ???? ?????. ??????  %s ???? ?????????? ??????."
-
-msgid "Could Not Connect"
-msgstr "??????? ????? ?????? ????"
-
-msgid "Received authorization"
-msgstr "?????????? ?????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "????? ????? SecurID ?????????."
 
@@ -7111,20 +7208,6 @@ msgstr "_???"
 msgid "_OK"
 msgstr "_???"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "???? ?????? ??????????? ????????????.  ??? ????????? %s ??????."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "????????????? AIM ???? ???  ??????? ???????? ???????. "
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "???? ?????? ??????????? ????????????.  ??? ????????? %s ??????."
-
-msgid "Unable to get a valid login hash."
-msgstr "????????????? ???? ???  ??????? ???????? ???????. "
-
 msgid "Password sent"
 msgstr "?????????? ?????????"
 
@@ -7629,6 +7712,7 @@ msgstr "??????????? msgid "Set User Info (web)..."
 msgstr "????????????? ??????? (URL) ..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "????????????? ???????? (URL)"
@@ -7662,6 +7746,10 @@ msgstr "??????? ????msgstr "??????? ?????? ???????????? "
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "??????????? ???????? ???????"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -10058,10 +10146,6 @@ msgstr "?????????? ?msgid "Auth Domain"
 msgstr "?????????? ?????? ??????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10085,6 +10169,40 @@ msgstr "?????????? ?msgid "Add buddy rejected"
 msgstr "?????????? ??????????????? ???????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "?????? ?? ???????? ?? ??????? ???? ???????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "??????? ?????????? "
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "?????? ??????? ????? %d. ????! ???? ????-??? ????????. ?????? ????????? ???????????."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "??????????? ??????????? ????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "?????? ??????? ????? %d. ????! ???? ????-??? ????????. ?????? ????????? ???????????."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??????? ???????? ???? ??? ?????????? "
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10195,9 +10313,8 @@ msgstr "????????? ??msgid "Start Doodling"
 msgstr "????????? ???????????"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "? ID?? ???????? ???????"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 #, fuzzy
 msgid "Join whom in chat?"
@@ -11037,18 +11154,20 @@ msgstr "??????? ????msgid "Please update the necessary fields."
 msgstr "??????? ?????? ??? ?????? ??? ???? ??????."
 
+# And now for the buttons
+# Set up stuff for the account box
 #, fuzzy
-msgid "Room _List"
-msgstr "???? ??????"
+msgid "A_ccount"
+msgstr "??????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "???? ?????? ???????????? ????????????? ???? ??????? ????? ??????.\n"
 
-# And now for the buttons
-msgid "_Account:"
-msgstr "_????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "???? ??????"
 
 msgid "_Block"
 msgstr "???????????? "
@@ -11530,6 +11649,124 @@ msgstr "/????????/??
 msgid "/Buddies/Sort Buddies"
 msgstr "/????????/????????? ???????????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "?????? ????? ???? "
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "?? ??????? ???????? ? ???????? ??????? ????????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "?????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "?????? ????? ???? "
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expand"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "???????? ?????? ??????? ??????."
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_?????????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "???????? ?????? ??????? ??????."
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+# Creating the options for the protocol
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????? "
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+# zephyr has several exposures
+# NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+# OPSTAFF "hidden"
+# REALM-VISIBLE visible to people in local realm
+# REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+# NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+# NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+# Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+# Hidden, will set the user's exposure to OPSTAFF
+# Away won't change their exposure but will set an auto away message (for IMs only)
+#, fuzzy
+msgid "On-line Text"
+msgstr "???????? "
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "?????? "
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "???????? "
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "????? ??????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?????? ?????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s ???? ??????????? ???????????  ????????. "
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -12089,6 +12326,10 @@ msgstr "?????????"
 msgid "Hungarian"
 msgstr "?????????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "????????? "
+
 msgid "Indonesian"
 msgstr "???????????"
 
@@ -12190,6 +12431,9 @@ msgstr "???????? "
 msgid "Swedish"
 msgstr "???????? "
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "?????"
 
@@ -12679,11 +12923,10 @@ msgstr "?????????? ?msgid "Save Image"
 msgstr "?????????? ???? ??????."
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_?????????? ???? ??????."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "?????? ????????? ???????"
 
@@ -12773,10 +13016,6 @@ msgstr "????? ???? "
 msgstr "????? ???? "
 
 #, fuzzy
-msgid "Background Color"
-msgstr "?????? ????? ???? "
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "?????? ????? ???? "
 
@@ -13123,6 +13362,10 @@ msgstr "??????? ????msgid "Pounce on Whom"
 msgstr "??????? ????????????"
 
+# And now for the buttons
+msgid "_Account:"
+msgstr "_????:"
+
 msgid "_Buddy name:"
 msgstr "_???????? ????:"
 
@@ -13234,9 +13477,18 @@ msgstr "??????? ????msgid "Unknown.... Please report this!"
 msgstr "??????? ??????? ????????????. ?????? ???????? ??????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "?????? ???? ????????? ???????. "
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?????? ???? ????????? ???????. "
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "?????? ???? ????????? ???????. "
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13847,7 +14099,12 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+# "Select Buddy" button
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "???????? ????? ?????? "
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "? ?????? ???? ? ???????? ???? ?? ???????????:"
 
@@ -14085,6 +14342,78 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "??????? ?????? "
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "???????????  ????????? ????? ??????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??????????????? ??????????? ????????? ????? ?????? "
+
+#, fuzzy
+msgid "Find Services"
+msgstr "???????? ????????? "
+
+# Buddy List
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "??????? ???????? ??????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "???? ????????????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "???? ?????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ???????? "
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "????????? ??????????? ???? ??????. "
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_???????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "??????????? ??????????? ????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr " ??????? ??????  ??????????  ???????? ?????? ????? ????."
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "????????? ??????????? ???? ??????. "
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "? ????? ??? XMPP ?????? ?? ???? ????????? ?? ?????????? ?????????? ?????????????."
+
 msgid "Buddy is idle"
 msgstr "???????? ?????? ??????? "
 
@@ -14720,12 +15049,6 @@ msgstr ""
 "- ?????? ????? ????? ????????? ??????? ?????????.\n"
 "- ?????? ?????? ?????????????? ?? ???????? ??????? ?????? ????????? "
 
-msgid "Cursor Color"
-msgstr "?????? ????"
-
-msgid "Secondary Cursor Color"
-msgstr "??????? ?????? ????"
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "??????????? ???? "
@@ -14738,6 +15061,11 @@ msgstr "?????? ?????msgid "Highlighted Message Name Color"
 msgstr "?????? ????? ????????"
 
+# ---------- "Notification Removals" ----------
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "?????? ?????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Gtk???????? ??????? ???????? ???????"
 
@@ -14767,35 +15095,24 @@ msgstr "GTK+ ??????? ?? msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ??????? ?????? ??? ????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "????? ???? ??????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "????? ?????? ????????????? "
 
-msgid "Widget Sizes"
-msgstr "???? ???? ?????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "???????? GTK+ ???? ????????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "??????? "
+
 msgid "Fonts"
 msgstr "????? ??"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -14953,6 +15270,115 @@ msgstr "????? ???? ?
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "????? ???? ?????????? ????????????? ??????????? ???????? ????????? ????????? ???????? ?????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???? ??? ???????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "???? ??? ???????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "???????? ??????."
+
+#, fuzzy
+msgid "Ignored"
+msgstr "?????? "
+
+#, fuzzy
+msgid "Founder"
+msgstr "????????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "????? "
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????????? ??????????. "
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "??????? "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??? ??????? "
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "????????? ??????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "????????? ?????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ???? ?????? "
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "???? ???? ??????? "
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "??????? ???? ?????? "
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "???????? GTK+ ???? ????????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "????????? ???????"
+
+# Buddy List
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "??????? ?????? "
+
+# Buddy List
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "??????? ?????? "
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "???????? GTK+ ???? ????????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "???????? GTK+ ???? ????????"
+
 # *< type
 # *< ui_requirement
 # *< flags
@@ -15195,6 +15621,22 @@ msgstr "? ????? ??? XM
 msgstr "? ????? ??? XMPP ?????? ?? ???? ????????? ?? ?????????? ?????????? ?????????????."
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "? ID?? ???????? ???????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "?????? ????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??????? ?????? ????"
+
+#~ msgid "Interface colors"
+#~ msgstr "????? ???? ??????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "???? ???? ?????????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "???????? ?????????"
 
@@ -15694,9 +16136,6 @@ msgstr "? ????? ??? XM
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "%d???????? ????????? ???? ????? ?????????? admin %d ??????????"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "?? ??????? ???????? ? ???????? ??????? ????????"
-
 #~ msgid "I am applying to join"
 #~ msgstr "???? ????????? ???????? ????????????"
 
@@ -15717,10 +16156,6 @@ msgstr "? ????? ??? XM
 #~ msgid "Enter your reason:"
 #~ msgstr "??????????? ???????????:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "???????? ????????? ???????"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "???? ??? ?????? ???????, ????? ???? ?? ????? ??????"
 
@@ -15768,13 +16203,7 @@ msgstr "? ????? ??? XM
 #~ "?? ??????? ???????? ??????????????? ??????? ??????????????? ????? ??????. ????????? ???? ?????????? "
 #~ "????? ??????????. ????????????? ???????? ???? ??????? ??????? ???????????????. \n"
 
-# And now for the buttons
-# Set up stuff for the account box
 #, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "??????:"
-
-#, fuzzy
 #~ msgid "_Screen name:"
 #~ msgstr "???????? ????:"
 
============================================================
--- po/th.po	e40bce7578357b751d96621a1eac4cf5b39cecd8
+++ po/th.po	a15653a89d7d93bd373a2d26a11942705de88909
@@ -9,7 +9,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2006-04-04 15:35+0700\n"
 "Last-Translator: Isriya Paireepairit <markpeak at gmail.com>\n"
 "Language-Team: Thai <l10n at opentle.org>\n"
@@ -1816,6 +1816,8 @@ msgstr ""
 msgid "+++ %s signed off"
 msgstr ""
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "???????????????????????????"
 
@@ -2188,6 +2190,10 @@ msgstr ""
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "?????????????????????????????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3137,6 +3143,11 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "??????????????????????"
+
 msgid "Chat error"
 msgstr ""
 
@@ -3185,6 +3196,10 @@ msgstr ""
 msgid "Gadu-Gadu User"
 msgstr ""
 
+#, fuzzy
+msgid "GG server"
+msgstr "???????????????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "???????????????: %s"
@@ -3227,7 +3242,8 @@ msgstr "_????????:"
 msgid "_Password:"
 msgstr "_????????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "??????????? IRC ??????????????????????"
 
 #. 1. connect to server
@@ -3658,6 +3674,9 @@ msgstr ""
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr ""
 
@@ -3940,6 +3959,14 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?????????????"
+
 msgid "Middle Name"
 msgstr "????????"
 
@@ -4108,10 +4135,19 @@ msgstr "?????????"
 msgid "Find Rooms"
 msgstr "?????????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "???????"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "???????????"
 
@@ -4131,7 +4167,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "????????????????????????????"
 
 #, c-format
@@ -4159,9 +4195,6 @@ msgstr "??????????? msgid "Unregistration Failed"
 msgstr "????????????????"
 
-msgid "Already Registered"
-msgstr "?????????????"
-
 msgid "State"
 msgstr "???"
 
@@ -4174,6 +4207,9 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+msgid "Already Registered"
+msgstr "?????????????"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "?????????"
@@ -4205,6 +4241,10 @@ msgstr "??????????? msgid "Change Registration"
 msgstr "????????????????????????????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "????????????????????????????"
+
 msgid "Error unregistering account"
 msgstr ""
 
@@ -4572,13 +4612,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4642,6 +4682,9 @@ msgstr "???????"
 msgid "File transfer proxies"
 msgstr "???????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5038,6 +5081,10 @@ msgstr ""
 msgid "Non-IM Contacts"
 msgstr ""
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5387,65 +5434,28 @@ msgstr ""
 msgid "Windows Live ID authentication:Invalid response"
 msgstr ""
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr ""
-
-msgid "Unknown error."
-msgstr ""
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ???????????????? (%s)"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "???????????????????????????"
 
 msgid "Unable to add user"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "???????????????????????????"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "???????????????????????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr ""
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr ""
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr ""
-
-msgid "Service Temporarily Unavailable."
-msgstr ""
-
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 
-msgid "Unable to rename group"
-msgstr ""
-
-msgid "Unable to delete group"
-msgstr ""
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5516,6 +5526,9 @@ msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5534,6 +5547,14 @@ msgstr "??????????? msgid "Retrieving buddy list"
 msgstr "??????????????????????"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "?????????????????????"
 
@@ -5570,14 +5591,6 @@ msgstr ""
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr ""
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr ""
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "??????????????????????"
@@ -5609,6 +5622,51 @@ msgstr "???????? Jabber"
 msgstr "???????? Jabber"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5641,6 +5699,8 @@ msgstr "??????????? msgstr "????????????????? %s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "???_???????"
@@ -5688,12 +5748,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "????????????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6020,10 +6083,6 @@ msgstr ""
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#, fuzzy
-msgid "Incorrect username or password"
-msgstr "????????????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr ""
 
@@ -6223,6 +6282,25 @@ msgstr "??????????? msgid "Server port"
 msgstr "????????????????"
 
+msgid "Received unexpected response from "
+msgstr ""
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?????????????????????????????"
+
+msgid "Incorrect password."
+msgstr ""
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "????????????????????????????"
@@ -6514,15 +6592,32 @@ msgstr ""
 "only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "???????????????????????????????????"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "???????????????????????????????????"
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "????????????????????"
 
-msgid "Incorrect password."
-msgstr ""
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr ""
@@ -6531,23 +6626,16 @@ msgstr ""
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#. username connecting too frequently
-#. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-msgid "Could Not Connect"
+#. IP address connecting too frequently
+msgid ""
+"You have 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 ""
 
-msgid "Received authorization"
-msgstr ""
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -6564,20 +6652,6 @@ msgstr "????"
 msgid "_OK"
 msgstr "????"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "???????????????????????????????????"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "???????????????????????????????????"
-
-msgid "Unable to get a valid login hash."
-msgstr ""
-
 msgid "Password sent"
 msgstr ""
 
@@ -7022,6 +7096,7 @@ msgstr "??????????? msgid "Set User Info (web)..."
 msgstr "???????????????..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "???????????????"
@@ -7052,6 +7127,9 @@ msgstr ""
 msgid "Search for Buddy by Information"
 msgstr ""
 
+msgid "Use clientLogin"
+msgstr ""
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9306,10 +9384,6 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9333,6 +9407,37 @@ msgstr ""
 msgid "Add buddy rejected"
 msgstr ""
 
+#. Some error in the received stream
+msgid "Received invalid data"
+msgstr ""
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????????????"
+
+#. security lock from too many failed login attempts
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "?????????"
+
+#. indicates a lock of some description
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "????????????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9433,7 +9538,7 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
+msgid "Select the ID you want to activate"
 msgstr ""
 
 msgid "Join whom in chat?"
@@ -10199,16 +10304,17 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "???????????"
+msgid "A_ccount"
+msgstr "?????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "?????????????????????????????????????\n"
 
-msgid "_Account:"
-msgstr "_?????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "???????????"
 
 msgid "_Block"
 msgstr "_?????"
@@ -10672,6 +10778,112 @@ msgstr ""
 msgid "/Buddies/Sort Buddies"
 msgstr ""
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "??????????"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "??????????????????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "??????????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??????????????????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_???"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??????????????????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??????????????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "???????"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "????????????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?????????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?????????????????????? %s"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11186,6 +11398,10 @@ msgstr ""
 msgid "Hungarian"
 msgstr ""
 
+#, fuzzy
+msgid "Armenian"
+msgstr "??????"
+
 msgid "Indonesian"
 msgstr ""
 
@@ -11285,6 +11501,9 @@ msgstr ""
 msgid "Swedish"
 msgstr ""
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr ""
 
@@ -11702,11 +11921,10 @@ msgstr "??????????? msgid "Save Image"
 msgstr "????????????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "??????_??????..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "???????????????????????????????????????"
 
@@ -11795,10 +12013,6 @@ msgstr "??????????? msgstr "???????????"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "??????????"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "??????????"
 
@@ -12103,6 +12317,9 @@ msgstr "??????????? msgid "Pounce on Whom"
 msgstr "??????????????????????????????"
 
+msgid "_Account:"
+msgstr "_?????:"
+
 msgid "_Buddy name:"
 msgstr "_????????????:"
 
@@ -12214,9 +12431,16 @@ msgstr ""
 msgid "Unknown.... Please report this!"
 msgstr ""
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?????????????????"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -12797,6 +13021,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "???????????????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13015,6 +13243,73 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "??????????????????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??????????????????????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "?????????????????????????????????????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?????????????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "???????????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "?_??????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "????"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "????????"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr ""
+
+#, fuzzy
+msgid "_Browse"
+msgstr "?_??????????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "??????????????????"
+
+msgid "Server does not support service discovery"
+msgstr ""
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "????????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr ""
 
@@ -13505,12 +13800,6 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 msgid "Hyperlink Color"
 msgstr ""
 
@@ -13522,6 +13811,10 @@ msgstr "??????????? msgid "Highlighted Message Name Color"
 msgstr "???????????????????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "??????????????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -13551,35 +13844,23 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "????????????????"
+
+msgid "GTK+ Theme Control Settings"
 msgstr ""
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "???"
 
 msgid "Fonts"
 msgstr "????????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr ""
 
@@ -13715,12 +13996,114 @@ msgstr ""
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "?????????????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "?????????????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "??????????????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "_??????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "????????????????????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??????????????"
+
+msgid "Mail dialog"
+msgstr ""
+
+msgid "Question dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "????????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "???????? %s"
+
+msgid "Chatroom Emblems"
+msgstr ""
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "???????????"
+
+msgid "Pidgin Icon Theme Editor"
+msgstr ""
+
+#, fuzzy
+msgid "Contact"
+msgstr "<hr><b>?????????????</b>%s%s"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "???????????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "???????????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+msgid "Pidgin Theme Editor"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Pidgin Theme Editor."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr ""
 
@@ -14075,10 +14458,6 @@ msgstr ""
 #~ msgstr "????????"
 
 #, fuzzy
-#~ msgid "XMPP developer"
-#~ msgstr "????????"
-
-#, fuzzy
 #~ msgid "<b>ChangeLog:</b><br>%s"
 #~ msgstr "%s<b>??????</b><br>%s"
 
@@ -14145,10 +14524,6 @@ msgstr ""
 #~ msgstr "????????????????????????????"
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "?????????????????????????????"
-
-#, fuzzy
 #~ msgid "TCP Address"
 #~ msgstr "???????????"
 
@@ -14226,10 +14601,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_???????:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "?????:"
-
 #~ msgid "TCP port"
 #~ msgstr "????? TCP"
 
============================================================
--- po/tr.po	272f8416d935ab5181be3c830ff28575a3f32d37
+++ po/tr.po	6d615680cf1ef75022db46a2953724f938971320
@@ -13,7 +13,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-11-09 00:33+0200\n"
 "Last-Translator: Serdar Soytetir <tulliana at gmail.com>\n"
 "Language-Team:  <tr at li.org>\n"
@@ -1769,6 +1769,8 @@ msgstr "+++ %s ??k?? yapt?"
 msgid "+++ %s signed off"
 msgstr "+++ %s ??k?? yapt?"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Bilinmeyen Hata"
 
@@ -2171,6 +2173,10 @@ msgstr "(%s) %s <Otomatik-cevap>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Otomatik-cevap>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Ba?lant? olu?turma hatas?"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "%s kullan?yorsunuz fakat bu eklenti %s gerektiriyor."
@@ -3123,6 +3129,11 @@ msgstr "Sohbet _ad?:"
 msgid "Chat _name:"
 msgstr "Sohbet _ad?:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Sunucuya ba?lan?lamad?."
+
 msgid "Chat error"
 msgstr "Sohbet hatas?"
 
@@ -3171,6 +3182,10 @@ msgstr "Gadu-Gadu Kullan?c?s?"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Kullan?c?s?"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Kullan?c? Bilgisi Ayarla..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Bilinmeyen komut: %s"
@@ -3213,7 +3228,8 @@ msgstr "?_ifre"
 msgid "_Password:"
 msgstr "?_ifre"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC isimler bo?luk karakteri i?eremez"
 
 #. 1. connect to server
@@ -3684,6 +3700,9 @@ msgstr "Sunucu bir kimlik do?rulama y?
 msgid "Server does not use any supported authentication method"
 msgstr "Sunucu bir kimlik do?rulama y?ntemi kulanm?yor"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Sunucudan ge?ersiz yan?t"
 
@@ -3954,6 +3973,14 @@ msgstr "Kaynak"
 msgid "Resource"
 msgstr "Kaynak"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?evrimi?i"
+
 msgid "Middle Name"
 msgstr "?kinci ?sim"
 
@@ -4118,10 +4145,19 @@ msgstr "Oda Bul"
 msgid "Find Rooms"
 msgstr "Oda Bul"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "G?r?nen ?sim:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Uygun kullan?c? bulunamad?"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Rol"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "D?z metin"
 
@@ -4141,7 +4177,7 @@ msgstr "Ge?ersiz XMPP Kimli?i. Alan ad
 msgstr "Ge?ersiz XMPP Kimli?i. Alan ad? ayarlanmal?."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Sunucuya ba?lan?lamad?"
 
 #, c-format
@@ -4168,9 +4204,6 @@ msgstr "Kay?t Silme Ba?ar?s?z Oldu"
 msgid "Unregistration Failed"
 msgstr "Kay?t Silme Ba?ar?s?z Oldu"
 
-msgid "Already Registered"
-msgstr "Zaten Kay?tl?"
-
 msgid "State"
 msgstr "Durum"
 
@@ -4183,6 +4216,9 @@ msgstr "Tarih"
 msgid "Date"
 msgstr "Tarih"
 
+msgid "Already Registered"
+msgstr "Zaten Kay?tl?"
+
 msgid "Unregister"
 msgstr "Kay?t Sil"
 
@@ -4210,6 +4246,10 @@ msgstr "Kayd? De?i?tir"
 msgid "Change Registration"
 msgstr "Kayd? De?i?tir"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Sunucuya ba?lan?lamad?"
+
 msgid "Error unregistering account"
 msgstr "Hesap silinirken hata olu?tu"
 
@@ -4577,16 +4617,18 @@ msgstr ""
 "ban &lt;user&gt; [room]:  Kullan?c?y? odadan uzun s?reli uzakla?t?r?r "
 "(banlar)."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Bir "
 "kullan?c?n?n odayla ili?kisini ayarlar."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;kullan?c?&gt; &lt;y?netici|kat?l?mc?|ziyaret?i|hi?biri&gt;: Bir "
 "kullan?c?n?n odadaki rol?n? ayarla."
@@ -4651,6 +4693,9 @@ msgstr "Dosya aktar?m portu"
 msgid "File transfer proxies"
 msgstr "Dosya aktar?m portu"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5048,6 +5093,10 @@ msgstr "Ki?iyi Kald?r"
 msgid "Non-IM Contacts"
 msgstr "Ki?iyi Kald?r"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr "Uyar?"
 
@@ -5398,65 +5447,28 @@ msgstr "Windows Live ID Kimlik Do?rulam
 msgstr "Windows Live ID Kimlik Do?rulamas?: Ba?lan?lamad?"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ge?erli bir grup de?il."
-
-msgid "Unknown error."
-msgstr "Bilinmeyen Hata"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s - %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s size bir titre?im g?nderdi!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Bilinmeyen hata (%d)"
 
 msgid "Unable to add user"
 msgstr "Kullan?c? eklenemedi"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Bilinmeyen hata (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "Arama sonu?lar?n?z"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kullan?c? %s 'a eklenemiyor (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s i?indeki kullan?c? engellenemiyor (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s i?indeki kullan?c?ya izin verilemiyor (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s eklenemiyor, ??nk? listeniz dolu durumda."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ge?erli bir passport hesab? de?il."
-
-msgid "Service Temporarily Unavailable."
-msgstr "Bu Servis Ge?ici Olarak Hizmet D???"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "?leti g?nderilmedi, ??nk? oturum a?mam??s?n?z."
 
-msgid "Unable to rename group"
-msgstr "Grup ad? de?i?tirilemiyor"
-
-msgid "Unable to delete group"
-msgstr "Grup silinemiyor"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5538,6 +5550,9 @@ msgstr ""
 msgstr ""
 "MSN listenize ge?ici olarak ba?lan?lam?yor. L?tfen daha sonra tekrar deneyin."
 
+msgid "Unknown error."
+msgstr "Bilinmeyen Hata"
+
 msgid "Handshaking"
 msgstr "El S?k??ma"
 
@@ -5556,6 +5571,14 @@ msgstr "Liste al?n?yor"
 msgid "Retrieving buddy list"
 msgstr "Liste al?n?yor"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Bilgisayardan Uzakta"
 
@@ -5593,14 +5616,6 @@ msgstr "?leti g?nderilmemi? olabilir 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?leti g?nderilmemi? olabilir ??nk? bilinmeyen bir hata meydana geldi:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s sizi ki?i listesine ekledi."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s sizi ki?i listesinden sildi."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Adres Defterine Ekle"
@@ -5634,6 +5649,51 @@ msgstr "AIM Protokol? Eklentisi"
 msgstr "AIM Protokol? Eklentisi"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ge?erli bir grup de?il."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s - %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kullan?c? %s 'a eklenemiyor (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s i?indeki kullan?c? engellenemiyor (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s i?indeki kullan?c?ya izin verilemiyor (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s eklenemiyor, ??nk? listeniz dolu durumda."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ge?erli bir passport hesab? de?il."
+
+msgid "Service Temporarily Unavailable."
+msgstr "Bu Servis Ge?ici Olarak Hizmet D???"
+
+msgid "Unable to rename group"
+msgstr "Grup ad? de?i?tirilemiyor"
+
+msgid "Unable to delete group"
+msgstr "Grup silinemiyor"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s sizi ki?i listesine ekledi."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s sizi ki?i listesinden sildi."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "B?yle bir kullan?c? yok: %s"
 
@@ -5666,6 +5726,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Yeni e-posta iletisi"
 
@@ -5711,12 +5773,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Yanl?? takma ad veya parola"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM Hatas?"
 
@@ -6035,10 +6100,6 @@ msgstr "Ana ar?iv yanl?? yap?land?r
 msgstr "Ana ar?iv yanl?? yap?land?r?lm??."
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Yanl?? takma ad veya parola"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Girdi?iniz kullan?c? ad?n?n?n sunucusu tan?namad?"
 
@@ -6250,6 +6311,29 @@ msgstr "Sunucu portu"
 msgstr "Sunucu portu"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Sunucudan beklenmeyen bir HTTP yan?t? al?nd?."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?ok s?k ba?lan?p kopuyorsunuz. L?tfen on dakika bekledikten sonra tekrar "
+"deneyin. E?er denemeye devam ederseniz daha uzun beklemek zorunda "
+"kalacaks?n?z."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "%s ??z?mleme hatas?"
+
+msgid "Incorrect password."
+msgstr "Yanl?? parola."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Ba?lan?lamad?"
 
@@ -6547,15 +6631,34 @@ msgstr ""
 "de?il. Takma adlar bir harfle ba?lamal? ve harfler, rakamlar, bo?luk ile "
 "devam etmelidir."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"K?sa bir s?reli?ine ba?lant? koptu.  G?ncellemeler i?in %s adresine bak?n."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Ge?erli AIM giri? hash'i al?namad?."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"K?sa bir s?reli?ine ba?lant? koptu.  G?ncellemeler i?in %s adresine bak?n."
+
+msgid "Unable to get a valid login hash."
+msgstr "Ge?erli bir giri? hash'i al?namad?."
+
+msgid "Could Not Connect"
+msgstr "Ba?lan?lamad?"
+
+msgid "Received authorization"
+msgstr "?zin al?nd?."
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "Ge?ersiz ad"
 
-msgid "Incorrect password."
-msgstr "Yanl?? parola."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Hesab?n?z ?uan i?in durdurulmu?tur."
@@ -6564,26 +6667,20 @@ msgstr "AOL Instant Messenger (Anl?k ?
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger (Anl?k ?leti) Servisi ge?ici olarak servis d???."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "?stemci s?r?m?n?z ?ok eski. L?tfen ?uadan g?ncelleyin: %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "?ok s?k ba?lan?p kopuyorsunuz. L?tfen on dakika bekledikten sonra tekrar "
 "deneyin. E?er denemeye devam ederseniz daha uzun beklemek zorunda "
 "kalacaks?n?z."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "?stemci s?r?m?n?z ?ok eski. L?tfen ?uadan g?ncelleyin: %s"
-
-msgid "Could Not Connect"
-msgstr "Ba?lan?lamad?"
-
-msgid "Received authorization"
-msgstr "?zin al?nd?."
-
 msgid "The SecurID key entered is invalid."
 msgstr "Girilen SecurID anahtar? ge?ersiz."
 
@@ -6599,22 +6696,6 @@ msgstr "_Tamam"
 msgid "_OK"
 msgstr "_Tamam"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"K?sa bir s?reli?ine ba?lant? koptu.  G?ncellemeler i?in %s adresine bak?n."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Ge?erli AIM giri? hash'i al?namad?."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"K?sa bir s?reli?ine ba?lant? koptu.  G?ncellemeler i?in %s adresine bak?n."
-
-msgid "Unable to get a valid login hash."
-msgstr "Ge?erli bir giri? hash'i al?namad?."
-
 msgid "Password sent"
 msgstr "Parola g?nderildi"
 
@@ -7096,6 +7177,7 @@ msgstr "Kullan?c? Bilgisini Ayarla (UR
 msgid "Set User Info (web)..."
 msgstr "Kullan?c? Bilgisini Ayarla (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Parola de?i?tir (URL)"
@@ -7128,6 +7210,10 @@ msgstr "Ki?i Bilgilerine G?re Ki?i Ar
 msgstr "Ki?i Bilgilerine G?re Ki?i Ara"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "Kullan?c? oturum a?mam??"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9423,10 +9509,6 @@ msgstr "Makine Kimli?ini Do?rula"
 msgid "Auth Domain"
 msgstr "Makine Kimli?ini Do?rula"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9450,6 +9532,40 @@ msgstr "Ki?i ekleme reddedildi"
 msgid "Add buddy rejected"
 msgstr "Ki?i ekleme reddedildi"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Sunucu ba?lant?s?ndan ge?ersiz veri al?nd?."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "Yanl?? parola"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Kullan?c? hesab?n?z kilitlendi, l?tfen Yahoo! sitesine giri? yap?n."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Kullan?c? mevcut de?il"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "Kullan?c? hesab?n?z kilitlendi, l?tfen Yahoo! sitesine giri? yap?n."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Yanl?? takma ad veya parola"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9557,8 +9673,8 @@ msgstr "Karalamaya Ba?la"
 msgid "Start Doodling"
 msgstr "Karalamaya Ba?la"
 
-msgid "Activate which ID?"
-msgstr "Hangi Kimlik etkinle?tirilsin?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Kullan?c?yla sohbet et..."
@@ -10333,8 +10449,8 @@ msgstr "L?tfen gerekli alanlar? G?nce
 msgstr "L?tfen gerekli alanlar? G?ncelleyin."
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Oda Listesi"
+msgid "A_ccount"
+msgstr "He_sap:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10343,8 +10459,9 @@ msgstr ""
 "L?tfen kat?lmak istedi?iniz sohbet hakk?nda gereken bilgileri a??k bir "
 "?ekilde girin.\n"
 
-msgid "_Account:"
-msgstr "_Hesap:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Oda Listesi"
 
 msgid "_Block"
 msgstr "_Engelle"
@@ -10794,6 +10911,112 @@ msgstr "/Ki?iler/Ki?ileri S?rala"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Ki?iler/Ki?ileri S?rala"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "Arkaplan Rengi"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Bu grup ki?i listenize eklendi"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Lao"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Arkaplan Rengi"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Geni?let"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Arkaplan Rengini Se?"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Daralt"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Arkaplan Rengini Se?"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "S?rala"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?evrimi?i"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Uzakta"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?evrimd???"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Bo?ta"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "Mesaj g?nderildi?inde"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "%s i?in kullan?c? bilgilerini de?i?tir"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Sunucular?"
@@ -11297,6 +11520,10 @@ msgstr "Macarca"
 msgid "Hungarian"
 msgstr "Macarca"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Romence"
+
 msgid "Indonesian"
 msgstr "Endonezya Dili"
 
@@ -11396,6 +11623,9 @@ msgstr "?sve??e"
 msgid "Swedish"
 msgstr "?sve??e"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -11835,11 +12065,10 @@ msgstr "Resmi Kaydet"
 msgid "Save Image"
 msgstr "Resmi Kaydet"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "Resmi _Kaydet..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "?zel g?leny?zleri g?ster"
 
@@ -11927,9 +12156,6 @@ msgstr "Yaz? Tipi"
 msgid "Font Face"
 msgstr "Yaz? Tipi"
 
-msgid "Background Color"
-msgstr "Arkaplan Rengi"
-
 msgid "Foreground Color"
 msgstr "Yaz? Rengi"
 
@@ -12255,6 +12481,9 @@ msgstr "Uyar?lacak Ki?i"
 msgid "Pounce on Whom"
 msgstr "Uyar?lacak Ki?i"
 
+msgid "_Account:"
+msgstr "_Hesap:"
+
 msgid "_Buddy name:"
 msgstr "_Ki?i ad?:"
 
@@ -12365,9 +12594,18 @@ msgstr "Bilinmeyen uyar? olay?. L?tfe
 msgid "Unknown.... Please report this!"
 msgstr "Bilinmeyen uyar? olay?. L?tfen bunu raporlay?n !"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "G?leny?z temas? a??l?rken hata olu?tu."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "G?leny?z temas? a??l?rken hata olu?tu."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "G?leny?z temas? a??l?rken hata olu?tu."
+
 msgid "Install Theme"
 msgstr "Tema Y?kle"
 
@@ -12940,6 +13178,10 @@ msgstr "Sertifika Y?neticisi"
 msgstr "Sertifika Y?neticisi"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Ki?i Se?in"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "Bu hesap i?in b_u ki?i simgesini kullan:"
 
@@ -13168,6 +13410,79 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "Sunucu adresi"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Bir Konferans Sunucusuna Gir"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Sorgulamak i?in bir konferans sunucusu se?in"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?evrimi?i Servisler"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Ki?i Listesi G?nder"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Uzakta durumuna ge?ince"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Kay?t Dizini"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Ses Se?imi"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "A??klama"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Servis Bulma Bilgileri"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Taray?c?:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Kullan?c? mevcut de?il"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Sunucu bir kimlik do?rulama y?ntemi kulanm?yor"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Servis Bulma Bilgileri"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Bu eklenti XMPP sunucular?n?n ve istemcilerinin hatalar?n? ay?klamak i?in "
+"kullan??l?d?r."
+
 msgid "Buddy is idle"
 msgstr "Ki?i bo?ta"
 
@@ -13672,12 +13987,6 @@ msgstr ""
 "- T?m gelen metinleri ters ?evirir\n"
 "- Oturum a?t???n?zda listenizdeki ki?ilere an?nda ileti g?nderir."
 
-msgid "Cursor Color"
-msgstr "?mle? Rengi"
-
-msgid "Secondary Cursor Color"
-msgstr "?kincil ?mle? Rengi"
-
 msgid "Hyperlink Color"
 msgstr "Ba?lant? Rengi"
 
@@ -13689,6 +13998,10 @@ msgstr "Vurgulanm?? ?letiler"
 msgid "Highlighted Message Name Color"
 msgstr "Vurgulanm?? ?letiler"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Uyar?y? Kald?rma"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView Yatay Da??l?m?"
 
@@ -13718,35 +14031,24 @@ msgstr "GTK+ Metin K?sayol Temas?"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Metin K?sayol Temas?"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "Aray?z rekleri"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "Yeni e-posta bildirimleri"
 
-msgid "Widget Sizes"
-msgstr "Par?ac?k Boyutlar?"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ Tema Kontrol?"
 
+#, fuzzy
+msgid "Colors"
+msgstr "Kapat"
+
 msgid "Fonts"
 msgstr "Yaz?tipleri"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc Dosyas? Ara?lar?"
 
@@ -13886,12 +14188,119 @@ msgstr "Belirtilen kurallara g?re giden
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Belirtilen kurallara g?re giden mesajdaki kelimeleri de?i?tirir."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Oturum a??lmam??"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Oturum a??lmam??"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Bir Sohbete Kat?l"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Yoksay"
+
+#, fuzzy
+msgid "Founder"
+msgstr "Daha Y?ksek"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Yetki Verildi"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Hata "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Kullan?c? Bilgileri"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "?stek Diyalo?u"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Uyar? Seviyesi"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s i?in durum"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Sohbet Odas? Yereli"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Simgeyi Kaydet"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ Tema Kontrol?"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Ba?lant? Bilgileri"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Pidgin - Ki?i Listesi"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Pidgin - Ki?i Listesi"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ Tema Kontrol?"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ Tema Kontrol?"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Ki?i Se?ici"
 
@@ -14096,6 +14505,21 @@ msgstr ""
 "Bu eklenti XMPP sunucular?n?n ve istemcilerinin hatalar?n? ay?klamak i?in "
 "kullan??l?d?r."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "Hangi Kimlik etkinle?tirilsin?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "?mle? Rengi"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "?kincil ?mle? Rengi"
+
+#~ msgid "Interface colors"
+#~ msgstr "Aray?z rekleri"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Par?ac?k Boyutlar?"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "?leti i?ine ekle"
@@ -14583,9 +15007,6 @@ msgstr ""
 #~ msgid "Please enter external group ID"
 #~ msgstr "L?tfen d?? grup Kimli?ini girin"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Bu grup ki?i listenize eklendi"
-
 #~ msgid "I am applying to join"
 #~ msgstr "Kat?lmak i?in ba?vuruyorum"
 
@@ -14654,9 +15075,6 @@ msgstr ""
 #~ "takdirde girdi?iniz isim, ki?inin kay?tl? ismi yerine listenizde "
 #~ "g?r?necektir.\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "He_sap:"
-
 #~ msgid "_Screen name:"
 #~ msgstr "Kay_?tl? isim:"
 
============================================================
--- po/uk.po	702b9c86efa8b3da62f218f4dab4f66c9906dc88
+++ po/uk.po	27964624fb75010712016456de28aab4abaebf57
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2005-08-21 10:43+0300\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd at mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
@@ -1870,6 +1870,8 @@ msgstr "%s ????????"
 msgid "+++ %s signed off"
 msgstr "%s ????????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "???????? ???????"
 
@@ -2261,6 +2263,10 @@ msgstr "(%s) %s <????_???????
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????_?????????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??????? ??? ????????? ?'???????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3288,7 +3294,12 @@ msgstr "????????:"
 msgid "Chat _name:"
 msgstr "????????:"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "?? ???????? ?????????? ??????????? ???????"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "??????? ???????"
 
@@ -3346,6 +3357,10 @@ msgstr "???????? ??????? 
 msgid "Gadu-Gadu User"
 msgstr "???????? ??????? Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "?????????? ?????????? ??? ???????????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "???????? ???????: %s"
@@ -3390,7 +3405,8 @@ msgstr "_??????:"
 msgid "_Password:"
 msgstr "_??????:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "?????????? IRC ?? ??????? ??????? ??????"
 
 #. 1. connect to server
@@ -3885,6 +3901,9 @@ msgstr "?????? ?? ???????
 msgid "Server does not use any supported authentication method"
 msgstr "?????? ?? ???????????? ??????? ?????????????? ?????? ?????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "???????????? ????? ? ???????"
 
@@ -4183,6 +4202,14 @@ msgstr "??????"
 msgid "Resource"
 msgstr "??????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?? ? ??????"
+
 msgid "Middle Name"
 msgstr "????????"
 
@@ -4357,10 +4384,19 @@ msgstr "?????? ???????"
 msgid "Find Rooms"
 msgstr "?????? ???????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "???????????? ?????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??????"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "????????? ?????"
 
@@ -4381,7 +4417,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?? ???????? ?'???????? ? ????????."
 
 #, c-format
@@ -4410,9 +4446,6 @@ msgstr "?????????? ?????? msgid "Unregistration Failed"
 msgstr "?????????? ??????????? ???????"
 
-msgid "Already Registered"
-msgstr "??? ?????????????"
-
 msgid "State"
 msgstr "???????"
 
@@ -4426,6 +4459,9 @@ msgstr "????"
 msgid "Date"
 msgstr "????"
 
+msgid "Already Registered"
+msgstr "??? ?????????????"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "?????????????"
@@ -4458,6 +4494,10 @@ msgstr "??????? ????????? msgstr "??????? ??????????"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?? ???????? ?'???????? ? ????????."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "??????? ????? ?????????? ??? ????????? ?????"
 
@@ -4837,13 +4877,13 @@ msgid ""
 msgstr "ban &lt;??????????&gt; [???????]: ?????????? ??????????? ? ???????."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4914,6 +4954,9 @@ msgstr "???? ??????????? 
 msgid "File transfer proxies"
 msgstr "???? ??????????? ??????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5330,6 +5373,10 @@ msgstr "???????? ???????"
 msgid "Non-IM Contacts"
 msgstr "???????? ???????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5718,67 +5765,29 @@ msgstr "???????? ???????? msgid "Windows Live ID authentication:Invalid response"
 msgstr "???????? ????????????? ??????????? ????????!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s ?? ? ?????????? ?????? ?????."
-
-msgid "Unknown error."
-msgstr "???????? ???????."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?? %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ????? ????????? ??? ????"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "???????? ???????"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "?? ???????? ?????????? ??????????? %s"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "???????? ???????"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "?? ???????? ?????? ??????????? %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "?? ???????? ??????????? ??????????? %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "?? ???????? ????????? ??????????? %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "?? ???????? ?????? %s, ???? ?? ?????? ????????? ??????."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ?? ? ?????????? ?????????? ????????? ???????."
-
 #, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "?????? ????????? ??????????"
-
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "????????? ????????? ????????????, ???? ?? ?????????? ?? ? ??????:"
 
-msgid "Unable to rename group"
-msgstr "?? ???????? ????????????? ?????"
-
-msgid "Unable to delete group"
-msgstr "?? ???????? ???????? ?????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5870,6 +5879,9 @@ msgstr ""
 "?????? ????????? MSN ????????? ???????????. ?????????, ?? ??????? ????????? "
 "?? ???."
 
+msgid "Unknown error."
+msgstr "???????? ???????."
+
 msgid "Handshaking"
 msgstr "???????????? ?'???????"
 
@@ -5888,6 +5900,14 @@ msgstr "???????????? ???? msgid "Retrieving buddy list"
 msgstr "???????????? ?????? ?????????"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "???????? ??? ????'?????"
 
@@ -5925,14 +5945,6 @@ msgstr "????????? ??????? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "????????? ????????? ???????????? ????? ???????? ???????:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "?????????? %s ????? ?????? %s ?? ???????? ?????? ?????????."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "?????????? %s ????? ?????? %s ?? ???????? ?????? ?????????."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "?????? ?? ???????? ?????"
@@ -5966,6 +5978,52 @@ msgstr "?????? ????????? 
 msgstr "?????? ????????? AIM/ICQ"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ?? ? ?????????? ?????? ?????."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "?? ???????? ?????? ??????????? %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "?? ???????? ??????????? ??????????? %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "?? ???????? ????????? ??????????? %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "?? ???????? ?????? %s, ???? ?? ?????? ????????? ??????."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ?? ? ?????????? ?????????? ????????? ???????."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "?????? ????????? ??????????"
+
+msgid "Unable to rename group"
+msgstr "?? ???????? ????????????? ?????"
+
+msgid "Unable to delete group"
+msgstr "?? ???????? ???????? ?????"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "?????????? %s ????? ?????? %s ?? ???????? ?????? ?????????."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "?????????? %s ????? ?????? %s ?? ???????? ?????? ?????????."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -6000,6 +6058,8 @@ msgstr "??? ???? ???'????? msgstr "??? ???? ???'?????? ? ????????."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "???? ???????????? ??? ???????????"
@@ -6051,12 +6111,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "??????????? ?????????? ??? ??????."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6397,10 +6460,6 @@ msgstr "???????? ????? ??
 msgstr "???????? ????? ?? ????????????"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "??????????? ?????????? ??? ??????."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "?? ???????? ????????? ????? ????????? ????? ???????????"
 
@@ -6625,6 +6684,28 @@ msgstr "???? ???????"
 msgstr "???? ???????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "??????????? ????????? ??? ???????."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?? ??????? ????? ?'????????? ?? ???'?????????. ????????? 10 ?????? ?? "
+"????????? ?????. ???? ?? ?????????? ??????, ??? ?????????? ?????? ?? ?????."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "??????? ??? ????????? ?'???????"
+
+msgid "Incorrect password."
+msgstr "???????????? ??????."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "?? ???????? ?????????? ?'???????"
 
@@ -6926,15 +7007,38 @@ msgstr ""
 "?????? ?? ??????? ??????? ???? ??????, ????? ?? ???????, ??? ? ??????? "
 "??????? ???? ?????."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"????????? ?? ?????? ???? ???'??????. ???????, ?? ???????? ??????????? TOC, "
+"???? ?? ?? ???? ??????????. ????????? ????????? ?? %s."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin ?? ???????? ???????? ?????????? ??? ????? AIM."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"????????? ?? ?????? ???? ???'??????. ???????, ?? ???????? ??????????? TOC, "
+"???? ?? ?? ???? ??????????. ????????? ????????? ?? %s."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin ?? ???????? ???????? ?????????? ??? ?????."
+
+msgid "Could Not Connect"
+msgstr "?? ???????? ?'????????"
+
+msgid "Received authorization"
+msgstr "???????? ???????????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "??????????? ??'? ???????????"
 
-msgid "Incorrect password."
-msgstr "???????????? ??????."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "??? ????????? ????? ?????? ????????????."
@@ -6943,25 +7047,19 @@ msgstr "?????? ???????? ?
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????? ???????? ??????????? AOL ????????? ??????????."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "?? ?????????????? ??????? ?????? ???????. ???????? ?? %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "?? ??????? ????? ?'????????? ?? ???'?????????. ????????? 10 ?????? ?? "
 "????????? ?????. ???? ?? ?????????? ??????, ??? ?????????? ?????? ?? ?????."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "?? ?????????????? ??????? ?????? ???????. ???????? ?? %s"
-
-msgid "Could Not Connect"
-msgstr "?? ???????? ?'????????"
-
-msgid "Received authorization"
-msgstr "???????? ???????????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???? SecurID - ????????????."
 
@@ -6978,26 +7076,6 @@ msgstr "??????"
 msgid "_OK"
 msgstr "??????"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"????????? ?? ?????? ???? ???'??????. ???????, ?? ???????? ??????????? TOC, "
-"???? ?? ?? ???? ??????????. ????????? ????????? ?? %s."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin ?? ???????? ???????? ?????????? ??? ????? AIM."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"????????? ?? ?????? ???? ???'??????. ???????, ?? ???????? ??????????? TOC, "
-"???? ?? ?? ???? ??????????. ????????? ????????? ?? %s."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin ?? ???????? ???????? ?????????? ??? ?????."
-
 msgid "Password sent"
 msgstr "?????? ???????????"
 
@@ -7533,6 +7611,7 @@ msgstr "?????????? ?????? msgid "Set User Info (web)..."
 msgstr "?????????? ?????????? ??? ???????????(URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "??????? ?????? (URL)"
@@ -7568,6 +7647,10 @@ msgstr "?????? ?????????? msgid "Search for Buddy by Information"
 msgstr "?????? ??????????? ?? ???????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "?????????? ?? ? ??????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -10008,10 +10091,6 @@ msgstr "???????????"
 msgid "Auth Domain"
 msgstr "???????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10036,6 +10115,42 @@ msgstr "? ????????? ?????
 msgid "Add buddy rejected"
 msgstr "? ????????? ??????????? ??????????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "?? ???????? ?????????? SSL-?'??????? ? ????????."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "???????????? ??????."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"???????? ??????? ? ??????? %d. ???? ? ???-???????? Yahoo! ???? ?? ?????????."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "?????????? ?? ?????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"???????? ??????? ? ??????? %d. ???? ? ???-???????? Yahoo! ???? ?? ?????????."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??????????? ?????????? ??? ??????."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10152,9 +10267,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "?????????? ???? ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "?? ???? ??????????? ? ????????"
@@ -10984,8 +11098,8 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "??????? ??????"
+msgid "A_ccount"
+msgstr "????????? ?????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10994,8 +11108,9 @@ msgstr ""
 "??????? ?????????? ?????????? ??? ???????, ?? ????? ?? ?????? ? "
 "???????????.\n"
 
-msgid "_Account:"
-msgstr "_????????? ?????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "??????? ??????"
 
 #, fuzzy
 msgid "_Block"
@@ -11491,6 +11606,117 @@ msgstr "/????????/???????
 msgid "/Buddies/Sort Buddies"
 msgstr "/????????/?????????? ????????? ????????????"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "????? ???"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "??????? ?????? ??? ??????? ? ?????? ??????????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "?? ? ??????"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????? ???"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_??????????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "????? ??????? ???"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_????????"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "????? ??????? ???"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "?????????? ??????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "? ??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "???????? ?????????? ??? ???????? ???????????"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "?????????? ????????"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "???????? ?????????? ??? ???????? ???????????"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "?? ? ??????"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "???????? ?????????? ??? ???????? ???????????"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "???????"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "???????? ?????????? ??? ???????? ???????????"
+
+msgid "Message Text"
+msgstr "????? ????????????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "????? ????????????"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "????? ?????????? ??? %s"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -12035,6 +12261,10 @@ msgstr "????????"
 msgstr "????????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "?????????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "???????????"
 
@@ -12140,6 +12370,9 @@ msgstr "????????"
 msgid "Swedish"
 msgstr "????????"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "????????"
@@ -12593,11 +12826,10 @@ msgstr "?????????? ?????? msgid "Save Image"
 msgstr "?????????? ??????????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "?_??????? ??????????..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "???????? ????????? ??? ???????????"
 
@@ -12688,10 +12920,6 @@ msgstr "??? ??????"
 msgstr "??? ??????"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "????? ???"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "????? ??????"
 
@@ -13017,6 +13245,9 @@ msgstr "?? ??? ??????????
 msgid "Pounce on Whom"
 msgstr "?? ??? ??????????"
 
+msgid "_Account:"
+msgstr "_????????? ?????:"
+
 msgid "_Buddy name:"
 msgstr "?_?'? ???????????:"
 
@@ -13141,9 +13372,16 @@ msgstr "???????? ????? ??
 msgid "Unknown.... Please report this!"
 msgstr "???????? ????? ????????. ?????????? ??? ??!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?? ???????? ???????? ??????????: %s\n"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13751,6 +13989,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "??????? ???????????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13989,6 +14231,78 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "?????? ???????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "?????? ?? ?????? ???????????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "???????? ?????? ??????????? ??? ??????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "??????? ??????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "?????????? ?????? ?????????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??? ???????????"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_??????:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????? ?????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>????:</b> ?????????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "?????????? ?????????? ????????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_???-??????????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "?????????? ?? ?????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "?????? ?? ???????????? ??????? ?????????????? ?????? ?????????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "?????????? ?????????? ????????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "?????????? ???????????:"
 
@@ -14518,12 +14832,6 @@ msgstr ""
 "- ?????????? ???? ??????? ?????\n"
 "- ?????????? ???????????? ???????????? ? ?????? ?????? ???? ???? ???????"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "????? ??????????????"
@@ -14536,6 +14844,10 @@ msgstr "?????????? ?????? msgid "Highlighted Message Name Color"
 msgstr "?????????? ????????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "????????? ?????????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14570,37 +14882,25 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "?????????? _???????"
+msgid "Disable Typing Notification Text"
+msgstr "?????????? ??? ???? ?????"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "????????? Pidgin ? ?????"
 
 #, fuzzy
+msgid "Colors"
+msgstr "???????"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "???????? ??????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "????????? Pidgin ? ?????"
@@ -14750,12 +15050,119 @@ msgstr ""
 "??????? ????? ? ???????? ????????????? ?????? ????????, ?? ??????????? "
 "????????????."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "?? ? ??????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s ?? ? ??????."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "??????????? ?? ???????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "??????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "??????????? ????????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "???????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??????????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "????????????? ?????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "?????? ????????????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "????: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "?????? ??????? ??????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "?????????? ??????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "????????? Pidgin ? ?????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "???? ??? ????????? ?????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "?????? ?????????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "?????? ?????????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "????????? Pidgin ? ?????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "????????? Pidgin ? ?????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "????? ?????????"
 
@@ -14973,6 +15380,14 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "?????????? ???? ID?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "?????????? _???????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "???????????? ??? ?????"
 
@@ -15470,10 +15885,6 @@ msgstr ""
 #~ msgstr "??????????? %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "??????? ?????? ??? ??????? ? ?????? ??????????"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "??????? ??? ?????? ? ??????"
 
@@ -15482,10 +15893,6 @@ msgstr ""
 #~ msgstr "%s ?????? ?? ? ??????."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "??????? ??? ????????? ?'???????"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "?? ???????? ?????? ? ?????? AIM"
 
@@ -15611,10 +16018,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_????????????:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "????????? ?????:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "?????? ??????? ??????? ?'???????"
 
@@ -15777,13 +16180,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>??????:</b> ?? ? ??????"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>????:</b> ?????????"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -16458,9 +16854,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "?????????? ???????????? ?? ???????? ???????????"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "???????? ?????????? ??? ???????? ???????????"
-
 #~ msgid "_Chat"
 #~ msgstr "_???????"
 
@@ -16672,9 +17065,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "????????"
 
-#~ msgid "Message Text"
-#~ msgstr "????? ????????????"
-
 #~ msgid "Away Messages"
 #~ msgstr "???????????? ??? ???????????"
 
@@ -16777,9 +17167,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "???????? ??????? ? ?????????? GG\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "?? ???????? ?????????? ??????????? ???????"
-
 #~ msgid "Send as message"
 #~ msgstr "????????? ?? ????????????"
 
@@ -16992,9 +17379,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s ? ??????."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s ?? ? ??????."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
============================================================
--- po/ur.po	beb882bb75726bdd63feac129283c1112e2e9175
+++ po/ur.po	e2e3d9ab497f398c0bc7cfcfd0b285676aca0f87
@@ -6,7 +6,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin Urdu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-11-14 14:00+0530\n"
 "Last-Translator: RKVS Raman <raman at cdacbangalore.in>\n"
 "Language-Team: C-DAC,Gist,Urdu Team / BharateeyaOO.o <info.gist at cdac.in / "
@@ -1827,6 +1827,8 @@ msgstr "+++ %s???? ?? ?????"
 msgid "+++ %s signed off"
 msgstr "+++ %s???? ?? ?????"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "??????? ???? "
 
@@ -2228,6 +2230,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "???? ????? ???? ????? ??"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "?? %s ?? ??????? ????? ??? ? ????  ?? ??? ??  %s. ???? ???? ???"
@@ -3209,6 +3215,11 @@ msgstr "????? - ???:"
 msgid "Chat _name:"
 msgstr "????? - ???:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "??????????? ???? ??? ?? ?? ???"
+
 msgid "Chat error"
 msgstr "????? ????"
 
@@ -3257,6 +3268,10 @@ msgstr "??? - ??? ????"
 msgid "Gadu-Gadu User"
 msgstr "??? - ??? ????"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???? ??????? ??? ??????"
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?? ????? ?????:%s"
@@ -3300,7 +3315,8 @@ msgstr "???? ???:"
 msgid "_Password:"
 msgstr "???? ???:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC??? ???? ????? ?? ?????? ???? ????"
 
 #. 1. connect to server
@@ -3779,6 +3795,9 @@ msgstr "???? ???? ????? ?? msgid "Server does not use any supported authentication method"
 msgstr "???? ???? ????? ????? ?? ????? ??????? ???? ????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "???? ?? ??? ????? ??????"
 
@@ -4079,6 +4098,14 @@ msgstr "????"
 msgid "Resource"
 msgstr "????"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???? ??"
+
 msgid "Middle Name"
 msgstr "??????? ???"
 
@@ -4250,10 +4277,19 @@ msgstr "???? ???? ???"
 msgid "Find Rooms"
 msgstr "???? ???? ???"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "?????:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "???? ????? ?????? ???? ???"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "???"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "???? ???"
 
@@ -4274,7 +4310,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "???? ?? ????? ???? ??? ??????"
 
 #, c-format
@@ -4303,9 +4339,6 @@ msgstr "???????? ?? ??? ?? msgid "Unregistration Failed"
 msgstr "???????? ?? ??? ???"
 
-msgid "Already Registered"
-msgstr "???? ?? ????? ??? ???"
-
 msgid "State"
 msgstr "?????"
 
@@ -4318,6 +4351,9 @@ msgstr "?????"
 msgid "Date"
 msgstr "?????"
 
+msgid "Already Registered"
+msgstr "???? ?? ????? ??? ???"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "?????"
@@ -4350,6 +4386,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "???? ?? ????? ???? ??? ??????"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "???? ????? ????? ?? ?????? ???????"
 
@@ -4726,16 +4766,18 @@ msgstr "??? &???????&gt? [?? msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "??? &???????&gt? [????]:  ???? ?? ???? ?? ??? ???? "
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "???? &???????&gt? &???owner|admin|member|outcast|none&gt?:???? ?? ???? ???? "
 "?? ???? ??? ?????"
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4803,6 +4845,9 @@ msgstr " ???? ??????? ???? msgid "File transfer proxies"
 msgstr " ???? ??????? ????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5211,6 +5256,10 @@ msgstr "????? ????"
 msgid "Non-IM Contacts"
 msgstr "????? ????"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5572,66 +5621,29 @@ msgstr "??? ????? ????? ?? msgstr "??? ????? ????? ????!"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ????? ???? ???? ???"
-
-msgid "Unknown error."
-msgstr "?? ????? ?????"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s ?? %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s?? ???? ?? ?? ?? ?????!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
+msgstr "?? ????? ????:0x%X"
 
 # msgstr "??????? ???? "
 msgid "Unable to add user"
 msgstr "???? ?????? ???? ??? ????????"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr ""
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "?????? ??? ?? ?? ???? ?? ????? ???"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr " %s (%s)?????? ???? ???? ??? ?? ???? "
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr " %s (%s) ?? ???? ?? ???? ???? ??? ?? ????"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr " %s (%s)?? ???? ?? ????? ???? ???  ??????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s??? ???? ??? ??? ??? ?? ?? ??? ????? ?? ????? ???"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s????? ??????? ?????? ???? ???"
-
-msgid "Service Temporarily Unavailable."
-msgstr "???? ????? ?????????????? ???"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "???? ???? ??????? ????????? ??? ?????????? ??????:"
 
-msgid "Unable to rename group"
-msgstr "???? ?? ?????? ???  ???? ??? ??????"
-
-msgid "Unable to delete group"
-msgstr "???? ?? ????  ???? ??? ??????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5721,6 +5733,9 @@ msgstr ""
 "?? ?? MSN  ??? ????? ????? ??? ?? ??? ?????? ??? ???? ??? ?????? ???? ??? "
 "?????? ???? ?????"
 
+msgid "Unknown error."
+msgstr "?? ????? ?????"
+
 msgid "Handshaking"
 msgstr "?????? ????"
 
@@ -5739,6 +5754,14 @@ msgstr "??? ????? ?????? ? msgid "Retrieving buddy list"
 msgstr "??? ????? ?????? ???? ????? ??"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "??????? ?? ??? ???"
 
@@ -5775,14 +5798,6 @@ msgstr "???? ???? ????? ?? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "???? ???? ????? ?? ??? ?????? ?? ????? ???? ???? ?????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s?? ?? ?????? ??? ??? ??? ???? ??????"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s?? ?? ?????? ??? ??? ?????? ??????"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "?????? ?? ??? ????"
@@ -5815,6 +5830,51 @@ msgstr "MSN  ????? ??? ??? ?
 msgstr "MSN  ????? ??? ??? ??"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ????? ???? ???? ???"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ?? %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr " %s (%s)?????? ???? ???? ??? ?? ???? "
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr " %s (%s) ?? ???? ?? ???? ???? ??? ?? ????"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr " %s (%s)?? ???? ?? ????? ???? ???  ??????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s??? ???? ??? ??? ??? ?? ?? ??? ????? ?? ????? ???"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s????? ??????? ?????? ???? ???"
+
+msgid "Service Temporarily Unavailable."
+msgstr "???? ????? ?????????????? ???"
+
+msgid "Unable to rename group"
+msgstr "???? ?? ?????? ???  ???? ??? ??????"
+
+msgid "Unable to delete group"
+msgstr "???? ?? ????  ???? ??? ??????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s?? ?? ?????? ??? ??? ??? ???? ??????"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s?? ?? ?????? ??? ??? ?????? ??????"
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5851,6 +5911,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr " ????_  ?????"
@@ -5901,12 +5963,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "??? ???? ?????? ??? ??? ?? ????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6239,10 +6304,6 @@ msgstr "????? ????? ???? ? msgstr "????? ????? ???? ??? ??? ??? ??? ??"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "??? ???? ?????? ??? ??? ?? ????"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr " ?????? ??? ?? ????  ?? ???? ??? ?? ????? ???? ?? ???????"
 
@@ -6457,6 +6518,29 @@ msgstr "???? ????"
 msgstr "???? ????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "??? ????   HTTP ?????? ???? ?? ???? ??? ???? ???"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"?? ??? ???? ?? ????? ??? ?? ????? ????? ?????? ??? ?? ?????? ???? ??? ?????? "
+"???? ????? ??? ?? ???? ????? ?? ???? ???? ??? ??? ?? ?? ??? ????? ??? ?? "
+"????? ???? ?? ????? ???"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "???? ????? ???? ????? ??"
+
+msgid "Incorrect password."
+msgstr "??? ???? ????"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "????? ???? ?????"
 
@@ -6760,15 +6844,34 @@ msgstr ""
 "????? ????????? ??? ?? ??? ?? ???? ???? ???? ????? ?? ??? ????  ?????? ??? "
 "???????? ?? ??? ???? ?? ??????  ???"
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "?? ??? ????????????? ???????????? ???? ?? ???%s???????"
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "???? ?????AIM l??? ?? ??? ???? ???? ??? ?????? ????"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "?? ??? ????????????? ???????????? ???? ?? ???%s???????"
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "???? ???????? ?? ??? ???? ???? ??? ?????? ????"
+
+msgid "Could Not Connect"
+msgstr "????? ???? ?? ???"
+
+msgid "Received authorization"
+msgstr "??????????? ????? ???"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "?? ???? ??? "
 
-msgid "Incorrect password."
-msgstr "??? ???? ????"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "?? ?? ?????? ?? ????? ???? ?? ??? ??? ???"
@@ -6777,26 +6880,20 @@ msgstr "AOL?????? ??????? ? msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL?????? ??????? ???? ????? ??? ?? ??? ?????? ???"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "?? ??????? ????? ?????? ???? ??? ???? ?? ? ???? ???%s??? ?? ???? ????"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "?? ??? ???? ?? ????? ??? ?? ????? ????? ?????? ??? ?? ?????? ???? ??? ?????? "
 "???? ????? ??? ?? ???? ????? ?? ???? ???? ??? ??? ?? ?? ??? ????? ??? ?? "
 "????? ???? ?? ????? ???"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "?? ??????? ????? ?????? ???? ??? ???? ?? ? ???? ???%s??? ?? ???? ????"
-
-msgid "Could Not Connect"
-msgstr "????? ???? ?? ???"
-
-msgid "Received authorization"
-msgstr "??????????? ????? ???"
-
 msgid "The SecurID key entered is invalid."
 msgstr "???? ?? ??? ?????? ID???? ??? ????? ???"
 
@@ -6813,22 +6910,6 @@ msgstr "???? ??"
 msgid "_OK"
 msgstr "???? ??"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "?? ??? ????????????? ???????????? ???? ?? ???%s???????"
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "???? ?????AIM l??? ?? ??? ???? ???? ??? ?????? ????"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "?? ??? ????????????? ???????????? ???? ?? ???%s???????"
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "???? ???????? ?? ??? ???? ???? ??? ?????? ????"
-
 msgid "Password sent"
 msgstr "???? ??? ?????"
 
@@ -7340,6 +7421,7 @@ msgstr "???? ??????? ??? (
 msgid "Set User Info (web)..."
 msgstr "???? ??????? ??? (URL)???"
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "???? ???  ????? ???(URL)"
@@ -7372,6 +7454,10 @@ msgstr "??????? ?? ????? ? msgstr "??????? ?? ????? ??? ?? ??? ???? ????"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "???? ???? ?? ????"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9715,10 +9801,6 @@ msgstr "??????????"
 msgid "Auth Domain"
 msgstr "??????????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9746,6 +9828,42 @@ msgstr "????? ??? ??? ??? 
 msgid "Add buddy rejected"
 msgstr "????? ??? ??? ??? ????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "?????????? ?????? ??????????????????? ????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "???  ???? ??? ???"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"??????? ???? ???? %d??? ??! ??? ???? ??? ?????? ???? ?? ??? ??? ??? ???"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "???? ????? ????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"??????? ???? ???? %d??? ??! ??? ???? ??? ?????? ???? ?? ??? ??? ??? ???"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "??? ???? ?????? ??? ??? ?? ????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9859,9 +9977,8 @@ msgstr "?????? ????????? 
 msgid "Start Doodling"
 msgstr "?????? ????????? ????"
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "???? ?????  ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 #, fuzzy
 msgid "Join whom in chat?"
@@ -10658,8 +10775,8 @@ msgstr "???? ??? ????? ??? msgstr "???? ??? ????? ????? ?? ?? ??? ??????"
 
 #, fuzzy
-msgid "Room _List"
-msgstr "???? ?????"
+msgid "A_ccount"
+msgstr "??????:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10668,8 +10785,9 @@ msgstr ""
 "???? ??? ????? ?? ????? ???? ???? ??????? ???? ???? ?? ??? ???? ???? ????? "
 "????\n"
 
-msgid "_Account:"
-msgstr "_ ??????:"
+#, fuzzy
+msgid "Room _List"
+msgstr "???? ?????"
 
 msgid "_Block"
 msgstr "_????"
@@ -11142,6 +11260,113 @@ msgstr "/Buddies/Sort Buddies"
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Sort Buddies"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "?? ?????????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "?? ???? ?? ?? ??? ????? ?? ????? ???? ??? "
+
+#, fuzzy
+msgid "Layout"
+msgstr "??? ???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "?? ?????????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_ ????? ???"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "?? ???? ???  ????? ???"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_ ??? ???"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "?? ???? ???  ????? ???"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "?? ????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "???"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr " ?? ????  "
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??? ????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "???? ????? ???"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr " %s?? ??? ???? ??????? ????? ????"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11655,6 +11880,10 @@ msgstr "???????"
 msgstr "???????"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "?????????"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "???? ?????"
 
@@ -11758,6 +11987,9 @@ msgstr "??????"
 msgid "Swedish"
 msgstr "??????"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "????"
 
@@ -12193,11 +12425,10 @@ msgstr "???? ????? ???"
 msgid "Save Image"
 msgstr "???? ????? ???"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "???? ????? ??????"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "???? ???????? ???????"
 
@@ -12287,10 +12518,6 @@ msgstr "???? ???"
 msgstr "???? ???"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "?? ?????????"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr " ??? ???? ???? ???"
 
@@ -12639,6 +12866,9 @@ msgstr "?? ????????"
 msgid "Pounce on Whom"
 msgstr "?? ????????"
 
+msgid "_Account:"
+msgstr "_ ??????:"
+
 msgid "_Buddy name:"
 msgstr "??? ???:"
 
@@ -12750,9 +12980,18 @@ msgstr "?? ????? ???? ???? msgid "Unknown.... Please report this!"
 msgstr "?? ????? ???? ?????? ???? ??? ?? ?? ????? ????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "??????? ???? ?? ??? ???? ??? ?????"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "??????? ???? ?? ??? ???? ??? ?????"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "??????? ???? ?? ??? ???? ??? ?????"
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13335,6 +13574,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "??? ????? ???"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "?? ?????? ?? ???  ??? ??????? ??????? ?????:"
 
@@ -13590,6 +13833,76 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "???? ??????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "??????? ???? ???? ???"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??????? ?? ??? ??????? ???? ?????  ???"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "?? ???? ???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "??? ????? ?????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Goes a_way"
+
+#, fuzzy
+msgid "Directory"
+msgstr "??? ?????????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????  ??????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "?????"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "????????? ??????? ??? ???"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_??????:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "???? ????? ????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???? ???? ????? ????? ?? ????? ??????? ???? ????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "????????? ??????? ??? ???"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
 msgid "Buddy is idle"
 msgstr "???? ??? ??"
 
@@ -14103,12 +14416,6 @@ msgstr ""
 "-?? ???? ??? ???? ??? ?? ???? ???? ?? \n"
 "-?? ???? ?? ?? ?? ????? ?? ????? ?? ????? ?????? ?? ?? ?? ?? ???? ???? ??"
 
-msgid "Cursor Color"
-msgstr "???? ?? ???"
-
-msgid "Secondary Cursor Color"
-msgstr "????? ???? ???"
-
 msgid "Hyperlink Color"
 msgstr "????? ??? ???"
 
@@ -14120,6 +14427,10 @@ msgstr "???? ???? ??????"
 msgid "Highlighted Message Name Color"
 msgstr "???? ???? ??????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "?????????? ?????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Gtk??? ???? ????? ???????"
 
@@ -14149,35 +14460,24 @@ msgstr "GTK+??? ???? ?? ???? msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+??? ???? ?? ????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "??????? ???"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??? ??? ???????"
 
-msgid "Widget Sizes"
-msgstr "??????????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "????GTK+???? ??????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "??????"
+
 msgid "Fonts"
 msgstr "?????"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "???? ???? ??????"
@@ -14323,12 +14623,119 @@ msgstr ""
 "??? ???? ???? ???? ?????? ??? ?????? ???? ?? ???? ?? ????? ??? ??? ?????? "
 "????????"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???? ?? ????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "???? ?? ????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "????? ??? ???? ????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??? ?????"
+
+#, fuzzy
+msgid "Operator"
+msgstr "?????"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "??????????? ??? ???"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "????"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??? ?? ???????"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "??????? ???????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "???? ???"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr " %s???????????"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "????? ??????????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????? ????? ????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "????GTK+???? ??????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "??????? ?? ????? ?????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "???? ?????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "???? ?????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "????GTK+???? ??????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "????GTK+???? ??????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "??? ???"
 
@@ -14541,6 +14948,22 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "???? ?????  ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "???? ?? ???"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "????? ???? ???"
+
+#~ msgid "Interface colors"
+#~ msgstr "??????? ???"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "??????????"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "???? ??? ???? ???"
 
@@ -15023,9 +15446,6 @@ msgstr ""
 #~ msgstr ""
 #~ "????%d  ????? ???? ?? ???  ?? ?? ???????admin %d ?? ???? ?? ???? ???"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "?? ???? ?? ?? ??? ????? ?? ????? ???? ??? "
-
 #~ msgid "I am applying to join"
 #~ msgstr "???  ??  ????? ???? ?? ??? ???? ??? ??"
 
@@ -15046,10 +15466,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "?? ?? ??? ???? ?????:"
 
-#, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "???? ????? ???? ????? ??"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "??? ?? ???? ?? ????? ?? ?? ??? ??????"
 
@@ -15100,10 +15516,6 @@ msgstr ""
 #~ "?????? ??? ?? ??? ??? ????? ?? ???? ?? ?? ??? ???? ???\n"
 
 #, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "??????:"
-
-#, fuzzy
 #~ msgid "_Screen name:"
 #~ msgstr "?????? ?? ???:"
 
============================================================
--- po/vi.po	46704521128658847007f431b0895eb7fb7f8c28
+++ po/vi.po	b29fb1a2b2bcfa34ce74825cd3f3e914acac8e9e
@@ -12,7 +12,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: CVS Version of Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:40-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2008-06-22 21:58+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -1775,6 +1775,8 @@ msgstr "+++ %s ?? ??ng xu?t"
 msgid "+++ %s signed off"
 msgstr "+++ %s ?? ??ng xu?t"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "L?i kh?ng r?"
 
@@ -2175,6 +2177,10 @@ msgstr "(%s) %s <Tr? L?i-T? ??n
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Tr? L?i-T? ??ng>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "L?i khi t?o k?t n?i"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "B?n ?ang s? d?ng %s, c?n ph?n b? sung n?y c?n thi?t %s."
@@ -3156,6 +3162,11 @@ msgstr "T?_n ch?t:"
 msgid "Chat _name:"
 msgstr "T?_n ch?t:"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "Kh?ng th? k?t n?i ??n m?y ph?c v?."
+
 msgid "Chat error"
 msgstr "L?i ch?t"
 
@@ -3205,6 +3216,10 @@ msgstr "Ng??i d?ng Gadu-Gadu"
 msgid "Gadu-Gadu User"
 msgstr "Ng??i d?ng Gadu-Gadu"
 
+#, fuzzy
+msgid "GG server"
+msgstr "L?p th?ng tin ng??i d?ng..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "L?nh kh?ng r? : %s"
@@ -3248,7 +3263,8 @@ msgstr "_M?t kh?u :"
 msgid "_Password:"
 msgstr "_M?t kh?u :"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "T?n hi?u cho IRC kh?ng ???c ch?a d?u c?ch"
 
 #. 1. connect to server
@@ -3726,6 +3742,9 @@ msgstr "M?y ph?c v? kh?ng s? d? msgid "Server does not use any supported authentication method"
 msgstr "M?y ph?c v? kh?ng s? d?ng b?t k? ph??ng th?c x?c th?c ???c h? tr? n?o"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "B?n c?n m?t m?, nh?ng m?y ph?c v? n?y kh?ng cung c?p."
+
 msgid "Invalid challenge from server"
 msgstr "Ki?m tra t? m?y ph?c v? kh?ng h?p l?"
 
@@ -3996,6 +4015,14 @@ msgstr "T?i nguy?n"
 msgid "Resource"
 msgstr "T?i nguy?n"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "?? ??ng xu?t"
+
 msgid "Middle Name"
 msgstr "T?n ??m"
 
@@ -4164,9 +4191,18 @@ msgstr "T?m ph?ng"
 msgid "Find Rooms"
 msgstr "T?m ph?ng"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "B?n c?n m?t m?, nh?ng m?y ph?c v? n?y kh?ng cung c?p."
+#, fuzzy
+msgid "Affiliations:"
+msgstr "B? danh:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "Kh?ng t?m th?y ng??i d?ng t??ng ?ng"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "V? tr?"
+
 msgid "Ping timeout"
 msgstr "Qu? h?n ping"
 
@@ -4186,7 +4222,7 @@ msgstr "ID XMPP kh?ng h?p l?. Ph?
 msgstr "ID XMPP kh?ng h?p l?. Ph?i ??t mi?n (domain)."
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Kh?ng k?t n?i ???c v?i m?y ph?c v?."
 
 #, c-format
@@ -4213,9 +4249,6 @@ msgstr "L?i h?y ??ng k?"
 msgid "Unregistration Failed"
 msgstr "L?i h?y ??ng k?"
 
-msgid "Already Registered"
-msgstr "?? ??ng k?"
-
 msgid "State"
 msgstr "Bang"
 
@@ -4228,6 +4261,9 @@ msgstr "Ng?y th?ng"
 msgid "Date"
 msgstr "Ng?y th?ng"
 
+msgid "Already Registered"
+msgstr "?? ??ng k?"
+
 msgid "Unregister"
 msgstr "H?y ??ng k?"
 
@@ -4255,6 +4291,10 @@ msgstr "??i s? ??ng k?"
 msgid "Change Registration"
 msgstr "??i s? ??ng k?"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Kh?ng k?t n?i ???c v?i m?y ph?c v?."
+
 msgid "Error unregistering account"
 msgstr "L?i h?y ??ng k? t?i kho?n"
 
@@ -4620,9 +4660,10 @@ msgstr "ban &lt;ng??i_d?ng&gt; [l?_
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;ng??i_d?ng&gt; [l?_do]:  C?m m?t ng??i d?ng ra kh?i ph?ng."
 
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;ng??i_d?ng&gt; &lt;owner|admin|member|outcast|none&gt;: ??t t? "
 "c?ch ng??i d?ng trong ph?ng\n"
@@ -4632,9 +4673,10 @@ msgstr ""
 " o outcast\tng??i b? ru?ng b?\n"
 " o none\t\tkh?ng c?."
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;ng??i_d?ng&gt; &lt;moderator|participant|visitor|none&gt;: ??t "
 "nghi?m v? c?a ng??i d?ng trong ph?ng\n"
@@ -4704,6 +4746,9 @@ msgstr "?y nhi?m truy?n t?p tin"
 msgid "File transfer proxies"
 msgstr "?y nhi?m truy?n t?p tin"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5107,6 +5152,10 @@ msgstr "B? li?n l?c"
 msgid "Non-IM Contacts"
 msgstr "B? li?n l?c"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s m?i b?n xem m?y ?nh Web, m? ch?a ???c h? tr?."
+
 msgid "Nudge"
 msgstr "L?m n?i b?t"
 
@@ -5457,65 +5506,28 @@ msgstr "X?c th?c ID Windows Live: kh? msgstr "X?c th?c ID Windows Live: kh?ng th? k?t n?i"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s kh?ng ph?i l? nh?m h?p l?."
-
-msgid "Unknown error."
-msgstr "L?i kh?ng r?."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s tr?n %s (%s)"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s v?a g?i cho b?n m?t l?i k?u g?i."
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "L?i kh?ng r? (%d)"
 
 msgid "Unable to add user"
 msgstr "Kh?ng th? th?m ng??i d?ng"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "L?i kh?ng r? (%d)"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "D??i ??y l? k?t qu? t?m ki?m"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Kh?ng th? th?m ng??i d?ng tr?n %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Kh?ng th? ch?n ng??i d?ng tr?n %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Kh?ng th? cho ph?p ng??i d?ng tr?n %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s kh?ng th? ???c th?m v?o v? danh s?ch b?n b? c?a b?n ?? ??y"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s kh?ng ph?i t?i kho?n Passport h?p l?."
-
-msgid "Service Temporarily Unavailable."
-msgstr "T?m th?i kh?ng c? d?ch v?."
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Tin nh?n ch?a g?i ?i ???c v? b?n ch?a ??ng nh?p."
 
-msgid "Unable to rename group"
-msgstr "Kh?ng th? thay ??i t?n c?a nh?m"
-
-msgid "Unable to delete group"
-msgstr "Kh?ng th? xo? nh?m"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5597,6 +5609,9 @@ msgstr ""
 "Danh s?ch b?n b? MSN c?a b?n t?m th?i kh?ng d?ng ???c. Vui l?ng ch? v? th? "
 "l?i l?n n?a."
 
+msgid "Unknown error."
+msgstr "L?i kh?ng r?."
+
 msgid "Handshaking"
 msgstr "?ang thi?t l?p quan h?"
 
@@ -5615,6 +5630,14 @@ msgstr "?ang l?y danh s?ch b?n b?
 msgid "Retrieving buddy list"
 msgstr "?ang l?y danh s?ch b?n b?"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s m?i b?n xem m?y ?nh Web, m? ch?a ???c h? tr?."
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s m?i b?n xem m?y ?nh Web, m? ch?a ???c h? tr?."
+
 msgid "Away From Computer"
 msgstr "R?i kh?i m?y t?nh"
 
@@ -5653,14 +5676,6 @@ msgstr "Th?ng ?i?p kh?ng g?i ?i 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Th?ng ?i?p kh?ng g?i ?i ???c v? c? l?i kh?ng r? :"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?? th?m b?n v?o danh s?ch b?n b?."
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ?? lo?i b? b?n ra kh?i danh s?ch b?n b?."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Th?m v?o s? ??a ch?"
@@ -5692,6 +5707,51 @@ msgstr "Ph?n b? sung giao th?c MSN
 msgstr "Ph?n b? sung giao th?c MSN"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s kh?ng ph?i l? nh?m h?p l?."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s tr?n %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Kh?ng th? th?m ng??i d?ng tr?n %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Kh?ng th? ch?n ng??i d?ng tr?n %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Kh?ng th? cho ph?p ng??i d?ng tr?n %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s kh?ng th? ???c th?m v?o v? danh s?ch b?n b? c?a b?n ?? ??y"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s kh?ng ph?i t?i kho?n Passport h?p l?."
+
+msgid "Service Temporarily Unavailable."
+msgstr "T?m th?i kh?ng c? d?ch v?."
+
+msgid "Unable to rename group"
+msgstr "Kh?ng th? thay ??i t?n c?a nh?m"
+
+msgid "Unable to delete group"
+msgstr "Kh?ng th? xo? nh?m"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?? th?m b?n v?o danh s?ch b?n b?."
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ?? lo?i b? b?n ra kh?i danh s?ch b?n b?."
+
+#, c-format
 msgid "No such user: %s"
 msgstr "Kh?ng c? ng??i d?ng nh? v?y: %s"
 
@@ -5725,6 +5785,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "Th? t?n m?i"
 
@@ -5771,17 +5833,19 @@ msgstr "L?i giao th?c, m? %d: %s"
 msgid "Protocol error, code %d: %s"
 msgstr "L?i giao th?c, m? %d: %s"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s B?n ?? ??t m?t m?t kh?u ch?a %d k? t?, v??t qu? chi?u d?i t?i ?a mong ??i "
 "%d ? MySpaceIM. H?y c?t ng?n m?t kh?u ? ??a ch? << http://profileedit.myspace."
 "com/index.cfm?fuseaction=accountSettings.changePassword >>, r?i th? l?i."
 
+msgid "Incorrect username or password"
+msgstr "T?n ng??i d?ng ho?c m?t kh?u sai"
+
 msgid "MySpaceIM Error"
 msgstr "L?i MySpaceIM"
 
@@ -6098,9 +6162,6 @@ msgstr "Kho l?u ch? sai c?u h?nh"
 msgid "Master archive is misconfigured"
 msgstr "Kho l?u ch? sai c?u h?nh"
 
-msgid "Incorrect username or password"
-msgstr "T?n ng??i d?ng ho?c m?t kh?u sai"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kh?ng th? nh?n ra m?y c?a t?n ng??i d?ng b?n v?a nh?p v?o"
 
@@ -6314,6 +6375,28 @@ msgstr "C?ng m?y ph?c v?"
 msgid "Server port"
 msgstr "C?ng m?y ph?c v?"
 
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "Nh?n ???c ??p ?ng HTTP b?t th??ng t? m?y ph?c v?."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"B?n ?? li?n t?c k?t n?i v? ng?t k?t n?i qu? nhi?u. Xin ch? 10 ph?t r?i th? "
+"l?i. N?u b?n ti?p t?c k?t n?i, b?n s? ph?i ??i l?u h?n."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "L?i y?u c?u hi?u b?i ??ng nh?p"
+
+msgid "Incorrect password."
+msgstr "M?t kh?u sai."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "Kh?ng th? tham gia ph?ng tr? chuy?n"
 
@@ -6620,14 +6703,33 @@ msgstr ""
 "m?t ch? c?i v? ch? ch?a ch? c?i, ch? s? v? kho?ng tr?ng, ho?c ch? ch?a ch? "
 "s?."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"B?n c? th? b? ng?t k?t n?i m?t th?i gian ng?n. H?y ki?m tra %s ?? c?p nh?t."
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kh?ng th? l?y m? ??ng nh?p AIM h?p l?."
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"B?n c? th? b? ng?t k?t n?i m?t th?i gian ng?n. H?y ki?m tra %s ?? c?p nh?t."
+
+msgid "Unable to get a valid login hash."
+msgstr "Kh?ng th? l?y m? ??ng nh?p h?p l?."
+
+msgid "Could Not Connect"
+msgstr "Kh?ng th? k?t n?i"
+
+msgid "Received authorization"
+msgstr "Nh?n ???c s? cho ph?p"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "T?n ng??i d?ng sai."
 
-msgid "Incorrect password."
-msgstr "M?t kh?u sai."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "T?i kho?n c?a b?n t?m th?i b? ??nh ch?."
@@ -6636,25 +6738,19 @@ msgstr "T?m th?i kh?ng d?ng ??? msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "T?m th?i kh?ng d?ng ???c D?ch V? Nh?n Tin Nhanh AOL."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "B?n ?ang d?ng phi?n b?n tr?nh kh?ch qu? c?. H?y n?ng c?p t?i %s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "B?n ?? li?n t?c k?t n?i v? ng?t k?t n?i qu? nhi?u. Xin ch? 10 ph?t r?i th? "
 "l?i. N?u b?n ti?p t?c k?t n?i, b?n s? ph?i ??i l?u h?n."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "B?n ?ang d?ng phi?n b?n tr?nh kh?ch qu? c?. H?y n?ng c?p t?i %s"
-
-msgid "Could Not Connect"
-msgstr "Kh?ng th? k?t n?i"
-
-msgid "Received authorization"
-msgstr "Nh?n ???c s? cho ph?p"
-
 # SecurID l? t?n: ??ng d?ch
 msgid "The SecurID key entered is invalid."
 msgstr "Kho? SecurID nh?p v?o kh?ng h?p l?."
@@ -6671,22 +6767,6 @@ msgstr "_OK"
 msgid "_OK"
 msgstr "_OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"B?n c? th? b? ng?t k?t n?i m?t th?i gian ng?n. H?y ki?m tra %s ?? c?p nh?t."
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "Kh?ng th? l?y m? ??ng nh?p AIM h?p l?."
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"B?n c? th? b? ng?t k?t n?i m?t th?i gian ng?n. H?y ki?m tra %s ?? c?p nh?t."
-
-msgid "Unable to get a valid login hash."
-msgstr "Kh?ng th? l?y m? ??ng nh?p h?p l?."
-
 msgid "Password sent"
 msgstr "?? g?i m?t kh?u"
 
@@ -7172,6 +7252,7 @@ msgstr "??t th?ng tin ng??i d?ng
 msgid "Set User Info (web)..."
 msgstr "??t th?ng tin ng??i d?ng (Web)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "??i m?t kh?u (Web)"
 
@@ -7201,6 +7282,10 @@ msgstr "T?m ki?m b?n ch?t theo th? msgid "Search for Buddy by Information"
 msgstr "T?m ki?m b?n ch?t theo th?ng tin"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Ng??i d?ng ch?a ??ng nh?p"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9558,10 +9643,6 @@ msgstr "X?c th?c mi?n"
 msgid "Auth Domain"
 msgstr "X?c th?c mi?n"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s m?i b?n xem m?y ?nh Web, m? ch?a ???c h? tr?."
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9589,6 +9670,44 @@ msgstr "Th?m b?n ch?t b? t? ch? msgid "Add buddy rejected"
 msgstr "Th?m b?n ch?t b? t? ch?i"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Nh?n d? li?u kh?ng h?p l? khi k?t n?i t?i m?y ph?c v?."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "M?t kh?u sai"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"M? l?i kh?ng r? %d. ??ng nh?p v?o ??a ch? Web c?a Yahoo c? th? gi?p kh?c "
+"ph?c."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Ng??i d?ng ?? kh?ng t?n t?i."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"M? l?i kh?ng r? %d. ??ng nh?p v?o ??a ch? Web c?a Yahoo c? th? gi?p kh?c "
+"ph?c."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "T?n ng??i d?ng ho?c m?t kh?u sai"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9702,8 +9821,8 @@ msgstr "B?t ??u v?"
 msgid "Start Doodling"
 msgstr "B?t ??u v?"
 
-msgid "Activate which ID?"
-msgstr "K?ch ho?t ID n?o ?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Tham gia v?i ai trong chat?"
@@ -10483,16 +10602,17 @@ msgstr "H?y c?p nh?t c?c tr??ng
 msgid "Please update the necessary fields."
 msgstr "H?y c?p nh?t c?c tr??ng c?n thi?t."
 
-msgid "Room _List"
-msgstr "Danh s?ch _ph?ng"
+#, fuzzy
+msgid "A_ccount"
+msgstr "T?i kho?n"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "H?y nh?p th?ng tin th?ch h?p v? cu?c chat m? b?n mu?n tham gia.\n"
 
-msgid "_Account:"
-msgstr "T?i _kho?n:"
+msgid "Room _List"
+msgstr "Danh s?ch _ph?ng"
 
 msgid "_Block"
 msgstr "_Ch?n"
@@ -10928,6 +11048,112 @@ msgstr "/B?n ch?t/S?p x?p b?n c
 msgid "/Buddies/Sort Buddies"
 msgstr "/B?n ch?t/S?p x?p b?n ch?t"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "M?u n?n"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Nh?m n?y ?? ???c th?m v?o danh s?ch b?n b? c?a b?n"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Ti?ng L?o"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "M?u n?n"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "Gi?n _ra"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Ch?n m?u n?n"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Co l?i"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Ch?n m?u n?n"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "L?i t?t"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Tr?c tuy?n"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "V?ng m?t"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Ngo?i tuy?n"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Ki?m tra t?m tr?ng"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "G?i tin nh?n"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "??i th?ng tin ng??i d?ng cho %s"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "M?y ph?c v? SSL"
@@ -11432,6 +11658,10 @@ msgstr "Ti?ng Hung-ga-ri"
 msgid "Hungarian"
 msgstr "Ti?ng Hung-ga-ri"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "Ti?ng Ru-ma-ni"
+
 msgid "Indonesian"
 msgstr "Ti?ng Nam D??ng"
 
@@ -11530,6 +11760,9 @@ msgstr "Ti?ng Th?y ?i?n"
 msgid "Swedish"
 msgstr "Ti?ng Th?y ?i?n"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "Ti?ng Ta-min"
 
@@ -11950,11 +12183,9 @@ msgstr "L?u ?nh"
 msgid "Save Image"
 msgstr "L?u ?nh"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_L?u ?nh..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "Th?_m h?nh c??i t? ch?n..."
 
@@ -12043,9 +12274,6 @@ msgstr "M?t ch?"
 msgid "Font Face"
 msgstr "M?t ch?"
 
-msgid "Background Color"
-msgstr "M?u n?n"
-
 msgid "Foreground Color"
 msgstr "M?u c?nh g?n"
 
@@ -12377,6 +12605,9 @@ msgstr "Th?ng b?o cho ai"
 msgid "Pounce on Whom"
 msgstr "Th?ng b?o cho ai"
 
+msgid "_Account:"
+msgstr "T?i _kho?n:"
+
 msgid "_Buddy name:"
 msgstr "T?n _b?n ch?t:"
 
@@ -12487,9 +12718,18 @@ msgstr "D? ki?n th?ng b?o kh?ng r
 msgid "Unknown.... Please report this!"
 msgstr "D? ki?n th?ng b?o kh?ng r?. H?y ghi b?o c?o vi?c n?y!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "S?c th?i h?nh c??i kh?ng gi?i n?n ???c."
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "S?c th?i h?nh c??i kh?ng gi?i n?n ???c."
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "S?c th?i h?nh c??i kh?ng gi?i n?n ???c."
+
 msgid "Install Theme"
 msgstr "C?i ??t s?c th?i"
 
@@ -13061,6 +13301,10 @@ msgstr "B? Qu?n l? H?nh c??i T?msgstr "B? Qu?n l? H?nh c??i T? ch?n"
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Ch?n b?n ch?t"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "D?ng bi?u t??ng b?n ch?t cho t?i kho?n n?y:"
 
@@ -13288,6 +13532,79 @@ msgstr "Hi?n th? th?ng tin th?ng 
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Hi?n th? th?ng tin th?ng k? v? t?nh tr?ng c? m?t c?a b?n b?"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "??a ch? m?y ph?c v?"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Nh?p m?y ph?c v? h?i th?o"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Ch?n m?t m?y ph?c v? h?i th?o ?? h?i"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "D?ch v? tr?c tuy?n"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "G?i danh s?ch b?n b?"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "?i v?ng"
+
+#, fuzzy
+msgid "Directory"
+msgstr "Th? m?c ch?a s? theo d?i"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Ch?n ?m thanh"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "D?ch v? PubSub"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "M? t?"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Th?ng tin ph?t hi?n d?ch v?"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "Tr?nh _duy?t:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Ng??i d?ng ?? kh?ng t?n t?i."
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "M?y ph?c v? kh?ng s? d?ng b?t k? ph??ng th?c x?c th?c ???c h? tr? n?o"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Th?ng tin ph?t hi?n d?ch v?"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ph?n b? sung n?y c? ?ch ?? g? l?i m?y ph?c v? hay tr?nh kh?ch ki?u XMPP."
+
 msgid "Buddy is idle"
 msgstr "B?n ch?t ?ang ngh?"
 
@@ -13793,12 +14110,6 @@ msgstr ""
 " o ??o ng??c m?i c?u vi?t ???c g?i ??n\n"
 " o G?i tin cho th?nh vi?n c? trong danh s?ch c?a b?n ngay khi h? k?t n?i"
 
-msgid "Cursor Color"
-msgstr "M?u con tr?"
-
-msgid "Secondary Cursor Color"
-msgstr "M?u con tr? ph?"
-
 msgid "Hyperlink Color"
 msgstr "M?u si?u li?n k?t"
 
@@ -13809,6 +14120,10 @@ msgstr "M?u t?n tin nh?n t? s?ng"
 msgid "Highlighted Message Name Color"
 msgstr "M?u t?n tin nh?n t? s?ng"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "M?u th?ng b?o ?ang g?"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Ph?n c?ch ngang GtkTreeView"
 
@@ -13838,35 +14153,24 @@ msgstr "S?c th?i l?i t?t v?n b? msgid "GTK+ Text Shortcut Theme"
 msgstr "S?c th?i l?i t?t v?n b?n GTK+"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "M?u s?c giao di?n"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "B?t th?ng b?o ?ang g?"
 
-msgid "Widget Sizes"
-msgstr "K?ch c? ? ?i?u khi?n"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "?i?u khi?n s?c th?i GTK+ Pidgin"
 
+#, fuzzy
+msgid "Colors"
+msgstr "??ng"
+
 msgid "Fonts"
 msgstr "Ph?ng"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "C?ng c? t?p tin Gtkrc"
 
@@ -14010,12 +14314,120 @@ msgstr ""
 msgstr ""
 "Thay th? v?n b?n trong tin nh?n g?i ?i theo qui t?c ng??i d?ng ??nh ra."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Ch?a ??ng nh?p"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "Ch?a ??ng nh?p"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Tham gia Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "L?"
+
+#, fuzzy
+msgid "Founder"
+msgstr "To h?n"
+
+# T?n tr?nh duy?t Web
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Cho ph?p"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "L?i "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Th?ng tin"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "H?p tho?i y?u c?u"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "M?c c?nh b?o"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Tr?ng th?i cho %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Mi?n ??a ph??ng ph?ng ch?t"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "L?u bi?u t??ng"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "?i?u khi?n s?c th?i GTK+ Pidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Th?ng tin li?n l?c"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Danh s?ch b?n b?"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Danh s?ch b?n b?"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "?i?u khi?n s?c th?i GTK+ Pidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "?i?u khi?n s?c th?i GTK+ Pidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "Thanh cu?n b?n b?"
 
@@ -14221,6 +14633,21 @@ msgstr ""
 msgstr ""
 "Ph?n b? sung n?y c? ?ch ?? g? l?i m?y ph?c v? hay tr?nh kh?ch ki?u XMPP."
 
+#~ msgid "Activate which ID?"
+#~ msgstr "K?ch ho?t ID n?o ?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "M?u con tr?"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "M?u con tr? ph?"
+
+#~ msgid "Interface colors"
+#~ msgstr "M?u s?c giao di?n"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "K?ch c? ? ?i?u khi?n"
+
 #~ msgid "Invite message"
 #~ msgstr "L?i m?i"
 
@@ -14664,9 +15091,6 @@ msgstr ""
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "Qu?n tr? %2$d ?? t?n th?nh y?u c?u tham gia nh?m %1$d c?a b?n"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Nh?m n?y ?? ???c th?m v?o danh s?ch b?n b? c?a b?n"
-
 #~ msgid "I am applying to join"
 #~ msgstr "T?i mu?n tham gia"
 
@@ -14733,9 +15157,6 @@ msgstr ""
 #~ msgid "Group Operation Error"
 #~ msgstr "L?i thao t?c nh?m"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "L?i y?u c?u hi?u b?i ??ng nh?p"
-
 #~ msgid "TCP Address"
 #~ msgstr "??a ch? TCP"
 
============================================================
--- po/xh.po	2d0577b0b87c42450237cd3cb1a7ff79db0245c8
+++ po/xh.po	4d067dc94a79a65c9ba9f9c50b3d44e0181f065b
@@ -8,7 +8,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:41-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2005-03-23 12:21+0200\n"
 "Last-Translator: Canonical Ltd <translations at canonical.com>\n"
 "Language-Team: Xhosa <xh-translate at ubuntu.com>\n"
@@ -1874,6 +1874,8 @@ msgstr "%s iphumile"
 msgid "+++ %s signed off"
 msgstr "%s iphumile"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Impazamo engaziwayo"
 
@@ -2267,6 +2269,10 @@ msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Impazamo yokudala unxibelelwano"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3297,7 +3303,12 @@ msgstr "iFani:"
 msgid "Chat _name:"
 msgstr "iFani:"
 
+#. should this be a settings error?
 #, fuzzy
+msgid "Unable to resolve server"
+msgstr "Akukwazeki ukunika iseva isandi"
+
+#, fuzzy
 msgid "Chat error"
 msgstr "ImPazamo efundiweyo"
 
@@ -3355,6 +3366,10 @@ msgstr "I-Injini yeGadu-Gadu yokuKhangel
 msgid "Gadu-Gadu User"
 msgstr "I-Injini yeGadu-Gadu yokuKhangela"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Ulwazi oluMiselweyo lomSebenzisi..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Umyalelo ongaziwa: %s"
@@ -3399,7 +3414,8 @@ msgstr "I-_Password:"
 msgid "_Password:"
 msgstr "I-_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "Izikhewu zeIRC kunokwenzeka zingabinazo izithuba ezimhlophe"
 
 #. 1. connect to server
@@ -3900,6 +3916,9 @@ msgstr "Iseva ayisebenzisa nayiphi na in
 msgid "Server does not use any supported authentication method"
 msgstr "Iseva ayisebenzisa nayiphi na indlela yokuxhasa uqinisekiso"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Ukucela umngeni okungasebenziyo okuvela kwiseva"
 
@@ -4200,6 +4219,14 @@ msgstr "Uvimba"
 msgid "Resource"
 msgstr "Uvimba"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "Phuma"
+
 msgid "Middle Name"
 msgstr "iGama eliPhakathi"
 
@@ -4374,10 +4401,19 @@ msgstr "Fumana amaGumbi"
 msgid "Find Rooms"
 msgstr "Fumana amaGumbi"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Ngokunye:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "Akukho baQuquzeleli banoNgqamaniso"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "INdima"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "Umbhalo ocacileyo"
 
@@ -4398,7 +4434,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Akukwazeki ukunxulumana neseva."
 
 #, c-format
@@ -4427,9 +4463,6 @@ msgstr "Ubhaliso aluphumelelanga"
 msgid "Unregistration Failed"
 msgstr "Ubhaliso aluphumelelanga"
 
-msgid "Already Registered"
-msgstr "Sewubhalisile"
-
 msgid "State"
 msgstr "Isimo"
 
@@ -4443,6 +4476,9 @@ msgstr "Umhla"
 msgid "Date"
 msgstr "Umhla"
 
+msgid "Already Registered"
+msgstr "Sewubhalisile"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Bhalisa"
@@ -4475,6 +4511,10 @@ msgstr "Impazamo yoBhaliso"
 msgstr "Impazamo yoBhaliso"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Akukwazeki ukunxulumana neseva."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Impazamo Ukutshintsha Iinkcukacha ze-akhawunti"
 
@@ -4857,13 +4897,13 @@ msgid ""
 msgstr "ban &lt;umsebenzisi&gt; [igumbi]:  Thintela umsebenzisi kwigumbi."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4933,6 +4973,9 @@ msgstr "IsiQhagamshelanisi sokudlulisa i
 msgid "File transfer proxies"
 msgstr "IsiQhagamshelanisi sokudlulisa ifayili"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5349,6 +5392,10 @@ msgstr "Susa umQhagamshelanisi"
 msgid "Non-IM Contacts"
 msgstr "Susa umQhagamshelanisi"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5738,71 +5785,29 @@ msgstr "Uqinisekiso lwesiqhelo aluphumel
 msgstr "Uqinisekiso lwesiqhelo aluphumelelanga!"
 
 #, fuzzy, c-format
-msgid "%s is not a valid group."
-msgstr "%s asililo igama elisebenzayo legumbi"
-
-#, fuzzy
-msgid "Unknown error."
-msgstr "Impazamo engaziwayo"
-
-#, fuzzy, c-format
-msgid "%s on %s (%s)"
-msgstr "Abasebenzisi be %s: %s"
-
-#, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "U-%s ufuna ukukuthumelela i-%s (%s)"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "Impazamo engaziwayo"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Akukwazeki ukugxotha i-%s yomsebenzisi"
 
-msgid "The following users are missing from your addressbook"
-msgstr ""
-
 #, fuzzy, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Akwazeki ukongeza umsebenzisi kuluhlu lwabucala (%s)."
+msgid "Unknown error (%d)"
+msgstr "Impazamo engaziwayo"
 
-#, fuzzy, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Akukwazeki ukususa i-%s yomsebenzisi"
-
-#, fuzzy, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Akukwazeki ukumema umsebenzisi (%s)."
-
-#, fuzzy, c-format
-msgid "%s could not be added because your buddy list is full."
+msgid "The following users are missing from your addressbook"
 msgstr ""
-"Umyalezo ubungenakuthunyelwa ngenxa yokuba umsebenzisi akakho kunxulumano:"
 
-#, fuzzy, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s asililo igama elisebenzayo leseva"
-
 #, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Inkonzo ayiFumaneki okweThutyana"
-
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr ""
 "Umyalezo ubungenakuthunyelwa ngenxa yokuba umsebenzisi akakho kunxulumano:"
 
-#, fuzzy
-msgid "Unable to rename group"
-msgstr "Akukwazeki ukufunda"
-
-#, fuzzy
-msgid "Unable to delete group"
-msgstr "Akukwazeki ukuyila isokethi"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5897,6 +5902,10 @@ msgstr ""
 "Uluhlu lwakho lweMSN lomhlobo %s alifumaneki okwethutyana. Nceda uzame "
 "kwakhona."
 
+#, fuzzy
+msgid "Unknown error."
+msgstr "Impazamo engaziwayo"
+
 msgid "Handshaking"
 msgstr ""
 
@@ -5918,6 +5927,14 @@ msgstr "Ukukhupha uluhlu lobuhlobo"
 msgid "Retrieving buddy list"
 msgstr "Ukukhupha uluhlu lobuhlobo"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Kude kwiKhompyutha"
 
@@ -5960,14 +5977,6 @@ msgstr "Umyalezo kunokwenzeka awuthunyel
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Umyalezo kunokwenzeka awuthunyelwanga ngenxa yempazamo engaziwayo:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Yongeza kwiNcwadi yeDilesi"
@@ -6000,6 +6009,55 @@ msgstr "Imithetho yokuSebenza yokuNgenis
 msgid "MSN Protocol Plugin"
 msgstr "Imithetho yokuSebenza yokuNgenisa i-AIM/ICQ"
 
+#, fuzzy, c-format
+msgid "%s is not a valid group."
+msgstr "%s asililo igama elisebenzayo legumbi"
+
+#, fuzzy, c-format
+msgid "%s on %s (%s)"
+msgstr "Abasebenzisi be %s: %s"
+
+#, fuzzy, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Akwazeki ukongeza umsebenzisi kuluhlu lwabucala (%s)."
+
+#, fuzzy, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Akukwazeki ukususa i-%s yomsebenzisi"
+
+#, fuzzy, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Akukwazeki ukumema umsebenzisi (%s)."
+
+#, fuzzy, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+"Umyalezo ubungenakuthunyelwa ngenxa yokuba umsebenzisi akakho kunxulumano:"
+
+#, fuzzy, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s asililo igama elisebenzayo leseva"
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Inkonzo ayiFumaneki okweThutyana"
+
+#, fuzzy
+msgid "Unable to rename group"
+msgstr "Akukwazeki ukufunda"
+
+#, fuzzy
+msgid "Unable to delete group"
+msgstr "Akukwazeki ukuyila isokethi"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "Umsebenzisi ufuna ukongeza kuluhlu %s lwakhe %s lobuhlobo."
+
 #, c-format
 msgid "No such user: %s"
 msgstr ""
@@ -6035,6 +6093,8 @@ msgstr "Ubuqhawukile kwiseva."
 msgstr "Ubuqhawukile kwiseva."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "Umyalezo omtstha wokungabikho"
@@ -6085,12 +6145,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Isiqhulo okanye ipassword ephosakeleyo."
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6431,10 +6494,6 @@ msgstr "Uvimba oyi-archive unengxaki"
 msgstr "Uvimba oyi-archive unengxaki"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Isiqhulo okanye ipassword ephosakeleyo."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Akukwazekanga ukuqaphela umququzeleli wegama lomsebenzisi elifakweyo"
 
@@ -6655,6 +6714,29 @@ msgstr "Isiqhagamshelisi seseva"
 msgstr "Isiqhagamshelisi seseva"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Impendulo engasebenziyo evela kwiseva."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Ubungena uphuma kunxibelelwano ngamaxa amaninzi kakhulu. Yima imizuzu "
+"elishumi ze uzame kwakhona. Ukuba uyaqhubeka ukuzama, kuya kufuneka ulinde "
+"ixesha elidana nangakumbi."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Impazamo yokudala unxibelelwano"
+
+msgid "Incorrect password."
+msgstr "I-Password ephosakeleyo."
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Akukwazeki ukunxulumana"
 
@@ -6955,15 +7037,40 @@ msgstr ""
 "alisebenzi.  Amagama eskrini kufuneka aqale ngoonombumba okanye abe "
 "nonobumba kuphela, amanani nezithuba, okanye amanani kuphela."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"Kunokwenzeka ukhutshwe kunxibelelwano kungekudala.  Mhlawumbi unokufuna "
+"ukusebenzisa uTOC kude kube oku kulungisiwe. Hlola u %s malunga nokuhlaziya."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+"U-Pidgin akakwazanga ukufumana iqhosha elisebenzayo le-hesh yokungena lakwa-"
+"AIM."
+
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Kunokwenzeka ukhutshwe kunxibelelwano kungekudala.  Mhlawumbi unokufuna "
+"ukusebenzisa uTOC kude kube oku kulungisiwe. Hlola u %s malunga nokuhlaziya."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "U-Pidgin akakwazanga ukufumana ihesh yokungena esebenzayo."
+
+msgid "Could Not Connect"
+msgstr "Akukwazeki ukunxulumana"
+
+msgid "Received authorization"
+msgstr "Wamkele uGunyaziso"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "IGama lomSebenzisi elingaSebenziyo"
 
-msgid "Incorrect password."
-msgstr "I-Password ephosakeleyo."
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "I-akhawunti yakho ngokwangoku ixhonyiwe."
@@ -6972,26 +7079,20 @@ msgstr "Inkonzo yeAOL Instant Messenger 
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Inkonzo yeAOL Instant Messenger ayifumaneki okwethutyana."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "Inguqulelo umxumi ayisebenzisayo indala kakhulu. Nceda uyihlaziye e%s"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "Ubungena uphuma kunxibelelwano ngamaxa amaninzi kakhulu. Yima imizuzu "
 "elishumi ze uzame kwakhona. Ukuba uyaqhubeka ukuzama, kuya kufuneka ulinde "
 "ixesha elidana nangakumbi."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Inguqulelo umxumi ayisebenzisayo indala kakhulu. Nceda uyihlaziye e%s"
-
-msgid "Could Not Connect"
-msgstr "Akukwazeki ukunxulumana"
-
-msgid "Received authorization"
-msgstr "Wamkele uGunyaziso"
-
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
@@ -7008,28 +7109,6 @@ msgstr "Kulungile"
 msgid "_OK"
 msgstr "Kulungile"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"Kunokwenzeka ukhutshwe kunxibelelwano kungekudala.  Mhlawumbi unokufuna "
-"ukusebenzisa uTOC kude kube oku kulungisiwe. Hlola u %s malunga nokuhlaziya."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr ""
-"U-Pidgin akakwazanga ukufumana iqhosha elisebenzayo le-hesh yokungena lakwa-"
-"AIM."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Kunokwenzeka ukhutshwe kunxibelelwano kungekudala.  Mhlawumbi unokufuna "
-"ukusebenzisa uTOC kude kube oku kulungisiwe. Hlola u %s malunga nokuhlaziya."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "U-Pidgin akakwazanga ukufumana ihesh yokungena esebenzayo."
-
 msgid "Password sent"
 msgstr "Ukuthunyelwa kwepassword"
 
@@ -7555,6 +7634,7 @@ msgstr "ULwazi oluMiselweyo lomSebenzisi
 msgid "Set User Info (web)..."
 msgstr "ULwazi oluMiselweyo lomSebenzisi (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Tshintsha i-Password (URL)"
@@ -7590,6 +7670,10 @@ msgstr "Zingela umHlobo ngoLwazi"
 msgid "Search for Buddy by Information"
 msgstr "Zingela umHlobo ngoLwazi"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "Umsebenzisi akangenanga"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -10048,10 +10132,6 @@ msgstr "Ngokuzenzekela"
 msgid "Auth Domain"
 msgstr "Ngokuzenzekela"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10079,6 +10159,44 @@ msgstr "Ukongeza umhlobo kukhatyiwe"
 msgid "Add buddy rejected"
 msgstr "Ukongeza umhlobo kukhatyiwe"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "I-Password ephosakeleyo."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
+"kungakulungisa oku."
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Akakho umsebenzisi onjalo"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr ""
+"Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
+"kungakulungisa oku."
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Isiqhulo okanye ipassword ephosakeleyo."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10197,9 +10315,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Sesiphi Isazisi esisebenzayo?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Ngenela incoko?"
@@ -11017,8 +11134,8 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Uluhlu lweGumbi"
+msgid "A_ccount"
+msgstr "I-Akhawunti:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -11026,8 +11143,9 @@ msgstr ""
 msgstr ""
 "Nceda ufake ulwazi olufanelekileyo malunga nencoko onqwenela ukuyingenela.\n"
 
-msgid "_Account:"
-msgstr "I-_Akhawunti:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Uluhlu lweGumbi"
 
 #, fuzzy
 msgid "_Block"
@@ -11521,6 +11639,117 @@ msgstr "/Abahlobo/Umboniso Abahlobo aban
 msgid "/Buddies/Sort Buddies"
 msgstr "/Abahlobo/Umboniso Abahlobo abangekho kunxibelelwano"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Umbala oNgasemva"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Ingaba ufuna ukongeza lo mhlobo kuluhlu lwakho lomhlobo?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Phuma"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Umbala oNgasemva"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Ukwanda"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Khetha Umbala wangaseMva"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Ukudilika"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Khetha Umbala wangaseMva"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Izniqumlisi"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Lukhona unxibelelwano"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Engekhoyo"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Akukho lunxibelelwano"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Isimo"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
+
+msgid "Message Text"
+msgstr "Umbhalo womYalezo"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Umbhalo womYalezo"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Tshintsha ulwazi lomsebenzisi lwe-%s"
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -12065,6 +12294,10 @@ msgstr "IsiHungaria"
 msgstr "IsiHungaria"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "IsiRomania"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "IsiMacedonia"
 
@@ -12171,6 +12404,9 @@ msgstr "IsiSwede"
 msgid "Swedish"
 msgstr "IsiSwede"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "I-Terminal"
@@ -12614,11 +12850,9 @@ msgstr "Gcina umFanekiso"
 msgid "Save Image"
 msgstr "Gcina umFanekiso"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Gcina umFanekiso..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12709,10 +12943,6 @@ msgstr "Inkangeleko yomBhalo"
 msgstr "Inkangeleko yomBhalo"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Umbala oNgasemva"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Umbala ophambili wombhalo"
 
@@ -13038,6 +13268,9 @@ msgstr "Kutsityelwe bani"
 msgid "Pounce on Whom"
 msgstr "Kutsityelwe bani"
 
+msgid "_Account:"
+msgstr "I-_Akhawunti:"
+
 msgid "_Buddy name:"
 msgstr "_iGama lomhlobo:"
 
@@ -13162,9 +13395,16 @@ msgstr "Isiganeko esingaziwayo sokutsiba
 msgid "Unknown.... Please report this!"
 msgstr "Isiganeko esingaziwayo sokutsiba. Nceda wenze ingxelo ngoku!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
 msgstr ""
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Akuphumelelekanga ukugcina umfanekiso: %s\n"
+
+msgid "Theme failed to copy."
+msgstr ""
+
 msgid "Install Theme"
 msgstr ""
 
@@ -13775,6 +14015,10 @@ msgstr ""
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Khetha umHlobo"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -14013,6 +14257,78 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Idilesi yeseva"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Ngena kwiSeva yeNgqungquthela"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Khetha iseva yengqungquthela ukufa umbuzo"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Iinkonzo zoNxibelelwano"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Thumela uLuhlu Lobuhlobo"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "Xa ungekho"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Khangela i:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Ukhetho lweSandi"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Inkcazelo:<b> IsiPorho"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Misela uLwazi Ngqo"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_IsiKhangeli:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "Akakho umsebenzisi onjalo"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Iseva ayisebenzisa nayiphi na indlela yokuxhasa uqinisekiso"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Misela uLwazi Ngqo"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Umhlobo ulalele:"
 
@@ -14543,12 +14859,6 @@ msgstr ""
 "- Iguqula yonke imibhalo engenayo\n"
 "- Ithumela umyalezo kubantu abakuluhlu lwakho kwangoko xa bebhalisa"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Umbala woQhagamshelwano"
@@ -14561,6 +14871,10 @@ msgstr "Thumela umYalezo"
 msgid "Highlighted Message Name Color"
 msgstr "Thumela umYalezo"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "UkuSusa isaZiso"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14595,38 +14909,27 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
 #, fuzzy
-msgid "Interface colors"
-msgstr "Ukungahoyi i_mibala"
+msgid "Disable Typing Notification Text"
+msgstr "Izaziso ngemeyile entsha"
 
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Ulawulo lweFayile yePidgin"
 
 #, fuzzy
+msgid "Colors"
+msgstr "Vala"
+
+#, fuzzy
 msgid "Fonts"
 msgstr "Ii-Akhawunti"
 
 #, fuzzy
+msgid "Miscellaneous"
+msgstr "Impazamo yeZinto ngezinto"
+
+#, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Ulawulo lweFayile yePidgin"
 
@@ -14774,12 +15077,119 @@ msgstr ""
 msgstr ""
 "Utshintsha umbhalo wemiyalezo ephumayo ngokwemithetho emiselwe ngumsebenzisi."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Akangenanga"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s iphumile."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Ngenela iNcoko"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Musa ukuHoya"
+
+#, fuzzy
+msgid "Founder"
+msgstr "iyure"
+
+#, fuzzy
+msgid "Operator"
+msgstr "I-Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Ugunyaziso lunikiwe"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Impazamo"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Ulwazi"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Isicelo simbaxa"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Umgangatho wesiLumkiso"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "uBume: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Gcina umFanekiso womQondiso"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Ulawulo lweFayile yePidgin"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Ulwazi nge-akhawunti"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "uLuhlu lwabaHlobo"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "uLuhlu lwabaHlobo"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Ulawulo lweFayile yePidgin"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Ulawulo lweFayile yePidgin"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "IsiChukumisi soMhlobo"
 
@@ -14998,6 +15408,14 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "Activate which ID?"
+#~ msgstr "Sesiphi Isazisi esisebenzayo?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ukungahoyi i_mibala"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "(umyalezo 1)"
 
@@ -15491,10 +15909,6 @@ msgstr ""
 #~ msgstr "Abasebenzisi be %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Ingaba ufuna ukongeza lo mhlobo kuluhlu lwakho lomhlobo?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "ImPazamo yokuSebenza kweNkqubo"
 
@@ -15503,10 +15917,6 @@ msgstr ""
 #~ msgstr "I-%s ayingenanga ngokwangoku."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Impazamo yokudala unxibelelwano"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Akwazeku ukuNgena kwiAIM"
 
@@ -15632,10 +16042,6 @@ msgstr ""
 #~ msgid "_Merge"
 #~ msgstr "_Umyalezo:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "I-Akhawunti:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Fihla iimPazamo ezingaNxulumaniswanga"
 
@@ -15795,13 +16201,6 @@ msgstr ""
 #~ "\n"
 #~ "<b>Imo:</b> Alukho unxibelelwano"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Inkcazelo:<b> IsiPorho"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -16479,9 +16878,6 @@ msgstr ""
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Thumela umyalezo kumhlobo okhethekileyo"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Fumana ulwazi ngomhlobo okhethiweyo"
-
 #~ msgid "_Chat"
 #~ msgstr "_Ukuncokola"
 
@@ -16687,9 +17083,6 @@ msgstr ""
 #~ msgid "Summary"
 #~ msgstr "Isishwankathelo"
 
-#~ msgid "Message Text"
-#~ msgstr "Umbhalo womYalezo"
-
 #~ msgid "Away Messages"
 #~ msgstr "Imiyalezo yokuNgabikho"
 
@@ -16790,9 +17183,6 @@ msgstr ""
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Impazamo ebalulekileyo kwi-GG library\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Akukwazeki ukunika iseva isandi"
-
 #~ msgid "Send as message"
 #~ msgstr "Thumela njengomyalezo"
 
@@ -17006,9 +17396,6 @@ msgstr ""
 #~ msgid "%s logged in."
 #~ msgstr "%s ingenisiwe."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s iphumile."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
@@ -17036,9 +17423,6 @@ msgstr ""
 #~ "Akukwazeki ukuthelekelela uhlobo lomfanekiso olusekwe kulwandiso "
 #~ "lwefayili olunikiweyo.  Kumiselwe kuPNG."
 
-#~ msgid "Miscellaneous error"
-#~ msgstr "Impazamo yeZinto ngezinto"
-
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr "Impazamo engaziwayo xa uzama ukugunyazisa neseva yeMSN xa ungena."
 
============================================================
--- po/zh_CN.po	44f3ddc0a1ea5db98130d1ab651d4c88a213ff73
+++ po/zh_CN.po	f585bac473bb970062ce3f8b03762b1c411084e7
@@ -7,7 +7,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:41-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2007-05-20 20:22+0800\n"
 "Last-Translator: Funda Wang <fundawang at linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation at lists.linux.net.cn>\n"
@@ -1744,6 +1744,8 @@ msgstr "+++ %s ???"
 msgid "+++ %s signed off"
 msgstr "+++ %s ???"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????"
 
@@ -2125,6 +2127,10 @@ msgstr "(%s) %s <????>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "????? %s,????? %s?"
@@ -3068,6 +3074,11 @@ msgstr "???(_N):"
 msgid "Chat _name:"
 msgstr "???(_N):"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?????????"
+
 msgid "Chat error"
 msgstr "????"
 
@@ -3116,6 +3127,10 @@ msgstr "Gadu-Gadu ??"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ??"
 
+#, fuzzy
+msgid "GG server"
+msgstr "??????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "???????: %s"
@@ -3158,7 +3173,8 @@ msgstr "??(_P):"
 msgid "_Password:"
 msgstr "??(_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ????????"
 
 #. 1. connect to server
@@ -3603,6 +3619,9 @@ msgstr "??????????? msgid "Server does not use any supported authentication method"
 msgstr "?????????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "????????"
 
@@ -3895,6 +3914,14 @@ msgstr "??"
 msgid "Resource"
 msgstr "??"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???"
+
 msgid "Middle Name"
 msgstr "??"
 
@@ -4065,10 +4092,19 @@ msgstr "????"
 msgid "Find Rooms"
 msgstr "????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??:"
 
 #, fuzzy
+msgid "No users found"
+msgstr "????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??"
+
+#, fuzzy
 msgid "Ping timeout"
 msgstr "???"
 
@@ -4088,7 +4124,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?????????"
 
 #, c-format
@@ -4117,9 +4153,6 @@ msgstr "????"
 msgid "Unregistration Failed"
 msgstr "????"
 
-msgid "Already Registered"
-msgstr "???"
-
 msgid "State"
 msgstr "?/?"
 
@@ -4132,6 +4165,9 @@ msgstr "??"
 msgid "Date"
 msgstr "??"
 
+msgid "Already Registered"
+msgstr "???"
+
 msgid "Unregister"
 msgstr "????"
 
@@ -4163,6 +4199,10 @@ msgstr "????"
 msgstr "????"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?????????"
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "????????"
 
@@ -4537,13 +4577,14 @@ msgid ""
 msgstr "ban &lt;??&gt; [??]: ???????????"
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ???????"
 "?????"
@@ -4610,6 +4651,9 @@ msgstr "??????"
 msgid "File transfer proxies"
 msgstr "??????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 #, fuzzy
@@ -5013,6 +5057,10 @@ msgstr "?????"
 msgid "Non-IM Contacts"
 msgstr "?????"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ??????????,??????"
+
 msgid "Nudge"
 msgstr ""
 
@@ -5367,65 +5415,28 @@ msgstr "??: ??????"
 msgstr "??: ??????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ????????"
-
-msgid "Unknown error."
-msgstr "?????"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s(%3$s) ?? %1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ???????????!"
 
-#. char *adl = g_strndup(payload, len);
 #, fuzzy, c-format
-msgid "Unknown error (%d)"
+msgid "Unknown error (%d): %s"
 msgstr "????"
 
 msgid "Unable to add user"
 msgstr "??????"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "????"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "?????????"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "??? %s(%s) ?????"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "??? %s(%s) ?????"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "???? %s(%s) ????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "???? %s,????????????"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ???????????"
-
-msgid "Service Temporarily Unavailable."
-msgstr "????????"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "?????,????????"
 
-msgid "Unable to rename group"
-msgstr "??????"
-
-msgid "Unable to delete group"
-msgstr "?????"
-
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5504,6 +5515,9 @@ msgstr "?? MSN ???????
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "?? MSN ??????????????????"
 
+msgid "Unknown error."
+msgstr "?????"
+
 msgid "Handshaking"
 msgstr "??"
 
@@ -5522,6 +5536,14 @@ msgstr "????????"
 msgid "Retrieving buddy list"
 msgstr "????????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ??????????,??????"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ??????????,??????"
+
 msgid "Away From Computer"
 msgstr "????"
 
@@ -5558,14 +5580,6 @@ msgstr "?????,????? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????,?????????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?????????"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ?????????????"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "??????"
@@ -5599,6 +5613,51 @@ msgstr "AIM ????"
 msgstr "AIM ????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ????????"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s(%3$s) ?? %1$s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "??? %s(%s) ?????"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "??? %s(%s) ?????"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "???? %s(%s) ????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "???? %s,????????????"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ???????????"
+
+msgid "Service Temporarily Unavailable."
+msgstr "????????"
+
+msgid "Unable to rename group"
+msgstr "??????"
+
+msgid "Unable to delete group"
+msgstr "?????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?????????"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ?????????????"
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5634,6 +5693,8 @@ msgstr ""
 "%s"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "????"
@@ -5682,12 +5743,15 @@ msgid ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "???????"
+
 msgid "MySpaceIM Error"
 msgstr ""
 
@@ -6023,10 +6087,6 @@ msgstr "???????"
 msgstr "???????"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "???????"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "?????????????"
 
@@ -6231,6 +6291,28 @@ msgstr "?????"
 msgstr "?????"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "?????????? HTTP ???"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"????????????????,??????????????,??????"
+"?????"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "????????"
+
+msgid "Incorrect password."
+msgstr "?????"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "????"
 
@@ -6526,15 +6608,32 @@ msgstr ""
 "????: ??? %s ??,????????????????????????,"
 "???????,?????????????,????????"
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "?????????? %s ?????"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "??????? AIM ????"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "?????????? %s ?????"
+
+msgid "Unable to get a valid login hash."
+msgstr "???????????"
+
+msgid "Could Not Connect"
+msgstr "????"
+
+msgid "Received authorization"
+msgstr "?????"
+
 #. Unregistered username
 #. uid is not exist
 #, fuzzy
 msgid "Invalid username."
 msgstr "????"
 
-msgid "Incorrect password."
-msgstr "?????"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "????????"
@@ -6543,25 +6642,19 @@ msgstr "AOL ??????????msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL ????????????"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "????????????? %s ??"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "????????????????,??????????????,??????"
 "?????"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "????????????? %s ??"
-
-msgid "Could Not Connect"
-msgstr "????"
-
-msgid "Received authorization"
-msgstr "?????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "??? SecurID ?????"
 
@@ -6577,20 +6670,6 @@ msgstr "??(_O)"
 msgid "_OK"
 msgstr "??(_O)"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "?????????? %s ?????"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "??????? AIM ????"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "?????????? %s ?????"
-
-msgid "Unable to get a valid login hash."
-msgstr "???????????"
-
 msgid "Password sent"
 msgstr "?????"
 
@@ -7055,6 +7134,7 @@ msgstr "??????(URL)..."
 msgid "Set User Info (web)..."
 msgstr "??????(URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "????(URL)"
@@ -7087,6 +7167,10 @@ msgstr "???????"
 msgstr "???????"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "?????"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9377,10 +9461,6 @@ msgstr "???"
 msgid "Auth Domain"
 msgstr "???"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ??????????,??????"
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9404,6 +9484,40 @@ msgstr "???????"
 msgid "Add buddy rejected"
 msgstr "???????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "??????????????????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "????? %d???? Yahoo! ???????"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "?????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "????? %d???? Yahoo! ???????"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "???????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9513,8 +9627,8 @@ msgstr ""
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "???? ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "???????"
@@ -10275,16 +10389,17 @@ msgstr "?????????"
 msgstr "?????????"
 
 #, fuzzy
-msgid "Room _List"
-msgstr "????"
+msgid "A_ccount"
+msgstr "??(_C):"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "?????????????????\n"
 
-msgid "_Account:"
-msgstr "??(_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "????"
 
 msgid "_Block"
 msgstr "??(_B)"
@@ -10728,6 +10843,112 @@ msgstr "/??(B)/????(S)"
 msgid "/Buddies/Sort Buddies"
 msgstr "/??(B)/????(S)"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "????"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "??(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "??(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "??"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "?????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?? %s ?????"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ???"
@@ -11230,6 +11451,10 @@ msgstr "????"
 msgid "Hungarian"
 msgstr "????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "?????"
+
 msgid "Indonesian"
 msgstr "??????"
 
@@ -11334,6 +11559,9 @@ msgstr "???"
 msgid "Swedish"
 msgstr "???"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "????"
 
@@ -11756,11 +11984,10 @@ msgstr "????"
 msgid "Save Image"
 msgstr "????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "????(_S)..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "???????:"
 
@@ -11846,9 +12073,6 @@ msgstr "??"
 msgid "Font Face"
 msgstr "??"
 
-msgid "Background Color"
-msgstr "????"
-
 msgid "Foreground Color"
 msgstr "????"
 
@@ -12157,6 +12381,9 @@ msgstr "????"
 msgid "Pounce on Whom"
 msgstr "????"
 
+msgid "_Account:"
+msgstr "??(_A):"
+
 msgid "_Buddy name:"
 msgstr "????(_B):"
 
@@ -12267,9 +12494,18 @@ msgstr "??????????? msgid "Unknown.... Please report this!"
 msgstr "?????????????!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "?????????"
 
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?????????"
+
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "?????????"
+
 msgid "Install Theme"
 msgstr "????"
 
@@ -12840,6 +13076,10 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "????"
+
+#, fuzzy
 msgid "Click to change your buddyicon for this account."
 msgstr "??????????(_I):"
 
@@ -13062,6 +13302,77 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
+#, fuzzy
+msgid "Server name request"
+msgstr "?????"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "???????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "???????????"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "??????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??"
+
+#, fuzzy
+msgid "Directory"
+msgstr "????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "??"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "??????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "???(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "?????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "?????????????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "??????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "??????? XMPP ????????"
+
 msgid "Buddy is idle"
 msgstr "?????"
 
@@ -13554,12 +13865,6 @@ msgstr ""
 "- ?????????\n"
 "- ?????????????????"
 
-msgid "Cursor Color"
-msgstr "????"
-
-msgid "Secondary Cursor Color"
-msgstr "??????"
-
 msgid "Hyperlink Color"
 msgstr "??????"
 
@@ -13571,6 +13876,10 @@ msgstr "???????"
 msgid "Highlighted Message Name Color"
 msgstr "???????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ????"
 
@@ -13600,35 +13909,24 @@ msgstr "GTK+ ????????"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ????????"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "????"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "?????"
 
-msgid "Widget Sizes"
-msgstr "????"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ ????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "??"
+
 msgid "Fonts"
 msgstr "??"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc ????"
 
@@ -13767,12 +14065,119 @@ msgstr "??????????? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "?????????????????????"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "???"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "???"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "????"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "??"
+
+#, fuzzy
+msgid "Founder"
+msgstr "??"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "?????"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "?? "
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "??"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "?????"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "%s ???"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "??????"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ ????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ ????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ ????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "?????"
 
@@ -13972,6 +14377,21 @@ msgstr "??????? XMPP ?? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "??????? XMPP ????????"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "???? ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "????"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??????"
+
+#~ msgid "Interface colors"
+#~ msgstr "????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "????"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "??????"
@@ -14475,9 +14895,6 @@ msgstr "??????? XMPP ?? #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "??? %d ?????????? %d ??"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "???????????"
-
 #~ msgid "I am applying to join"
 #~ msgstr "?????"
 
@@ -14499,9 +14916,6 @@ msgstr "??????? XMPP ?? #~ msgid "Enter your reason:"
 #~ msgstr "??????:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "????????"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "????,???????"
 
@@ -14554,9 +14968,6 @@ msgstr "??????? XMPP ?? #~ "??????????????/??????????????????????"
 #~ "????,????????????\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "??(_C):"
-
 #~ msgid "_Screen name:"
 #~ msgstr "???(_S):"
 
============================================================
--- po/zh_HK.po	5f1b48c528144d4a42eab74b228281a10cad58d6
+++ po/zh_HK.po	f33f2472b0aa4d4d7df7182c51eed81a2aa9733b
@@ -51,7 +51,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:41-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-25 09:57-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li at gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\n"
@@ -1846,6 +1846,8 @@ msgstr "+++ %s ??"
 msgid "+++ %s signed off"
 msgstr "+++ %s ??"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????"
 
@@ -2234,6 +2236,10 @@ msgstr "(%s) %s <????>:%s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????>:%s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "??????? %s,?????? %s?"
@@ -3228,6 +3234,11 @@ msgstr "?????(_N):"
 msgid "Chat _name:"
 msgstr "?????(_N):"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?????????"
+
 msgid "Chat error"
 msgstr "????"
 
@@ -3276,6 +3287,10 @@ msgstr "Gadu-Gadu ???"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ???"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?????:%s"
@@ -3318,7 +3333,8 @@ msgstr "??(_P):"
 msgid "_Password:"
 msgstr "??(_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ??????????"
 
 #. 1. connect to server
@@ -3797,6 +3813,9 @@ msgstr "??????????? msgid "Server does not use any supported authentication method"
 msgstr "???????????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "???????,????????????"
+
 # XXX ?????,??????
 msgid "Invalid challenge from server"
 msgstr "?????????????"
@@ -4104,6 +4123,14 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???"
+
 # NOTE: ????????????,?????????,??????
 # NOTE: ????????????????,???,?????PO???????
 msgid "Middle Name"
@@ -4284,9 +4311,18 @@ msgstr "?????"
 msgid "Find Rooms"
 msgstr "?????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "???????,????????????"
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "?????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??"
+
 msgid "Ping timeout"
 msgstr "Ping??"
 
@@ -4306,7 +4342,7 @@ msgstr "XMPP ????,????
 msgstr "XMPP ????,?????????"
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?????????"
 
 #, c-format
@@ -4333,9 +4369,6 @@ msgstr "??????"
 msgid "Unregistration Failed"
 msgstr "??????"
 
-msgid "Already Registered"
-msgstr "????"
-
 msgid "State"
 msgstr "?/?"
 
@@ -4348,6 +4381,9 @@ msgstr "??"
 msgid "Date"
 msgstr "??"
 
+msgid "Already Registered"
+msgstr "????"
+
 msgid "Unregister"
 msgstr "????"
 
@@ -4375,6 +4411,10 @@ msgstr "??????"
 msgid "Change Registration"
 msgstr "??????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?????????"
+
 msgid "Error unregistering account"
 msgstr "????????"
 
@@ -4824,17 +4864,19 @@ msgstr "ban &lt;???&gt; [??]? msgstr "ban &lt;???&gt; [??]:???????????"
 
 #  XXX ???(??)??? - ambrose 20070415
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;???&gt; &lt;owner|admin|member|outcast|none&gt;: ?????"
 "?????????"
 
 #  NOTE ???? by ambrose
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;???&gt; &lt;moderator|participant|visitor|none&gt;: ??????"
 "?????????"
@@ -4897,6 +4939,9 @@ msgstr "?????????"
 msgid "File transfer proxies"
 msgstr "?????????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5313,6 +5358,10 @@ msgstr "????????"
 msgid "Non-IM Contacts"
 msgstr "????????"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ????????????,??????????????"
+
 msgid "Nudge"
 msgstr "??"
 
@@ -5660,71 +5709,27 @@ msgstr "Windows Live ID ??:???msgstr "Windows Live ID ??:????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ??????????"
-
-msgid "Unknown error."
-msgstr "?????"
-
-# NOTE: ??? %s ??????,??? %s ???????
-# NOTE: ??? %s ?????????(?????????)
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s (%3$s):%1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ????!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "????(?? %d)"
 
 msgid "Unable to add user"
 msgstr "???????"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "????(?? %d)"
+
 # XXX ?? - 20090226
 msgid "The following users are missing from your addressbook"
 msgstr "???????????"
 
-#  TODO ???,??????
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) ???????"
-
-#  TODO ???,??????
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) ???????"
-
-#  TODO ???,??????
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) ???????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "????????,?????? %s"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ???????????"
-
-#  NOTE????????????????????
-#  NOTE ???? by Ambrose
-msgid "Service Temporarily Unavailable."
-msgstr "????????"
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "????????,??????:"
 
-msgid "Unable to rename group"
-msgstr "????????"
-
-msgid "Unable to delete group"
-msgstr "??????"
-
 # NOTE "in %d minutes" ???? %d ????????
 # NOTE ???? by Ambrose
 #, c-format
@@ -5812,6 +5817,9 @@ msgstr "??????????? "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "????????????,????????"
 
+msgid "Unknown error."
+msgstr "?????"
+
 # See cnscode.org.tw
 msgid "Handshaking"
 msgstr "???"
@@ -5831,6 +5839,14 @@ msgstr "???????"
 msgid "Retrieving buddy list"
 msgstr "???????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ????????????,??????????????"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ????????????,??????????????"
+
 msgid "Away From Computer"
 msgstr "?????"
 
@@ -5869,14 +5885,6 @@ msgstr "?????????,? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????????,????????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?????(?)??????"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ????(?)?????????"
-
 #  NOTE ??!evolution ???????????????????
 msgid "Delete Buddy from Address Book?"
 msgstr "??????????"
@@ -5907,6 +5915,58 @@ msgstr "MSN ????"
 msgstr "MSN ????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ??????????"
+
+# NOTE: ??? %s ??????,??? %s ???????
+# NOTE: ??? %s ?????????(?????????)
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s (%3$s):%1$s"
+
+#  TODO ???,??????
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) ???????"
+
+#  TODO ???,??????
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) ???????"
+
+#  TODO ???,??????
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) ???????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "????????,?????? %s"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ???????????"
+
+#  NOTE????????????????????
+#  NOTE ???? by Ambrose
+msgid "Service Temporarily Unavailable."
+msgstr "????????"
+
+msgid "Unable to rename group"
+msgstr "????????"
+
+msgid "Unable to delete group"
+msgstr "??????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?????(?)??????"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ????(?)?????????"
+
+#, c-format
 msgid "No such user: %s"
 msgstr "?????:%s"
 
@@ -5937,6 +5997,8 @@ msgstr "??????????? msgstr "???????????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "????"
 
@@ -5985,17 +6047,19 @@ msgstr "??????,?? %d? msgstr "??????,?? %d:%s"
 
 # NOTE ??? %s ?????
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s ???????? %d ???,?????? MySpaceIM ?? %d ???????"
 "?? http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
 "changePassword ?????????,?????"
 
+msgid "Incorrect username or password"
+msgstr "????????"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM ??"
 
@@ -6326,9 +6390,6 @@ msgstr "Master archive ????"
 msgid "Master archive is misconfigured"
 msgstr "Master archive ????"
 
-msgid "Incorrect username or password"
-msgstr "????????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "?????????????????"
 
@@ -6537,6 +6598,29 @@ msgstr "??????"
 msgid "Server port"
 msgstr "??????"
 
+# XXX ?? - 20061025
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "????????? HTTP ???"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"????/????????????????????????????????,"
+"????????????????"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?? %s ???????"
+
+msgid "Incorrect password."
+msgstr "?????"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "???????"
 
@@ -6857,14 +6941,31 @@ msgstr ""
 "????:??? %s ????,??????????????????????;"
 "?????????,?????????????;?????????"
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "??????????????????,?? %s ????????"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "??????? AIM ????"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "???????????????? %s ????????"
+
+msgid "Unable to get a valid login hash."
+msgstr "????????????"
+
+msgid "Could Not Connect"
+msgstr "????"
+
+msgid "Received authorization"
+msgstr "????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "????????"
 
-msgid "Incorrect password."
-msgstr "?????"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "??????????"
@@ -6876,25 +6977,19 @@ msgstr "?????? AOL ???
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????? AOL ???????"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "????????????????? %s ??"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "????/????????????????????????????????,"
 "????????????????"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "????????????????? %s ??"
-
-msgid "Could Not Connect"
-msgstr "????"
-
-msgid "Received authorization"
-msgstr "????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "????? SecurID ????"
 
@@ -6910,20 +7005,6 @@ msgstr "??(_O)"
 msgid "_OK"
 msgstr "??(_O)"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "??????????????????,?? %s ????????"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "??????? AIM ????"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "???????????????? %s ????????"
-
-msgid "Unable to get a valid login hash."
-msgstr "????????????"
-
 msgid "Password sent"
 msgstr "??????"
 
@@ -7412,6 +7493,7 @@ msgstr "??????? (???
 msgid "Set User Info (web)..."
 msgstr "??????? (????)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "???? (????)"
 
@@ -7442,6 +7524,10 @@ msgstr "????????"
 msgid "Search for Buddy by Information"
 msgstr "????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "???????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9765,10 +9851,6 @@ msgstr "????"
 msgid "Auth Domain"
 msgstr "????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ????????????,??????????????"
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9796,6 +9878,40 @@ msgstr "??????"
 msgid "Add buddy rejected"
 msgstr "??????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "???????????????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??????? %d?????? Yahoo!,????????????????"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "??????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??????? %d?????? Yahoo!,????????????????"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "????????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9915,8 +10031,8 @@ msgstr "?? Doodle"
 msgid "Start Doodling"
 msgstr "?? Doodle"
 
-msgid "Activate which ID?"
-msgstr "????? ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 # NOTE #Pidgin ? Vann ? LSchiere ?:????????????????,???????
 # NOTE Yahoo ??Chat????????????
@@ -10731,16 +10847,17 @@ msgstr "??????????? msgid "Please update the necessary fields."
 msgstr "?????????????"
 
-msgid "Room _List"
-msgstr "?????(_L)"
+#, fuzzy
+msgid "A_ccount"
+msgstr "??"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "????????????????????????\n"
 
-msgid "_Account:"
-msgstr "??(_A):"
+msgid "Room _List"
+msgstr "?????(_L)"
 
 msgid "_Block"
 msgstr "??(_B)"
@@ -11186,6 +11303,112 @@ msgstr "/??/??????"
 msgid "/Buddies/Sort Buddies"
 msgstr "/??/??????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "????"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "??(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "??(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "??"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+# XXX ??? - acli 20070914
+#, fuzzy
+msgid "Idle Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?? %s ?????"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ???"
@@ -11718,6 +11941,10 @@ msgstr "????"
 msgid "Hungarian"
 msgstr "????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "?????"
+
 msgid "Indonesian"
 msgstr "???"
 
@@ -11841,6 +12068,9 @@ msgstr "???"
 msgid "Swedish"
 msgstr "???"
 
+msgid "Swahili"
+msgstr ""
+
 # NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE ?????????,?????????(?????)??????
 msgid "Tamil"
@@ -12292,11 +12522,9 @@ msgstr "????"
 msgid "Save Image"
 msgstr "????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "????(_S)..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "??????(_A)..."
 
@@ -12386,9 +12614,6 @@ msgstr "??"
 msgid "Font Face"
 msgstr "??"
 
-msgid "Background Color"
-msgstr "????"
-
 #  XXX ???????????? - acli 20070614
 msgid "Foreground Color"
 msgstr "????"
@@ -12708,6 +12933,9 @@ msgstr "??????"
 msgid "Pounce on Whom"
 msgstr "??????"
 
+msgid "_Account:"
+msgstr "??(_A):"
+
 msgid "_Buddy name:"
 msgstr "????(_B):"
 
@@ -12819,9 +13047,20 @@ msgstr "??????????? msgstr "???????????????!"
 
 # XXX ??? - 20061025
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "?????????"
 
+# XXX ??? - 20061025
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?????????"
+
+# XXX ??? - 20061025
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "?????????"
+
 #  NOTE ???????????????,??????????
 msgid "Install Theme"
 msgstr "?????"
@@ -13386,6 +13625,10 @@ msgstr "??????"
 msgid "Custom Smiley Manager"
 msgstr "??????"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "?????????????"
 
@@ -13611,6 +13854,81 @@ msgstr "??????????? msgid "Displays statistical information about your buddies' availability"
 msgstr "????????????????"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "?????"
+
+# NOTE????????????Yahoo! ??????Conference?????????
+# XXX
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "???????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??????????"
+
+#  XXX ??
+#, fuzzy
+msgid "Find Services"
+msgstr "???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "??????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??"
+
+#, fuzzy
+msgid "Directory"
+msgstr "????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub ??"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "??"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "??????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "???(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "??????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???????????????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "??????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "??? XMPP ????????????"
+
 msgid "Buddy is idle"
 msgstr "????"
 
@@ -14136,13 +14454,6 @@ msgstr ""
 "- ??????????????\n"
 "- ??????????,???????????"
 
-msgid "Cursor Color"
-msgstr "????"
-
-#  XXX ?????????,????????????????
-msgid "Secondary Cursor Color"
-msgstr "??????"
-
 msgid "Hyperlink Color"
 msgstr "?????"
 
@@ -14154,6 +14465,10 @@ msgstr "????????"
 msgid "Highlighted Message Name Color"
 msgstr "????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "??????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ??????"
 
@@ -14184,35 +14499,25 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "????"
+# XXX ?????,???????????,???????? - acli 20080511
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??????"
 
-msgid "Widget Sizes"
-msgstr "Widget ??"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ ??????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "??"
+
 msgid "Fonts"
 msgstr "??"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc?????"
 
@@ -14357,12 +14662,128 @@ msgstr "??????????? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "???????????????????????"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+# TODO ??????????????,?????????????
+# NOTE ???? by Paladin
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "?????"
+
+#  NOTE?Ignore??????????,? gtkprefs.c ???Ignore?
+#  NOTE ??????????,?????????
+#, fuzzy
+msgid "Ignored"
+msgstr "??"
+
+#, fuzzy
+msgid "Founder"
+msgstr "???"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+# NOTE ?????????????????????????
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????"
+
+# TODO ??? - 20061025
+#, fuzzy
+msgid "Error dialog"
+msgstr "????"
+
+# XXX 20070518
+#, fuzzy
+msgid "Information dialog"
+msgstr "??"
+
+msgid "Mail dialog"
+msgstr ""
+
+#  XXX ????????,????????? - ambrose 20070415
+#, fuzzy
+msgid "Question dialog"
+msgstr "???? (Request Dialog)"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "??:%s"
+
+#  XXX ?????,?????????????????(?!)
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "????? (Locale)"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ ??????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ ??????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ ??????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "?????"
 
@@ -14566,6 +14987,22 @@ msgstr "??? XMPP ?????? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "??? XMPP ????????????"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "????? ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "????"
+
+#  XXX ?????????,????????????????
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??????"
+
+#~ msgid "Interface colors"
+#~ msgstr "????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget ??"
+
 #~ msgid "Invite message"
 #~ msgstr "????"
 
============================================================
--- po/zh_TW.po	ddaffc1c2c25ad0980e0d112b77988e2cf235ff1
+++ po/zh_TW.po	57c889b2e6adae8f35b09ea7629f93803a2902f1
@@ -49,7 +49,7 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:41-0400\n"
+"POT-Creation-Date: 2009-07-02 01:34-0700\n"
 "PO-Revision-Date: 2009-02-25 09:57-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li at gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n at linux.org.tw>\n"
@@ -1844,6 +1844,8 @@ msgstr "+++ %s ??"
 msgid "+++ %s signed off"
 msgstr "+++ %s ??"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "????"
 
@@ -2232,6 +2234,10 @@ msgstr "(%s) %s <????>:%s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????>:%s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "??????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "??????? %s,?????? %s?"
@@ -3226,6 +3232,11 @@ msgstr "?????(_N):"
 msgid "Chat _name:"
 msgstr "?????(_N):"
 
+#. should this be a settings error?
+#, fuzzy
+msgid "Unable to resolve server"
+msgstr "?????????"
+
 msgid "Chat error"
 msgstr "????"
 
@@ -3274,6 +3285,10 @@ msgstr "Gadu-Gadu ???"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ???"
 
+#, fuzzy
+msgid "GG server"
+msgstr "???????..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "?????:%s"
@@ -3316,7 +3331,8 @@ msgstr "??(_P):"
 msgid "_Password:"
 msgstr "??(_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ??????????"
 
 #. 1. connect to server
@@ -3795,6 +3811,9 @@ msgstr "??????????? msgid "Server does not use any supported authentication method"
 msgstr "???????????????????"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr "???????,????????????"
+
 # XXX ?????,??????
 msgid "Invalid challenge from server"
 msgstr "?????????????"
@@ -4102,6 +4121,14 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged off"
+msgstr "???"
+
 # NOTE: ????????????,?????????,??????
 # NOTE: ????????????????,???,?????PO???????
 msgid "Middle Name"
@@ -4282,9 +4309,18 @@ msgstr "?????"
 msgid "Find Rooms"
 msgstr "?????"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr "???????,????????????"
+#, fuzzy
+msgid "Affiliations:"
+msgstr "??:"
 
+#, fuzzy
+msgid "No users found"
+msgstr "?????????"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "??"
+
 msgid "Ping timeout"
 msgstr "Ping??"
 
@@ -4304,7 +4340,7 @@ msgstr "XMPP ????,????
 msgstr "XMPP ????,?????????"
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "?????????"
 
 #, c-format
@@ -4331,9 +4367,6 @@ msgstr "??????"
 msgid "Unregistration Failed"
 msgstr "??????"
 
-msgid "Already Registered"
-msgstr "????"
-
 msgid "State"
 msgstr "?/?"
 
@@ -4346,6 +4379,9 @@ msgstr "??"
 msgid "Date"
 msgstr "??"
 
+msgid "Already Registered"
+msgstr "????"
+
 msgid "Unregister"
 msgstr "????"
 
@@ -4373,6 +4409,10 @@ msgstr "??????"
 msgid "Change Registration"
 msgstr "??????"
 
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "?????????"
+
 msgid "Error unregistering account"
 msgstr "????????"
 
@@ -4822,17 +4862,19 @@ msgstr "ban &lt;???&gt; [??]? msgstr "ban &lt;???&gt; [??]:???????????"
 
 #  XXX ???(??)??? - ambrose 20070415
+#, fuzzy
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 "affiliate &lt;???&gt; &lt;owner|admin|member|outcast|none&gt;: ?????"
 "?????????"
 
 #  NOTE ???? by ambrose
+#, fuzzy
 msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 "role &lt;???&gt; &lt;moderator|participant|visitor|none&gt;: ??????"
 "?????????"
@@ -4895,6 +4937,9 @@ msgstr "?????????"
 msgid "File transfer proxies"
 msgstr "?????????"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -5311,6 +5356,10 @@ msgstr "????????"
 msgid "Non-IM Contacts"
 msgstr "????????"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s ????????????,??????????????"
+
 msgid "Nudge"
 msgstr "??"
 
@@ -5658,71 +5707,27 @@ msgstr "Windows Live ID ??:???msgstr "Windows Live ID ??:????"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s ??????????"
-
-msgid "Unknown error."
-msgstr "?????"
-
-# NOTE: ??? %s ??????,??? %s ???????
-# NOTE: ??? %s ?????????(?????????)
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s (%3$s):%1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ????!"
 
-#. char *adl = g_strndup(payload, len);
-#, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "????(?? %d)"
 
 msgid "Unable to add user"
 msgstr "???????"
 
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "????(?? %d)"
+
 # XXX ?? - 20090226
 msgid "The following users are missing from your addressbook"
 msgstr "???????????"
 
-#  TODO ???,??????
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "%s (%s) ???????"
-
-#  TODO ???,??????
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s (%s) ???????"
-
-#  TODO ???,??????
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s (%s) ???????"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "????????,?????? %s"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s ???????????"
-
-#  NOTE????????????????????
-#  NOTE ???? by Ambrose
-msgid "Service Temporarily Unavailable."
-msgstr "????????"
-
 msgid "Mobile message was not sent because it was too long."
 msgstr "????????,??????:"
 
-msgid "Unable to rename group"
-msgstr "????????"
-
-msgid "Unable to delete group"
-msgstr "??????"
-
 # NOTE "in %d minutes" ???? %d ????????
 # NOTE ???? by Ambrose
 #, c-format
@@ -5810,6 +5815,9 @@ msgstr "??????????? "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "????????????,????????"
 
+msgid "Unknown error."
+msgstr "?????"
+
 # See cnscode.org.tw
 msgid "Handshaking"
 msgstr "???"
@@ -5829,6 +5837,14 @@ msgstr "???????"
 msgid "Retrieving buddy list"
 msgstr "???????"
 
+#, fuzzy, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr "%s ????????????,??????????????"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ????????????,??????????????"
+
 msgid "Away From Computer"
 msgstr "?????"
 
@@ -5867,14 +5883,6 @@ msgstr "?????????,? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????????,????????:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s ?????(?)??????"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s ????(?)?????????"
-
 #  NOTE ??!evolution ???????????????????
 msgid "Delete Buddy from Address Book?"
 msgstr "??????????"
@@ -5905,6 +5913,58 @@ msgstr "MSN ????"
 msgstr "MSN ????"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s ??????????"
+
+# NOTE: ??? %s ??????,??? %s ???????
+# NOTE: ??? %s ?????????(?????????)
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s (%3$s):%1$s"
+
+#  TODO ???,??????
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s) ???????"
+
+#  TODO ???,??????
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) ???????"
+
+#  TODO ???,??????
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s) ???????"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "????????,?????? %s"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s ???????????"
+
+#  NOTE????????????????????
+#  NOTE ???? by Ambrose
+msgid "Service Temporarily Unavailable."
+msgstr "????????"
+
+msgid "Unable to rename group"
+msgstr "????????"
+
+msgid "Unable to delete group"
+msgstr "??????"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s ?????(?)??????"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s ????(?)?????????"
+
+#, c-format
 msgid "No such user: %s"
 msgstr "?????:%s"
 
@@ -5935,6 +5995,8 @@ msgstr "??????????? msgstr "???????????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 msgid "New mail messages"
 msgstr "????"
 
@@ -5983,17 +6045,19 @@ msgstr "??????,?? %d? msgstr "??????,?? %d:%s"
 
 # NOTE ??? %s ?????
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 "%s ???????? %d ???,?????? MySpaceIM ?? %d ???????"
 "?? http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
 "changePassword ?????????,?????"
 
+msgid "Incorrect username or password"
+msgstr "????????"
+
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM ??"
 
@@ -6324,9 +6388,6 @@ msgstr "Master archive ????"
 msgid "Master archive is misconfigured"
 msgstr "Master archive ????"
 
-msgid "Incorrect username or password"
-msgstr "????????"
-
 msgid "Could not recognize the host of the username you entered"
 msgstr "?????????????????"
 
@@ -6535,6 +6596,29 @@ msgstr "??????"
 msgid "Server port"
 msgstr "??????"
 
+# XXX ?? - 20061025
+#, fuzzy
+msgid "Received unexpected response from "
+msgstr "????????? HTTP ???"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"????/????????????????????????????????"
+"?,????????????????"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "?? %s ???????"
+
+msgid "Incorrect password."
+msgstr "?????"
+
+msgid "AOL does not allow your screen name to authenticate via this site."
+msgstr ""
+
 msgid "Could not join chat room"
 msgstr "???????"
 
@@ -6855,14 +6939,31 @@ msgstr ""
 "????:??? %s ????,??????????????????????;"
 "?????????,?????????????;?????????"
 
+#, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "??????????????????,?? %s ????????"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "??????? AIM ????"
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "???????????????? %s ????????"
+
+msgid "Unable to get a valid login hash."
+msgstr "????????????"
+
+msgid "Could Not Connect"
+msgstr "????"
+
+msgid "Received authorization"
+msgstr "????"
+
 #. Unregistered username
 #. uid is not exist
 msgid "Invalid username."
 msgstr "????????"
 
-msgid "Incorrect password."
-msgstr "?????"
-
 #. Suspended account
 msgid "Your account is currently suspended."
 msgstr "??????????"
@@ -6874,25 +6975,19 @@ msgstr "?????? AOL ???
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????? AOL ???????"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "????????????????? %s ??"
+
 #. IP address connecting too frequently
+#, fuzzy
 msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+"You have 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 ""
 "????/????????????????????????????????"
 "?,????????????????"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "????????????????? %s ??"
-
-msgid "Could Not Connect"
-msgstr "????"
-
-msgid "Received authorization"
-msgstr "????"
-
 msgid "The SecurID key entered is invalid."
 msgstr "????? SecurID ????"
 
@@ -6908,20 +7003,6 @@ msgstr "??(_O)"
 msgid "_OK"
 msgstr "??(_O)"
 
-#, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "??????????????????,?? %s ????????"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "??????? AIM ????"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "???????????????? %s ????????"
-
-msgid "Unable to get a valid login hash."
-msgstr "????????????"
-
 msgid "Password sent"
 msgstr "??????"
 
@@ -7410,6 +7491,7 @@ msgstr "??????? (???
 msgid "Set User Info (web)..."
 msgstr "??????? (????)..."
 
+#. This only happens when connecting with the old-style BUCP login
 msgid "Change Password (web)"
 msgstr "???? (????)"
 
@@ -7440,6 +7522,10 @@ msgstr "????????"
 msgid "Search for Buddy by Information"
 msgstr "????????"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "???????"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9759,10 +9845,6 @@ msgstr "????"
 msgid "Auth Domain"
 msgstr "????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ????????????,??????????????"
-
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9790,6 +9872,40 @@ msgstr "??????"
 msgid "Add buddy rejected"
 msgstr "??????"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "???????????????"
+
+#. Password incorrect
+#, fuzzy
+msgid "Incorrect Password"
+msgstr "????"
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"Account locked: Too many failed login attempts.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??????? %d?????? Yahoo!,????????????????"
+
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "??????"
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"Account locked: Unknown reason.\n"
+"Logging into the Yahoo! website may fix this."
+msgstr "??????? %d?????? Yahoo!,????????????????"
+
+#. username or password missing
+#, fuzzy
+msgid "Username or password missing"
+msgstr "????????"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9909,8 +10025,8 @@ msgstr "?? Doodle"
 msgid "Start Doodling"
 msgstr "?? Doodle"
 
-msgid "Activate which ID?"
-msgstr "????? ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 # NOTE #Pidgin ? Vann ? LSchiere ?:????????????????,???????
 # NOTE Yahoo ??Chat????????????
@@ -10725,16 +10841,17 @@ msgstr "??????????? msgid "Please update the necessary fields."
 msgstr "?????????????"
 
-msgid "Room _List"
-msgstr "?????(_L)"
+#, fuzzy
+msgid "A_ccount"
+msgstr "??"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "????????????????????????\n"
 
-msgid "_Account:"
-msgstr "??(_A):"
+msgid "Room _List"
+msgstr "?????(_L)"
 
 msgid "_Block"
 msgstr "??(_B)"
@@ -11180,6 +11297,112 @@ msgstr "/??/??????"
 msgid "/Buddies/Sort Buddies"
 msgstr "/??/??????"
 
+#. Buddy List
+msgid "Background Color"
+msgstr "????"
+
+msgid "The background color for the buddy list"
+msgstr ""
+
+#, fuzzy
+msgid "Layout"
+msgstr "???"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "??(_E)"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "??????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "??(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "??????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "??"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#, fuzzy
+msgid "Away Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "??"
+
+msgid "The text information for when a buddy is off-line"
+msgstr ""
+
+# XXX ??? - acli 20070914
+#, fuzzy
+msgid "Idle Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#, fuzzy
+msgid "Message Text"
+msgstr "????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "?? %s ?????"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ???"
@@ -11712,6 +11935,10 @@ msgstr "????"
 msgid "Hungarian"
 msgstr "????"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "?????"
+
 msgid "Indonesian"
 msgstr "???"
 
@@ -11835,6 +12062,9 @@ msgstr "???"
 msgid "Swedish"
 msgstr "???"
 
+msgid "Swahili"
+msgstr ""
+
 # NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE ?????????,?????????(?????)??????
 msgid "Tamil"
@@ -12286,11 +12516,9 @@ msgstr "????"
 msgid "Save Image"
 msgstr "????"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "????(_S)..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "??????(_A)..."
 
@@ -12380,9 +12608,6 @@ msgstr "??"
 msgid "Font Face"
 msgstr "??"
 
-msgid "Background Color"
-msgstr "????"
-
 #  XXX ???????????? - acli 20070614
 msgid "Foreground Color"
 msgstr "????"
@@ -12702,6 +12927,9 @@ msgstr "??????"
 msgid "Pounce on Whom"
 msgstr "??????"
 
+msgid "_Account:"
+msgstr "??(_A):"
+
 msgid "_Buddy name:"
 msgstr "????(_B):"
 
@@ -12813,9 +13041,20 @@ msgstr "??????????? msgstr "???????????????!"
 
 # XXX ??? - 20061025
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
 msgstr "?????????"
 
+# XXX ??? - 20061025
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "?????????"
+
+# XXX ??? - 20061025
+#, fuzzy
+msgid "Theme failed to copy."
+msgstr "?????????"
+
 #  NOTE ???????????????,??????????
 msgid "Install Theme"
 msgstr "?????"
@@ -13380,6 +13619,10 @@ msgstr "??????"
 msgid "Custom Smiley Manager"
 msgstr "??????"
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "????"
+
 msgid "Click to change your buddyicon for this account."
 msgstr "?????????????"
 
@@ -13605,6 +13848,81 @@ msgstr "??????????? msgid "Displays statistical information about your buddies' availability"
 msgstr "????????????????"
 
+#, fuzzy
+msgid "Server name request"
+msgstr "?????"
+
+# NOTE????????????Yahoo! ??????Conference?????????
+# XXX
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "???????"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "??????????"
+
+#  XXX ??
+#, fuzzy
+msgid "Find Services"
+msgstr "???????"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "??????"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "??"
+
+#, fuzzy
+msgid "Directory"
+msgstr "????"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "????"
+
+#, fuzzy
+msgid "PubSub Leaf"
+msgstr "PubSub ??"
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr "??"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "??????"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "???(_B):"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "??????"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "???????????????????"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "??????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+#, fuzzy
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "??? XMPP ????????????"
+
 msgid "Buddy is idle"
 msgstr "????"
 
@@ -14130,13 +14448,6 @@ msgstr ""
 "- ??????????????\n"
 "- ??????????,???????????"
 
-msgid "Cursor Color"
-msgstr "????"
-
-#  XXX ?????????,????????????????
-msgid "Secondary Cursor Color"
-msgstr "??????"
-
 msgid "Hyperlink Color"
 msgstr "?????"
 
@@ -14148,6 +14459,10 @@ msgstr "????????"
 msgid "Highlighted Message Name Color"
 msgstr "????????"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "??????"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ??????"
 
@@ -14178,35 +14493,25 @@ msgstr ""
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "????"
+# XXX ?????,???????????,???????? - acli 20080511
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "??????"
 
-msgid "Widget Sizes"
-msgstr "Widget ??"
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ ??????"
 
+#, fuzzy
+msgid "Colors"
+msgstr "??"
+
 msgid "Fonts"
 msgstr "??"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc?????"
 
@@ -14351,12 +14656,128 @@ msgstr "??????????? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "???????????????????????"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "????"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "????"
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+# TODO ??????????????,?????????????
+# NOTE ???? by Paladin
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "?????"
+
+#  NOTE?Ignore??????????,? gtkprefs.c ???Ignore?
+#  NOTE ??????????,?????????
+#, fuzzy
+msgid "Ignored"
+msgstr "??"
+
+#, fuzzy
+msgid "Founder"
+msgstr "???"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+# NOTE ?????????????????????????
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "????"
+
+# TODO ??? - 20061025
+#, fuzzy
+msgid "Error dialog"
+msgstr "????"
+
+# XXX 20070518
+#, fuzzy
+msgid "Information dialog"
+msgstr "??"
+
+msgid "Mail dialog"
+msgstr ""
+
+#  XXX ????????,????????? - ambrose 20070415
+#, fuzzy
+msgid "Question dialog"
+msgstr "???? (Request Dialog)"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "????"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "??:%s"
+
+#  XXX ?????,?????????????????(?!)
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "????? (Locale)"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "????"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin GTK+ ??????"
+
+#, fuzzy
+msgid "Contact"
+msgstr "????"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "????"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "????"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ ??????"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ ??????"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 msgid "Buddy Ticker"
 msgstr "?????"
 
@@ -14560,6 +14981,22 @@ msgstr "??? XMPP ?????? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "??? XMPP ????????????"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "????? ID?"
+
+#~ msgid "Cursor Color"
+#~ msgstr "????"
+
+#  XXX ?????????,????????????????
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??????"
+
+#~ msgid "Interface colors"
+#~ msgstr "????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget ??"
+
 #~ msgid "Invite message"
 #~ msgstr "????"
 


More information about the Commits mailing list